diff --git a/ccm-bundle-devel-wildfly-swarm/pom.xml b/ccm-bundle-devel-thorntail/pom.xml
similarity index 82%
rename from ccm-bundle-devel-wildfly-swarm/pom.xml
rename to ccm-bundle-devel-thorntail/pom.xml
index 1a682fc6b..cb7618c18 100644
--- a/ccm-bundle-devel-wildfly-swarm/pom.xml
+++ b/ccm-bundle-devel-thorntail/pom.xml
@@ -17,10 +17,10 @@
     </parent>
 
     <groupId>org.libreccm</groupId>
-    <artifactId>ccm-bundle-devel-wildfly-swarm</artifactId>
+    <artifactId>ccm-bundle-devel-thorntail</artifactId>
     <packaging>war</packaging>
     
-    <name>LibreCCM Devel Bundle for Wildfly Swarm</name>
+    <name>LibreCCM Devel Bundle for Thorntail</name>
     <url>http://www.libreccm.org</url>
     <distributionManagement>
         <site>
@@ -48,9 +48,9 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>org.wildfly.swarm</groupId>
-                <artifactId>bom-all</artifactId>
-                <version>2017.11.0</version>
+                <groupId>io.thorntail</groupId>
+                <artifactId>bom</artifactId>
+                <version>2.3.0.Final</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -60,67 +60,72 @@
     <dependencies>
         
         <dependency>
-            <groupId>org.wildfly.swarm</groupId>
+            <groupId>io.thorntail</groupId>
             <artifactId>cdi</artifactId>
         </dependency>
-        
+                
         <dependency>
-            <groupId>org.wildfly.swarm</groupId>
-            <artifactId>container</artifactId>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.wildfly.swarm</groupId>
+            <groupId>io.thorntail</groupId>
             <artifactId>datasources</artifactId>
         </dependency>
         
         <dependency>
-            <groupId>org.wildfly.swarm</groupId>
+            <groupId>io.thorntail</groupId>
             <artifactId>ejb</artifactId>
         </dependency>
         
         <dependency>
-            <groupId>org.wildfly.swarm</groupId>
+            <groupId>io.thorntail</groupId>
             <artifactId>hibernate-search</artifactId>
         </dependency>
         
         <dependency>
-            <groupId>org.wildfly.swarm</groupId>
+            <groupId>io.thorntail</groupId>
             <artifactId>hibernate-validator</artifactId>
         </dependency>
         
         <dependency>
-            <groupId>org.wildfly.swarm</groupId>
+            <groupId>io.thorntail</groupId>
             <artifactId>jaxrs</artifactId>
         </dependency>
         
-        <dependency>
-            <groupId>org.wildfly.swarm</groupId>
+        <!--        <dependency>
+            <groupId>io.thorntail</groupId>
             <artifactId>jaxrs-cdi</artifactId>
+        </dependency>-->
+        
+        <dependency>
+            <groupId>io.thorntail</groupId>
+            <artifactId>jaxrs-jsonp</artifactId>
         </dependency>
         
         <dependency>
-            <groupId>org.wildfly.swarm</groupId>
+            <groupId>io.thorntail</groupId>
             <artifactId>jpa</artifactId>
         </dependency>
         
         <dependency>
-            <groupId>org.wildfly.swarm</groupId>
+            <groupId>io.thorntail</groupId>
             <artifactId>jsf</artifactId>
         </dependency>
         
         <dependency>
-            <groupId>org.wildfly.swarm</groupId>
+            <groupId>io.thorntail</groupId>
+            <artifactId>jsonp</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>io.thorntail</groupId>
             <artifactId>logging</artifactId>
         </dependency>
         
         <dependency>
-            <groupId>org.wildfly.swarm</groupId>
+            <groupId>io.thorntail</groupId>
             <artifactId>mail</artifactId>
         </dependency>
         
         <dependency>
-            <groupId>org.wildfly.swarm</groupId>
+            <groupId>io.thorntail</groupId>
             <artifactId>undertow</artifactId>
         </dependency>
         
@@ -157,11 +162,8 @@
         
         <plugins>
             <plugin>
-                <groupId>org.wildfly.swarm</groupId>
-                <artifactId>wildfly-swarm-plugin</artifactId> 
-                <!--<configuration>
-                    <mainClass>org.libreccm.CcmBundleDevel</mainClass>
-                </configuration>-->
+                <groupId>io.thorntail</groupId>
+                <artifactId>thorntail-maven-plugin</artifactId> 
                 <executions>
                     <execution>
                         <goals>
diff --git a/ccm-bundle-devel-wildfly-swarm/pom.xml.releaseBackup b/ccm-bundle-devel-thorntail/pom.xml.releaseBackup
similarity index 100%
rename from ccm-bundle-devel-wildfly-swarm/pom.xml.releaseBackup
rename to ccm-bundle-devel-thorntail/pom.xml.releaseBackup
diff --git a/ccm-bundle-devel-wildfly-swarm/src/main/java/org/libreccm/CcmBundleDevel.java b/ccm-bundle-devel-thorntail/src/main/java/org/libreccm/CcmBundleDevel.java
similarity index 100%
rename from ccm-bundle-devel-wildfly-swarm/src/main/java/org/libreccm/CcmBundleDevel.java
rename to ccm-bundle-devel-thorntail/src/main/java/org/libreccm/CcmBundleDevel.java
diff --git a/ccm-bundle-devel-wildfly-swarm/src/main/java/org/libreccm/CcmBundleDevel.java.off b/ccm-bundle-devel-thorntail/src/main/java/org/libreccm/CcmBundleDevel.java.off
similarity index 100%
rename from ccm-bundle-devel-wildfly-swarm/src/main/java/org/libreccm/CcmBundleDevel.java.off
rename to ccm-bundle-devel-thorntail/src/main/java/org/libreccm/CcmBundleDevel.java.off
diff --git a/ccm-bundle-devel-wildfly-swarm/src/main/resources/log4j2.xml b/ccm-bundle-devel-thorntail/src/main/resources/log4j2.xml
similarity index 100%
rename from ccm-bundle-devel-wildfly-swarm/src/main/resources/log4j2.xml
rename to ccm-bundle-devel-thorntail/src/main/resources/log4j2.xml
diff --git a/ccm-bundle-devel-wildfly-swarm/src/main/resources/project-defaults.yml b/ccm-bundle-devel-thorntail/src/main/resources/project-defaults.yml
similarity index 100%
rename from ccm-bundle-devel-wildfly-swarm/src/main/resources/project-defaults.yml
rename to ccm-bundle-devel-thorntail/src/main/resources/project-defaults.yml
diff --git a/ccm-bundle-devel-wildfly-swarm/src/main/resources/shiro.ini b/ccm-bundle-devel-thorntail/src/main/resources/shiro.ini
similarity index 100%
rename from ccm-bundle-devel-wildfly-swarm/src/main/resources/shiro.ini
rename to ccm-bundle-devel-thorntail/src/main/resources/shiro.ini
diff --git a/ccm-bundle-devel-wildfly-swarm/src/main/resources/stylesheet-paths.txt b/ccm-bundle-devel-thorntail/src/main/resources/stylesheet-paths.txt
similarity index 100%
rename from ccm-bundle-devel-wildfly-swarm/src/main/resources/stylesheet-paths.txt
rename to ccm-bundle-devel-thorntail/src/main/resources/stylesheet-paths.txt
diff --git a/ccm-bundle-devel-wildfly-swarm/src/main/resources/systeminformation.properties b/ccm-bundle-devel-thorntail/src/main/resources/systeminformation.properties
similarity index 100%
rename from ccm-bundle-devel-wildfly-swarm/src/main/resources/systeminformation.properties
rename to ccm-bundle-devel-thorntail/src/main/resources/systeminformation.properties
diff --git a/ccm-bundle-devel-wildfly-swarm/src/main/webapp/WEB-INF/beans.xml b/ccm-bundle-devel-thorntail/src/main/webapp/WEB-INF/beans.xml
similarity index 100%
rename from ccm-bundle-devel-wildfly-swarm/src/main/webapp/WEB-INF/beans.xml
rename to ccm-bundle-devel-thorntail/src/main/webapp/WEB-INF/beans.xml
diff --git a/ccm-bundle-devel-wildfly-swarm/src/main/webapp/WEB-INF/classes/META-INF/persistence.xml b/ccm-bundle-devel-thorntail/src/main/webapp/WEB-INF/classes/META-INF/persistence.xml
similarity index 100%
rename from ccm-bundle-devel-wildfly-swarm/src/main/webapp/WEB-INF/classes/META-INF/persistence.xml
rename to ccm-bundle-devel-thorntail/src/main/webapp/WEB-INF/classes/META-INF/persistence.xml
diff --git a/ccm-bundle-devel-wildfly-swarm/src/main/webapp/WEB-INF/conf/registry/registry.properties b/ccm-bundle-devel-thorntail/src/main/webapp/WEB-INF/conf/registry/registry.properties
similarity index 100%
rename from ccm-bundle-devel-wildfly-swarm/src/main/webapp/WEB-INF/conf/registry/registry.properties
rename to ccm-bundle-devel-thorntail/src/main/webapp/WEB-INF/conf/registry/registry.properties
diff --git a/ccm-bundle-devel-wildfly-swarm/src/main/webapp/WEB-INF/web.xml b/ccm-bundle-devel-thorntail/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from ccm-bundle-devel-wildfly-swarm/src/main/webapp/WEB-INF/web.xml
rename to ccm-bundle-devel-thorntail/src/main/webapp/WEB-INF/web.xml
diff --git a/ccm-bundle-devel-wildfly-swarm/src/main/webapp/ccm-editor/ccm-editor-loader.js b/ccm-bundle-devel-thorntail/src/main/webapp/ccm-editor/ccm-editor-loader.js
similarity index 100%
rename from ccm-bundle-devel-wildfly-swarm/src/main/webapp/ccm-editor/ccm-editor-loader.js
rename to ccm-bundle-devel-thorntail/src/main/webapp/ccm-editor/ccm-editor-loader.js
diff --git a/ccm-core/src/main/java/org/libreccm/modules/CcmIntegrator.java b/ccm-core/src/main/java/org/libreccm/modules/CcmIntegrator.java
index 37723d9ec..ffad56378 100644
--- a/ccm-core/src/main/java/org/libreccm/modules/CcmIntegrator.java
+++ b/ccm-core/src/main/java/org/libreccm/modules/CcmIntegrator.java
@@ -29,8 +29,14 @@ import org.hibernate.integrator.spi.Integrator;
 import org.hibernate.service.spi.SessionFactoryServiceRegistry;
 import org.libreccm.search.SearchConfig;
 
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+
 import javax.sql.DataSource;
-import java.sql.*;
+
 import java.util.List;
 import java.util.Locale;
 import java.util.Optional;
diff --git a/ccm-core/src/main/java/org/libreccm/security/AuthorizationRequired.java b/ccm-core/src/main/java/org/libreccm/security/AuthorizationRequired.java
index 86b7db956..eaa703acf 100644
--- a/ccm-core/src/main/java/org/libreccm/security/AuthorizationRequired.java
+++ b/ccm-core/src/main/java/org/libreccm/security/AuthorizationRequired.java
@@ -18,8 +18,13 @@
  */
 package org.libreccm.security;
 
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
 import javax.interceptor.InterceptorBinding;
-import java.lang.annotation.*;
 
 /**
  * Use this annotation to secure a method by the
diff --git a/ccm-core/src/main/java/org/libreccm/security/JwtVerifyingFilter.java b/ccm-core/src/main/java/org/libreccm/security/JwtVerifyingFilter.java
index 6aa42cf1c..b81a8463a 100644
--- a/ccm-core/src/main/java/org/libreccm/security/JwtVerifyingFilter.java
+++ b/ccm-core/src/main/java/org/libreccm/security/JwtVerifyingFilter.java
@@ -25,7 +25,6 @@ import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.SignatureAlgorithm;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.subject.Subject;
-import org.apache.shiro.subject.SubjectContext;
 import org.apache.shiro.web.filter.AccessControlFilter;
 
 import java.security.Key;
diff --git a/ccm-core/src/main/java/org/libreccm/security/RequiresRole.java b/ccm-core/src/main/java/org/libreccm/security/RequiresRole.java
index 4c722859b..348fea9c7 100644
--- a/ccm-core/src/main/java/org/libreccm/security/RequiresRole.java
+++ b/ccm-core/src/main/java/org/libreccm/security/RequiresRole.java
@@ -18,7 +18,12 @@
  */
 package org.libreccm.security;
 
-import java.lang.annotation.*;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
 
 /**
  * This annotation is used together with the {@link AuthorizationRequired}
diff --git a/pom.xml b/pom.xml
index 41d7e108f..5187cb355 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,13 +82,14 @@
         <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-thorntail</module>
 
         <!-- Archetypes -->
         <module>ccm-archetype-module</module>
         <module>ccm-cms-archetype-contenttype</module>
         
         <!--<module>ccm-cms-js</module>-->
+        
     </modules>
 
     <reporting>
@@ -97,7 +98,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-project-info-reports-plugin</artifactId>
-                <version>2.9</version>
+                <!--                <version>2.9</version>-->
                 <reportSets>
                     <reportSet>
                         <reports>
@@ -113,7 +114,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>versions-maven-plugin</artifactId>
-                <version>2.4</version>
+                <!--<version>2.4</version>-->
                 <configuration>
                     <rulesUri>file:///${session.executionRootDirectory}/maven-version-rules.xml</rulesUri>
                 </configuration>
@@ -276,6 +277,11 @@
                     <artifactId>hibernate51-ddl-maven-plugin</artifactId>
                     <version>2.1.0</version>
                 </plugin>
+                <plugin>
+                    <groupId>io.thorntail</groupId>
+                    <artifactId>thorntail-maven-plugin</artifactId>
+                    <version>2.3.0.Final</version>
+                </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>build-helper-maven-plugin</artifactId>
@@ -301,7 +307,7 @@
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>versions-maven-plugin</artifactId>
-                    <version>2.5</version>
+                    <version>2.7</version>
                 </plugin>
                 <plugin>
                     <groupId>org.jacoco</groupId>
@@ -313,11 +319,6 @@
                     <artifactId>wildfly-maven-plugin</artifactId>
                     <version>1.2.1.Final</version>
                 </plugin>
-                <plugin>
-                    <groupId>org.wildfly.swarm</groupId>
-                    <artifactId>wildfly-swarm-plugin</artifactId>
-                    <version>2017.11.0</version>
-                </plugin>
             </plugins>
         </pluginManagement>
 
@@ -468,17 +469,17 @@
                 <groupId>io.jsonwebtoken</groupId>
                 <artifactId>jjwt-api</artifactId>
                 <version>0.10.5</version>
-           </dependency>
-           <dependency>
-               <groupId>io.jsonwebtoken</groupId>
-               <artifactId>jjwt-impl</artifactId>
-               <version>0.10.5</version>
-           </dependency>
-           <dependency>
-               <groupId>io.jsonwebtoken</groupId>
-               <artifactId>jjwt-jackson</artifactId>
-               <version>0.10.5</version>
-           </dependency>
+            </dependency>
+            <dependency>
+                <groupId>io.jsonwebtoken</groupId>
+                <artifactId>jjwt-impl</artifactId>
+                <version>0.10.5</version>
+            </dependency>
+            <dependency>
+                <groupId>io.jsonwebtoken</groupId>
+                <artifactId>jjwt-jackson</artifactId>
+                <version>0.10.5</version>
+            </dependency>
 
             <!-- PrimeFaces for JSF prototype -->
             <dependency>