diff --git a/.gitignore b/.gitignore
index 144b13113..9ee809a0e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 it-pgsql-datasources.properties
 nb-configuration.xml
+nbproject
 node
 node_modules
 runtime
diff --git a/pom.xml b/pom.xml
index 1182716ec..7a97b714d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,15 +88,14 @@
         <!-- Bundle modules -->
         <module>ccm-bundle-devel</module>
         <module>ccm-bundle-devel-wildfly</module>
-        <module>ccm-bundle-devel-thorntail</module>
-
+        
         <!-- Archetypes -->
         <module>ccm-archetype-module</module>
         <module>ccm-cms-archetype-contenttype</module>
         
         <!--<module>ccm-cms-js</module>-->
-    <module>ccm-wildfly</module>
-  </modules>
+        <module>ccm-wildfly</module>
+    </modules>
 
     <reporting>
         <excludeDefaults>true</excludeDefaults>
@@ -160,8 +159,8 @@
                     <artifactId>maven-compiler-plugin</artifactId>
                     <version>3.8.1</version>
                     <configuration>
-                        <source>1.8</source>
-                        <target>1.8</target>
+                        <source>11</source>
+                        <target>11</target>
                         <optimize>true</optimize>
                         <debug>true</debug>
                         <encoding>${project.build.sourceEncoding}</encoding>
@@ -204,7 +203,7 @@
                     <configuration>
                         <linkXref>true</linkXref>
                         <sourceEncoding>utf-8</sourceEncoding>
-                        <targetJdk>1.8</targetJdk>
+                        <targetJdk>11</targetJdk>
                         <!--                        <rulesets>
                             <ruleset>/rulesets/basic.xml</ruleset>
                             <ruleset>/rulesets/braces.xml</ruleset>
@@ -340,7 +339,15 @@
                     <version>2.1.0.Beta1</version>
                     <configuration>
                         <skip>true</skip>
-                        <version>21.0.2.Final</version>
+                        <version>24.0.1.Final</version>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.wildfly.plugins</groupId>
+                    <artifactId>wildfly-jar-maven-plugin</artifactId>
+                    <version>3.0.2.Final</version>
+                    <configuration>
+                        <skip>true</skip>
                     </configuration>
                 </plugin>
             </plugins>
@@ -374,7 +381,7 @@
                         <configuration>
                             <rules>
                                 <requireJavaVersion>
-                                    <version>1.8.0</version>
+                                    <version>11.0</version>
                                 </requireJavaVersion>
                                 <requireMavenVersion>
                                     <version>3.3.1</version>
@@ -456,7 +463,7 @@
             <dependency>
                 <groupId>org.hibernate</groupId>
                 <artifactId>hibernate-core</artifactId>
-                <version>5.3.17.Final</version>
+                <version>5.3.20.Final</version>
             </dependency>
 
             <!--
@@ -466,7 +473,7 @@
             <dependency>
                 <groupId>org.hibernate</groupId>
                 <artifactId>hibernate-envers</artifactId>
-                <version>5.3.17.Final</version>
+                <version>5.3.20.Final</version>
             </dependency>
 
             <dependency>
@@ -959,4 +966,4 @@
         </dependencies>
     </dependencyManagement>
 
-</project>
\ No newline at end of file
+</project>