[BAEL-15321] - Extracted versions into properties

floison51 · Jul 6, 2019 · 73ea42d · 73ea42d
1 parent 88586cc
commit 73ea42d
Show file tree

Hide file tree

Showing 26 changed files with 97 additions and 53 deletions.
diff --git a/algorithms-miscellaneous-1/pom.xml b/algorithms-miscellaneous-1/pom.xml
@@ -42,7 +42,7 @@
         <dependency>
             <groupId>com.github.dpaukov</groupId>
             <artifactId>combinatoricslib3</artifactId>
-            <version>3.3.0</version>
+            <version>${combinatoricslib3.version}</version>
          </dependency>
     </dependencies>
 
@@ -83,6 +83,7 @@
         <org.assertj.core.version>3.9.0</org.assertj.core.version>
         <commons-codec.version>1.11</commons-codec.version>
         <guava.version>27.0.1-jre</guava.version>
+        <combinatoricslib3.version>3.3.0</combinatoricslib3.version>
     </properties>
 
 </project>
diff --git a/apache-avro/pom.xml b/apache-avro/pom.xml
@@ -17,7 +17,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.10</version>
+            <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/core-java-modules/core-java-collections-set/pom.xml b/core-java-modules/core-java-collections-set/pom.xml
@@ -27,17 +27,18 @@
     <dependency>
         <groupId>com.google.code.gson</groupId>
         <artifactId>gson</artifactId>
-        <version>2.8.5</version>
+        <version>${gson.version}</version>
     </dependency>
     <dependency>
         <groupId>commons-lang</groupId>
         <artifactId>commons-lang</artifactId>
-        <version>2.6</version>
+        <version>${commons-lang.version}</version>
     </dependency>
     </dependencies>
 
     <properties>
         <commons-collections4.version>4.3</commons-collections4.version>
         <guava.version>27.1-jre</guava.version>
+        <gson.version>2.8.5</gson.version>
     </properties>
 </project>
diff --git a/core-java-modules/core-java-exceptions/pom.xml b/core-java-modules/core-java-exceptions/pom.xml
@@ -22,7 +22,7 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.12</version>
+			<version>${junit.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

diff --git a/core-java-modules/multimodulemavenproject/pom.xml b/core-java-modules/multimodulemavenproject/pom.xml
@@ -19,13 +19,13 @@
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
-                <version>4.12</version>
+                <version>${junit.version}</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.assertj</groupId>
                 <artifactId>assertj-core</artifactId>
-                <version>3.12.2</version>
+                <version>${assertj-core.version}</version>
                 <scope>test</scope>
             </dependency>
         </dependencies>
@@ -58,5 +58,6 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <assertj-core.version>3.12.2</assertj-core.version>
     </properties>
 </project>
diff --git a/core-java-modules/pre-jpms/pom.xml b/core-java-modules/pre-jpms/pom.xml
@@ -18,7 +18,7 @@
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
-			<version>1.7.25</version>
+			<version>${org.slf4j.version}</version>
 		</dependency>
 	</dependencies>
 	<build>

diff --git a/jackson-2/pom.xml b/jackson-2/pom.xml
@@ -26,21 +26,21 @@
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-yaml</artifactId>
-            <version>2.9.8</version>
+            <version>${jackson.version}</version>
         </dependency>
 
         <!-- CSV -->
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-csv</artifactId>
-            <version>2.9.8</version>
+            <version>${jackson.version}</version>
         </dependency>        
 
         <!-- Allow use of LocalDate -->
         <dependency>
             <groupId>com.fasterxml.jackson.datatype</groupId>
             <artifactId>jackson-datatype-jsr310</artifactId>
-            <version>2.9.8</version>
+            <version>${jackson.version}</version>
         </dependency>
 
 

diff --git a/java-dates-2/pom.xml b/java-dates-2/pom.xml
@@ -25,7 +25,7 @@
         <dependency>
             <groupId>commons-validator</groupId>
             <artifactId>commons-validator</artifactId>
-            <version>1.6</version>
+            <version>${commons-validator.version}</version>
         </dependency>
 
         <!-- test scoped -->
@@ -63,6 +63,7 @@
         <!-- testing -->
         <assertj.version>3.6.1</assertj.version>
         <joda-time.version>2.10</joda-time.version>
+        <commons-validator.version>1.6</commons-validator.version>
         <maven.compiler.source>1.9</maven.compiler.source>
         <maven.compiler.target>1.9</maven.compiler.target>
     </properties>

diff --git a/java-math/pom.xml b/java-math/pom.xml
@@ -42,7 +42,7 @@
         <dependency>
             <groupId>com.github.dpaukov</groupId>
             <artifactId>combinatoricslib3</artifactId>
-            <version>3.3.0</version>
+            <version>${combinatoricslib3.version}</version>
          </dependency>
     </dependencies>
 
@@ -63,6 +63,7 @@
         <org.assertj.core.version>3.9.0</org.assertj.core.version>
         <commons-codec.version>1.11</commons-codec.version>
         <guava.version>27.0.1-jre</guava.version>
+        <combinatoricslib3.version>3.3.0</combinatoricslib3.version>
     </properties>
 
 </project>
diff --git a/libraries-2/pom.xml b/libraries-2/pom.xml
@@ -34,7 +34,7 @@
         <dependency>
             <groupId>com.pivovarit</groupId>
             <artifactId>parallel-collectors</artifactId>
-            <version>1.1.0</version>
+            <version>${parallel-collectors.version}</version>
         </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
@@ -96,22 +96,22 @@
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
-            <version>3.14.2</version>
+            <version>${okhttp.version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.9.9</version>
+            <version>${jackson.version}</version>
         </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.8.5</version>
+            <version>${gson.version}</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>mockwebserver</artifactId>
-            <version>3.14.2</version>
+            <version>${mockwebserver.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -122,7 +122,7 @@
         <dependency>
             <groupId>com.github.jknack</groupId>
             <artifactId>handlebars</artifactId>
-            <version>4.1.2</version>
+            <version>${handlebars.version}</version>
         </dependency>
         <!-- Benchmarking -->
         <dependency>
@@ -156,5 +156,10 @@
         <la4j.version>0.6.0</la4j.version>
         <jmh.version>1.19</jmh.version>
         <mesos.library.version>0.28.3</mesos.library.version>
+        <parallel-collectors.version>1.1.0</parallel-collectors.version>
+        <okhttp.version>3.14.2</okhttp.version>
+        <gson.version>2.8.5</gson.version>
+        <mockwebserver.version>3.14.2</mockwebserver.version>
+        <handlebars.version>4.1.2</handlebars.version>
     </properties>
 </project>
diff --git a/maven/versions-maven-plugin/original/pom.xml b/maven/versions-maven-plugin/original/pom.xml
@@ -11,19 +11,19 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.3</version>
+            <version>${commons-io.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-collections4</artifactId>
-            <version>4.0</version>
+            <version>${commons-collections4.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.0</version>
+            <version>${commons-lang3.version}</version>
         </dependency>
 
         <dependency>
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>commons-beanutils</groupId>
             <artifactId>commons-beanutils</artifactId>
-            <version>1.9.1-SNAPSHOT</version>
+            <version>${commons-beanutils.version}</version>
         </dependency>
 
     </dependencies>
@@ -71,6 +71,10 @@
 
     <properties>        
         <commons-compress-version>1.15</commons-compress-version>
+        <commons-io.version>2.3</commons-io.version>
+        <commons-collections4.version>4.0</commons-collections4.version>
+        <commons-lang3.version>3.0</commons-lang3.version>
+        <commons-beanutils.version>1.9.1</commons-beanutils.version>
     </properties>
 
 </project>
diff --git a/patterns/dip/pom.xml b/patterns/dip/pom.xml
@@ -19,13 +19,13 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.12</version>
+            <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>3.12.1</version>
+            <version>${assertj-core.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -34,6 +34,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
+        <assertj-core.version>3.12.1</assertj-core.version>
     </properties>
 
 </project>
diff --git a/persistence-modules/elasticsearch/pom.xml b/persistence-modules/elasticsearch/pom.xml
@@ -20,12 +20,16 @@
         <dependency>
             <groupId>io.searchbox</groupId>
             <artifactId>jest</artifactId>
-            <version>6.3.1</version>
+            <version>${jest.version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.9.6</version>
+            <version>${jackson.version}</version>
         </dependency>
     </dependencies>
+
+    <properties>
+        <jest.version>6.3.1</jest.version>
+    </properties>
 </project>
diff --git a/persistence-modules/hibernate-mapping/pom.xml b/persistence-modules/hibernate-mapping/pom.xml
@@ -45,12 +45,12 @@
         <dependency>
             <groupId>javax.money</groupId>
             <artifactId>money-api</artifactId>
-            <version>1.0.3</version>
+            <version>${money-api.version}</version>
         </dependency>
         <dependency>
             <groupId>org.javamoney</groupId>
             <artifactId>moneta</artifactId>
-            <version>1.3</version>
+            <version>${moneta.version}</version>
             <type>pom</type>
         </dependency>
     </dependencies>
@@ -70,6 +70,8 @@
         <assertj-core.version>3.8.0</assertj-core.version>
         <hibernate-validator.version>6.0.16.Final</hibernate-validator.version>
         <org.glassfish.javax.el.version>3.0.1-b11</org.glassfish.javax.el.version>
+        <money-api.version>1.0.3</money-api.version>
+        <moneta.version>1.3</moneta.version>
     </properties>
 
 </project>
diff --git a/persistence-modules/hibernate-ogm/pom.xml b/persistence-modules/hibernate-ogm/pom.xml
@@ -19,31 +19,31 @@
 		<dependency>
 			<groupId>org.hibernate.ogm</groupId>
 			<artifactId>hibernate-ogm-mongodb</artifactId>
-			<version>5.4.0.Final</version>
+			<version>${hibernate.version}</version>
 		</dependency>
 		<!-- Neo4j -->
 		<dependency>
 			<groupId>org.hibernate.ogm</groupId>
 			<artifactId>hibernate-ogm-neo4j</artifactId>
-			<version>5.4.0.Final</version>
+			<version>${hibernate.version}</version>
 		</dependency>
 		<!-- Narayana JTA -->  
 		<dependency>
 			<groupId>org.jboss.narayana.jta</groupId>
 			<artifactId>narayana-jta</artifactId>
-			<version>5.5.23.Final</version>
+			<version>${narayana-jta.version}</version>
 		</dependency>
 		<!-- Testing -->
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.12</version>
+			<version>${junit.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.easytesting</groupId>
 			<artifactId>fest-assert</artifactId>
-			<version>1.4</version>
+			<version>${fest-assert.version}</version>
 			<scope>test</scope>
 		</dependency>
     </dependencies>
@@ -57,4 +57,10 @@
             </resource>
         </resources>
     </build>
+
+    <properties>
+        <hibernate.version>5.4.0.Final</hibernate.version>
+        <fest-assert.version>1.4</fest-assert.version>
+        <narayana-jta.version>5.5.23.Final</narayana-jta.version>
+    </properties>
 </project>