From d38679237dbda07790a065020e71ee244b735994 Mon Sep 17 00:00:00 2001
From: jensp <jensp@8810af33-2d31-482b-a856-94f89814c4df>
Date: Fri, 26 Jul 2019 18:26:25 +0000
Subject: [PATCH] CCM NG: Dependency version only in parent pom

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@6156 8810af33-2d31-482b-a856-94f89814c4df
---
 ccm-bundle-devel-thorntail/pom.xml   |  4 +--
 ccm-bundle-devel-wildfly-web/pom.xml | 12 ++++-----
 ccm-core/pom.xml                     |  2 +-
 pom.xml                              | 37 +++++++++++++++++++++++++++-
 4 files changed, 45 insertions(+), 10 deletions(-)

diff --git a/ccm-bundle-devel-thorntail/pom.xml b/ccm-bundle-devel-thorntail/pom.xml
index 8ebfa3c5a..dc1a04f60 100644
--- a/ccm-bundle-devel-thorntail/pom.xml
+++ b/ccm-bundle-devel-thorntail/pom.xml
@@ -45,7 +45,7 @@
         <failOnMissingWebXml>false</failOnMissingWebXml>
     </properties>
 
-    <dependencyManagement>
+<!--    <dependencyManagement>
         <dependencies>
             <dependency>
                 <groupId>io.thorntail</groupId>
@@ -55,7 +55,7 @@
                 <type>pom</type>
             </dependency>
         </dependencies>
-    </dependencyManagement>
+    </dependencyManagement>-->
     
     <dependencies>
         
diff --git a/ccm-bundle-devel-wildfly-web/pom.xml b/ccm-bundle-devel-wildfly-web/pom.xml
index d6df30aba..9c350c087 100644
--- a/ccm-bundle-devel-wildfly-web/pom.xml
+++ b/ccm-bundle-devel-wildfly-web/pom.xml
@@ -26,22 +26,22 @@
         <dependency>
             <groupId>org.webjars</groupId>
             <artifactId>font-awesome</artifactId>
-            <version>4.7.0</version>
+            <!--<version>4.7.0</version>-->
         </dependency>
         <dependency>
             <groupId>org.webjars</groupId>
             <artifactId>requirejs</artifactId>
-            <version>2.3.5</version>
+            <!--<version>2.3.5</version>-->
         </dependency>
         <dependency>
             <groupId>org.webjars</groupId>
             <artifactId>requirejs-domready</artifactId>
-            <version>2.0.1-2</version>
+            <!--<version>2.0.1-2</version>-->
         </dependency>
         <dependency>
             <groupId>org.webjars.npm</groupId>
             <artifactId>tinymce</artifactId>
-            <version>4.8.2</version>
+            <!--<version>4.8.2</version>-->
         </dependency>
         <!-- <dependency>
             <groupId>org.librecms</groupId>
@@ -51,12 +51,12 @@
         <dependency>
             <groupId>org.librecms</groupId>
             <artifactId>ccm-cms-pagemodelseditor</artifactId>
-            <version>7.0.0-SNAPSHOT</version>
+            <version>${project.parent.version}</version>
         </dependency>
         <dependency>
             <groupId>org.librecms</groupId>
             <artifactId>ccm-cms-tinymce</artifactId>
-            <version>7.0.0-SNAPSHOT</version>
+            <version>${project.parent.version}</version>
         </dependency>
     </dependencies>
 
diff --git a/ccm-core/pom.xml b/ccm-core/pom.xml
index dff263738..8c09637e8 100644
--- a/ccm-core/pom.xml
+++ b/ccm-core/pom.xml
@@ -215,7 +215,7 @@
         <dependency>
             <groupId>org.reflections</groupId>
             <artifactId>reflections</artifactId>
-            <version>0.9.11</version>
+            <!--<version>0.9.11</version>-->
         </dependency>
         
         <!--<dependency>
diff --git a/pom.xml b/pom.xml
index a13cdb99e..17a111a3a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -184,7 +184,7 @@
                         <linkXref>true</linkXref>
                         <sourceEncoding>utf-8</sourceEncoding>
                         <targetJdk>1.8</targetJdk>
-<!--                        <rulesets>
+                        <!--                        <rulesets>
                             <ruleset>/rulesets/basic.xml</ruleset>
                             <ruleset>/rulesets/braces.xml</ruleset>
                             <ruleset>/rulesets/codesize.xml</ruleset>
@@ -382,6 +382,14 @@
                 <artifactId>javaee-api</artifactId>
                 <version>8.0.1</version>
             </dependency>
+            
+            <dependency>
+                <groupId>io.thorntail</groupId>
+                <artifactId>bom</artifactId>
+                <version>2.4.0.Final</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
 
             <!--
                 Hibernate, used as JPA provider, replacing the default
@@ -589,6 +597,12 @@
                 <artifactId>javax.json</artifactId>
                 <version>1.1.2</version>
             </dependency>-->
+            
+            <dependency>
+                <groupId>org.reflections</groupId>
+                <artifactId>reflections</artifactId>
+                <version>0.9.11</version>
+            </dependency>
 
             <dependency>
                 <groupId>org.freemarker</groupId>
@@ -779,6 +793,27 @@
                 <version>1.4.199</version>
             </dependency>
 
+            <!-- WebJars -->
+            <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>
         </dependencies>
     </dependencyManagement>