diff --git a/ccm-bundle-devel-wildfly-swarm/pom.xml b/ccm-bundle-devel-wildfly-swarm/pom.xml
index 175c10b22..585f0273c 100644
--- a/ccm-bundle-devel-wildfly-swarm/pom.xml
+++ b/ccm-bundle-devel-wildfly-swarm/pom.xml
@@ -15,6 +15,10 @@
     <groupId>org.libreccm</groupId>
     <artifactId>ccm-bundle-devel-wildfly-swarm</artifactId>
     <packaging>war</packaging>
+    
+    <properties>
+        <failOnMissingWebXml>false</failOnMissingWebXml>
+    </properties>
 
     <dependencyManagement>
         <dependencies>
diff --git a/ccm-cms/src/test/java/org/librecms/contentsection/AttachmentListManagerTest.java b/ccm-cms/src/test/java/org/librecms/contentsection/AttachmentListManagerTest.java
index a0bc69118..5ea74a877 100644
--- a/ccm-cms/src/test/java/org/librecms/contentsection/AttachmentListManagerTest.java
+++ b/ccm-cms/src/test/java/org/librecms/contentsection/AttachmentListManagerTest.java
@@ -370,10 +370,13 @@ public class AttachmentListManagerTest {
                           "list_id",
                           "uuid"})
     public void createAttachmentList() {
-        final Optional<ContentItem> item = itemRepo.findById(-520);
-        assertThat(item.isPresent(), is(true));
 
-        listManager.createAttachmentList(item.get(), "newList");
+        shiro.getSystemUser().execute(() -> {
+            final Optional<ContentItem> item = itemRepo.findById(-520);
+            assertThat(item.isPresent(), is(true));
+
+            listManager.createAttachmentList(item.get(), "newList");
+        });
     }
 
     /**
@@ -392,9 +395,12 @@ public class AttachmentListManagerTest {
             + "data.xml")
     @ShouldThrowException(IllegalArgumentException.class)
     public void createAttachmentListForItemNull() {
-        final ContentItem item = null;
 
-        listManager.createAttachmentList(item, "newList");
+        shiro.getSystemUser().execute(() -> {
+            final ContentItem item = null;
+
+            listManager.createAttachmentList(item, "newList");
+        });
     }
 
     /**
@@ -412,10 +418,13 @@ public class AttachmentListManagerTest {
         "datasets/org/librecms/contentsection/AttachmentListManagerTest/"
             + "data.xml")
     public void createAttachmentListNameIsNull() {
-        final Optional<ContentItem> item = itemRepo.findById(-520);
-        assertThat(item.isPresent(), is(true));
 
-        listManager.createAttachmentList(item.get(), null);
+        shiro.getSystemUser().execute(() -> {
+            final Optional<ContentItem> item = itemRepo.findById(-520);
+            assertThat(item.isPresent(), is(true));
+
+            listManager.createAttachmentList(item.get(), null);
+        });
     }
 
     /**
@@ -433,10 +442,13 @@ public class AttachmentListManagerTest {
         "datasets/org/librecms/contentsection/AttachmentListManagerTest/"
             + "data.xml")
     public void createAttachmentListNameIsEmpty() {
-        final Optional<ContentItem> item = itemRepo.findById(-520);
-        assertThat(item.isPresent(), is(true));
 
-        listManager.createAttachmentList(item.get(), "  ");
+        shiro.getSystemUser().execute(() -> {
+            final Optional<ContentItem> item = itemRepo.findById(-520);
+            assertThat(item.isPresent(), is(true));
+
+            listManager.createAttachmentList(item.get(), "  ");
+        });
     }
 
     /**
@@ -457,10 +469,13 @@ public class AttachmentListManagerTest {
                           "list_id",
                           "uuid"})
     public void createAttachmentListWithPosition() {
-        final Optional<ContentItem> item = itemRepo.findById(-510);
-        assertThat(item.isPresent(), is(true));
 
-        listManager.createAttachmentList(item.get(), "newList", 1);
+        shiro.getSystemUser().execute(() -> {
+            final Optional<ContentItem> item = itemRepo.findById(-510);
+            assertThat(item.isPresent(), is(true));
+
+            listManager.createAttachmentList(item.get(), "newList", 1);
+        });
     }
 
     /**
@@ -484,10 +499,13 @@ public class AttachmentListManagerTest {
                           "list_id",
                           "uuid"})
     public void createAttachmentListWithNegativePosition() {
-        final Optional<ContentItem> item = itemRepo.findById(-510);
-        assertThat(item.isPresent(), is(true));
 
-        listManager.createAttachmentList(item.get(), "newList", -3);
+        shiro.getSystemUser().execute(() -> {
+            final Optional<ContentItem> item = itemRepo.findById(-510);
+            assertThat(item.isPresent(), is(true));
+
+            listManager.createAttachmentList(item.get(), "newList", -3);
+        });
     }
 
     /**
@@ -512,10 +530,13 @@ public class AttachmentListManagerTest {
                           "list_id",
                           "uuid"})
     public void createAttachmentListWithPositionAfterLast() {
-        final Optional<ContentItem> item = itemRepo.findById(-510);
-        assertThat(item.isPresent(), is(true));
 
-        listManager.createAttachmentList(item.get(), "newList", 10);
+        shiro.getSystemUser().execute(() -> {
+            final Optional<ContentItem> item = itemRepo.findById(-510);
+            assertThat(item.isPresent(), is(true));
+
+            listManager.createAttachmentList(item.get(), "newList", 10);
+        });
     }
 
     /**
@@ -534,9 +555,12 @@ public class AttachmentListManagerTest {
             + "data.xml")
     @ShouldThrowException(IllegalArgumentException.class)
     public void createAttachmentListWithPositionForItemNull() {
-        final ContentItem item = null;
 
-        listManager.createAttachmentList(item, "newList", 10);
+        shiro.getSystemUser().execute(() -> {
+            final ContentItem item = null;
+
+            listManager.createAttachmentList(item, "newList", 10);
+        });
     }
 
     /**
@@ -555,10 +579,13 @@ public class AttachmentListManagerTest {
             + "data.xml")
     @ShouldThrowException(IllegalArgumentException.class)
     public void createAttachmentListWithPositionNameIsNull() {
-        final Optional<ContentItem> item = itemRepo.findById(-510);
-        assertThat(item.isPresent(), is(true));
 
-        listManager.createAttachmentList(item.get(), null, 10);
+        shiro.getSystemUser().execute(() -> {
+            final Optional<ContentItem> item = itemRepo.findById(-510);
+            assertThat(item.isPresent(), is(true));
+
+            listManager.createAttachmentList(item.get(), null, 10);
+        });
     }
 
     /**
@@ -577,10 +604,13 @@ public class AttachmentListManagerTest {
             + "data.xml")
     @ShouldThrowException(IllegalArgumentException.class)
     public void createAttachmentListWithPositionNameIsEmpty() {
-        final Optional<ContentItem> item = itemRepo.findById(-510);
-        assertThat(item.isPresent(), is(true));
 
-        listManager.createAttachmentList(item.get(), "   ", 10);
+        shiro.getSystemUser().execute(() -> {
+            final Optional<ContentItem> item = itemRepo.findById(-510);
+            assertThat(item.isPresent(), is(true));
+
+            listManager.createAttachmentList(item.get(), "   ", 10);
+        });
     }
 
     /**
@@ -599,11 +629,14 @@ public class AttachmentListManagerTest {
                     + "AttachmentListManagerTest/after-remove.xml",
         excludeColumns = {"timestamp"})
     public void removeAttachmentList() {
-        final Optional<ContentItem> item = itemRepo.findById(-510);
-        assertThat(item.isPresent(), is(true));
-        final AttachmentList list = item.get().getAttachments().get(0);
 
-        listManager.removeAttachmentList(list);
+        shiro.getSystemUser().execute(() -> {
+            final Optional<ContentItem> item = itemRepo.findById(-510);
+            assertThat(item.isPresent(), is(true));
+            final AttachmentList list = item.get().getAttachments().get(0);
+
+            listManager.removeAttachmentList(list);
+        });
     }
 
     /**
@@ -641,11 +674,14 @@ public class AttachmentListManagerTest {
                     + "AttachmentListManagerTest/after-move-up.xml",
         excludeColumns = {"timestamp"})
     public void moveUp() {
-        final Optional<ContentItem> item = itemRepo.findById(-510);
-        assertThat(item.isPresent(), is(true));
-        final AttachmentList list = item.get().getAttachments().get(0);
 
-        listManager.moveUp(list);
+        shiro.getSystemUser().execute(() -> {
+            final Optional<ContentItem> item = itemRepo.findById(-510);
+            assertThat(item.isPresent(), is(true));
+            final AttachmentList list = item.get().getAttachments().get(0);
+
+            listManager.moveUp(list);
+        });
     }
 
     /**
@@ -661,11 +697,14 @@ public class AttachmentListManagerTest {
         "datasets/org/librecms/contentsection/AttachmentListManagerTest/"
             + "data.xml")
     public void moveUpLast() {
-        final Optional<ContentItem> item = itemRepo.findById(-510);
-        assertThat(item.isPresent(), is(true));
-        final AttachmentList list = item.get().getAttachments().get(2);
 
-        listManager.moveUp(list);
+        shiro.getSystemUser().execute(() -> {
+            final Optional<ContentItem> item = itemRepo.findById(-510);
+            assertThat(item.isPresent(), is(true));
+            final AttachmentList list = item.get().getAttachments().get(2);
+
+            listManager.moveUp(list);
+        });
     }
 
     /**
@@ -683,9 +722,12 @@ public class AttachmentListManagerTest {
             + "data.xml")
     @ShouldThrowException(IllegalArgumentException.class)
     public void moveUpListNull() {
-        final AttachmentList list = null;
 
-        listManager.moveUp(list);
+        shiro.getSystemUser().execute(() -> {
+            final AttachmentList list = null;
+
+            listManager.moveUp(list);
+        });
     }
 
     /**
@@ -702,11 +744,14 @@ public class AttachmentListManagerTest {
                     + "AttachmentListManagerTest/after-move-down.xml",
         excludeColumns = {"timestamp"})
     public void moveDown() {
-        final Optional<ContentItem> item = itemRepo.findById(-510);
-        assertThat(item.isPresent(), is(true));
-        final AttachmentList list = item.get().getAttachments().get(2);
 
-        listManager.moveDown(list);
+        shiro.getSystemUser().execute(() -> {
+            final Optional<ContentItem> item = itemRepo.findById(-510);
+            assertThat(item.isPresent(), is(true));
+            final AttachmentList list = item.get().getAttachments().get(2);
+
+            listManager.moveDown(list);
+        });
     }
 
     /**
@@ -722,11 +767,14 @@ public class AttachmentListManagerTest {
         "datasets/org/librecms/contentsection/AttachmentListManagerTest/"
             + "data.xml")
     public void moveDownFirst() {
-        final Optional<ContentItem> item = itemRepo.findById(-510);
-        assertThat(item.isPresent(), is(true));
-        final AttachmentList list = item.get().getAttachments().get(0);
 
-        listManager.moveDown(list);
+        shiro.getSystemUser().execute(() -> {
+            final Optional<ContentItem> item = itemRepo.findById(-510);
+            assertThat(item.isPresent(), is(true));
+            final AttachmentList list = item.get().getAttachments().get(0);
+
+            listManager.moveDown(list);
+        });
     }
 
     /**
@@ -744,9 +792,12 @@ public class AttachmentListManagerTest {
             + "data.xml")
     @ShouldThrowException(IllegalArgumentException.class)
     public void moveDownListNull() {
-        final AttachmentList list = null;
 
-        listManager.moveDown(list);
+        shiro.getSystemUser().execute(() -> {
+            final AttachmentList list = null;
+
+            listManager.moveDown(list);
+        });
     }
 
 }
diff --git a/ccm-core/pom.xml b/ccm-core/pom.xml
index ac8328d28..c6971a6c2 100644
--- a/ccm-core/pom.xml
+++ b/ccm-core/pom.xml
@@ -454,7 +454,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-report-plugin</artifactId>
-                <version>2.19.1</version>
+                <version>2.20</version>
                 <configuration>
                     <trimStackTrace>false</trimStackTrace>
                 </configuration>
@@ -462,12 +462,12 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.7.8</version>
+                <version>0.7.9</version>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>findbugs-maven-plugin</artifactId>
-                <version>3.0.3</version>
+                <version>3.0.4</version>
                 <configuration>
                     <excludeFilterFile>findbugs-exclude.xml</excludeFilterFile>
                 </configuration>
@@ -475,7 +475,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-pmd-plugin</artifactId>
-                <version>3.7</version>
+                <version>3.8</version>
                 <configuration>
                     <linkXref>true</linkXref>
                     <sourceEncoding>utf-8</sourceEncoding>
diff --git a/ccm-core/src/test/java/org/libreccm/security/UserManagerTest.java b/ccm-core/src/test/java/org/libreccm/security/UserManagerTest.java
index 5c0cae997..9d64908a6 100644
--- a/ccm-core/src/test/java/org/libreccm/security/UserManagerTest.java
+++ b/ccm-core/src/test/java/org/libreccm/security/UserManagerTest.java
@@ -176,24 +176,24 @@ public class UserManagerTest {
         assertThat(userManager.verifyPassword(jane2, "foo456"), is(true));
     }
 
-    @Test(expected = ArquillianProxyException.class)
-    @UsingDataSet("datasets/org/libreccm/security/UserManagerTest/data.yml")
-    @ShouldThrowException(ConstraintViolationException.class)
-    @InSequence(400)
-    public void createUserWithInValidName() throws Throwable {
-        try {
-            shiro.getSystemUser().execute(
-                () -> userManager.createUser("Jane",
-                                             "Doe",
-                                             "j#ne",
-                                             "jane.doe@example.org",
-                                             "foo456"));
-        } catch (ExecutionException ex) {
-            throw ex.getCause();
-        }
-        fail();
-    }
-
+//    Temporaily disabled until we decide if we want to limit the valid characters in a user name
+//    @Test(expected = ArquillianProxyException.class)
+//    @UsingDataSet("datasets/org/libreccm/security/UserManagerTest/data.yml")
+//    @ShouldThrowException(ConstraintViolationException.class)
+//    @InSequence(400)
+//    public void createUserWithInValidName() throws Throwable {
+//        try {
+//            shiro.getSystemUser().execute(
+//                () -> userManager.createUser("Jane",
+//                                             "Doe",
+//                                             "j#ne",
+//                                             "jane.doe@example.org",
+//                                             "foo456"));
+//        } catch (ExecutionException ex) {
+//            throw ex.getCause();
+//        }
+//        fail();
+//    }
     @Test
     @UsingDataSet("datasets/org/libreccm/security/UserManagerTest/data.yml")
     @InSequence(500)
diff --git a/pom.xml b/pom.xml
index 0ce3be2a3..5d715365f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,7 +62,7 @@
         <module>ccm-bundle-devel</module>
         <module>ccm-bundle-devel-wildfly-web</module>
         <module>ccm-bundle-devel-wildfly</module>
-        <module>ccm-bundle-devel-wildfly-swarm</module>
+        <!--<module>ccm-bundle-devel-wildfly-swarm</module>-->
         <module>ccm-xafilesystemadapter</module>
     </modules>
 
@@ -103,10 +103,15 @@
                         <encoding>${project.build.sourceEncoding}</encoding>
                     </configuration>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <version>2.10.4</version>
+                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.19.1</version>
+                    <version>2.20</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -121,7 +126,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-war-plugin</artifactId>
-                    <version>3.0.0</version>
+                    <version>3.1.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -136,7 +141,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-pmd-plugin</artifactId>
-                    <version>3.7</version>
+                    <version>3.8</version>
                     <configuration>
                         <linkXref>true</linkXref>
                         <sourceEncoding>utf-8</sourceEncoding>
@@ -172,7 +177,7 @@
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>build-helper-maven-plugin</artifactId>
-                    <version>1.12</version>
+                    <version>3.0.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
@@ -199,7 +204,7 @@
                 <plugin>
                     <groupId>org.jacoco</groupId>
                     <artifactId>jacoco-maven-plugin</artifactId>
-                    <version>0.7.8</version>
+                    <version>0.7.9</version>
                 </plugin>
                 <plugin>
                     <groupId>org.wildfly.plugins</groupId>
@@ -214,12 +219,12 @@
                 <plugin>
                     <groupId>org.wildfly.swarm</groupId>
                     <artifactId>wildfly-swarm-plugin</artifactId>
-                    <version>2017.1.1</version>
+                    <version>2017.6.1</version>
                 </plugin>
                 <plugin>
                     <groupId>com.vaadin</groupId>
                     <artifactId>vaadin-maven-plugin</artifactId>
-                    <version>8.0.5</version>
+                    <version>8.0.6</version>
                 </plugin>
                 <!-- Reporting plugins -->
                 <plugin>