diff --git a/ccm-bundle-devel-thorntail/pom.xml b/ccm-bundle-devel-thorntail/pom.xml
index dc1a04f60..6178bfbf9 100644
--- a/ccm-bundle-devel-thorntail/pom.xml
+++ b/ccm-bundle-devel-thorntail/pom.xml
@@ -3,12 +3,6 @@
 
     <modelVersion>4.0.0</modelVersion>
 
-    <!--<parent>
-        <groupId>org.libreccm</groupId>
-        <artifactId>libreccm-parent</artifactId>
-        <version>7.0.0-SNAPSHOT</version>
-    </parent>-->
-    
     <parent>
         <groupId>org.libreccm</groupId>
         <artifactId>ccm-bundle-devel</artifactId>
@@ -142,17 +136,14 @@
         <dependency>
             <groupId>org.webjars</groupId>
             <artifactId>font-awesome</artifactId>
-            <version>4.7.0</version>
         </dependency>
         <dependency>
             <groupId>org.webjars</groupId>
             <artifactId>requirejs</artifactId>
-            <version>2.3.6</version>
         </dependency>
         <dependency>
             <groupId>org.webjars</groupId>
             <artifactId>requirejs-domready</artifactId>
-            <version>2.0.1-2</version>
         </dependency>
 
     </dependencies>
diff --git a/ccm-bundle-devel-wildfly-web/pom.xml b/ccm-bundle-devel-wildfly-web/pom.xml
index 821c5b196..fc67502c2 100644
--- a/ccm-bundle-devel-wildfly-web/pom.xml
+++ b/ccm-bundle-devel-wildfly-web/pom.xml
@@ -26,28 +26,19 @@
         <dependency>
             <groupId>org.webjars</groupId>
             <artifactId>font-awesome</artifactId>
-            <!--<version>4.7.0</version>-->
         </dependency>
         <dependency>
             <groupId>org.webjars</groupId>
             <artifactId>requirejs</artifactId>
-            <!--<version>2.3.5</version>-->
         </dependency>
         <dependency>
             <groupId>org.webjars</groupId>
             <artifactId>requirejs-domready</artifactId>
-            <!--<version>2.0.1-2</version>-->
         </dependency>
         <dependency>
             <groupId>org.webjars.npm</groupId>
             <artifactId>tinymce</artifactId>
-            <!--<version>4.8.2</version>-->
         </dependency>
-        <!-- <dependency>
-            <groupId>org.librecms</groupId>
-            <artifactId>ccm-cms-js</artifactId>
-            <version>7.0.0-SNAPSHOT</version>
-        </dependency> -->
         <dependency>
             <groupId>org.librecms</groupId>
             <artifactId>ccm-cms-pagemodelseditor</artifactId>
@@ -103,15 +94,6 @@
                             <nodeVersion>v8.11.4</nodeVersion>
                         </configuration>
                     </execution>
-                    <!-- <execution>
-                        <id>npm link @libreccm/ccm-pagemodelseditor</id>
-                        <goals>
-                            <goal>npm</goal>
-                        </goals>
-                        <configuration>
-                            <arguments>link @libreccm/ccm-pagemodelseditor</arguments>
-                        </configuration>
-                    </execution> -->
                     <execution>
                         <id>npm link @librecms/ccm-cms-pagemodelseditor</id>
                         <goals>
diff --git a/ccm-bundle-devel-wildfly/pom.xml b/ccm-bundle-devel-wildfly/pom.xml
index 879f9eedc..6f3826c43 100644
--- a/ccm-bundle-devel-wildfly/pom.xml
+++ b/ccm-bundle-devel-wildfly/pom.xml
@@ -121,7 +121,6 @@
                 <dependency>
                     <groupId>org.postgresql</groupId>
                     <artifactId>postgresql</artifactId>
-                    <version>9.4.1208</version>
                 </dependency>
             </dependencies>
             
diff --git a/ccm-core/pom.xml b/ccm-core/pom.xml
index 8c09637e8..c40da9151 100644
--- a/ccm-core/pom.xml
+++ b/ccm-core/pom.xml
@@ -215,7 +215,6 @@
         <dependency>
             <groupId>org.reflections</groupId>
             <artifactId>reflections</artifactId>
-            <!--<version>0.9.11</version>-->
         </dependency>
         
         <!--<dependency>
@@ -579,13 +578,11 @@
                 <dependency>
                     <groupId>org.apache.openejb</groupId>
                     <artifactId>arquillian-tomee-embedded</artifactId>
-                    <version>1.7.3</version>
                     <scope>test</scope>
                 </dependency>
                 <dependency>
                     <groupId>org.apache.openejb</groupId>
                     <artifactId>tomee-embedded</artifactId>
-                    <version>1.7.3</version>
                     <scope>test</scope>
                     <exclusions>
                         <exclusion>
@@ -617,19 +614,16 @@
                 <dependency>
                     <groupId>org.jboss.logmanager</groupId>
                     <artifactId>jboss-logmanager</artifactId>
-                    <version>2.0.3.Final</version>
                     <scope>test</scope>
                 </dependency>
                 <!--Required for WebServices and RESTful WebServices-->
                 <dependency>
                     <groupId>org.apache.openejb</groupId>
                     <artifactId>tomee-webservices</artifactId>
-                    <version>4.0.0</version>
                 </dependency>
                 <dependency>
                     <groupId>org.apache.openejb</groupId>
                     <artifactId>tomee-jaxrs</artifactId>
-                    <version>1.7.3</version>
                 </dependency>
                 <dependency>
                     <groupId>com.h2database</groupId>
@@ -709,12 +703,10 @@
                 <dependency>
                     <groupId>org.apache.openejb</groupId>
                     <artifactId>arquillian-tomee-remote</artifactId>
-                    <version>1.7.3</version>
                 </dependency>
                 <dependency>
                     <groupId>org.apache.openejb</groupId>
                     <artifactId>apache-tomee</artifactId>
-                    <version>1.7.3</version>
                     <classifier>plus</classifier>
                     <type>zip</type>
                 </dependency>
diff --git a/ccm-docrepo/pom.xml b/ccm-docrepo/pom.xml
index de138394d..36c3a5208 100644
--- a/ccm-docrepo/pom.xml
+++ b/ccm-docrepo/pom.xml
@@ -270,12 +270,10 @@
             <!--<plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>javancss-maven-plugin</artifactId>
-                <version>2.1</version>
             </plugin>-->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-project-info-reports-plugin</artifactId>
-                <!--<version>2.9</version>-->
                 <reportSets>
                     <reportSet>
                         <reports>
diff --git a/ccm-shortcuts/pom.xml b/ccm-shortcuts/pom.xml
index 317ac9b3d..fdff0bc6e 100644
--- a/ccm-shortcuts/pom.xml
+++ b/ccm-shortcuts/pom.xml
@@ -314,7 +314,6 @@
             <!--<plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>javancss-maven-plugin</artifactId>
-                <version>2.1</version>
             </plugin>-->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/pom.xml b/pom.xml
index 1ebe1e7c9..bfddab27f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -728,6 +728,13 @@
                 <artifactId>woodstox-core-asl</artifactId>
                 <version>4.4.1</version>
             </dependency>
+            
+            <!-- PostgreSQL JDBC Driver -->
+            <dependency>
+                <groupId>org.postgresql</groupId>
+                <artifactId>postgresql</artifactId>
+                <version>42.2.14</version>
+            </dependency>
 
             <!--
                 **********************
@@ -780,6 +787,47 @@
                 <scope>test</scope>
             </dependency>
 
+            <dependency>
+                <groupId>org.apache.openejb</groupId>
+                <artifactId>arquillian-tomee-embedded</artifactId>
+                <version>1.7.3</version>
+            </dependency>
+            
+            <dependency>
+                <groupId>org.apache.openejb</groupId>
+                <artifactId>tomee-embedded</artifactId>
+                <version>1.7.3</version>
+            </dependency>
+            
+            <dependency>
+                <groupId>org.jboss.logmanager</groupId>
+                <artifactId>jboss-logmanager</artifactId>
+                <version>2.0.3.Final</version>
+                <scope>test</scope>
+            </dependency>
+            
+            <dependency>
+                <groupId>org.apache.openejb</groupId>
+                <artifactId>tomee-webservices</artifactId>
+                <version>4.0.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.openejb</groupId>
+                <artifactId>tomee-jaxrs</artifactId>
+                <version>1.7.3</version>
+            </dependency>
+            
+            <dependency>
+                    <groupId>org.apache.openejb</groupId>
+                    <artifactId>arquillian-tomee-remote</artifactId>
+                    <version>1.7.3</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.openejb</groupId>
+                    <artifactId>apache-tomee</artifactId>
+                    <version>1.7.3</version>
+                </dependency>
+
             <!--
                 JaCoCo is used to measure the test coverage
             -->