extract version into properties tag & moved common properties in parent

JoannaaKL · Jun 20, 2020 · 8c2fdd3 · 8c2fdd3
1 parent 78590ed
commit 8c2fdd3
Show file tree

Hide file tree

Showing 39 changed files with 134 additions and 65 deletions.
diff --git a/atomikos/pom.xml b/atomikos/pom.xml
@@ -41,7 +41,7 @@
 		<dependency>
 			<groupId>org.springframework.data</groupId>
 			<artifactId>spring-data-jpa</artifactId>
-			<version>1.11.23.RELEASE</version>
+			<version>${spring-data-jpa.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -64,56 +64,65 @@
 		<dependency>
 			<groupId>org.apache.activemq</groupId>
 			<artifactId>activemq-core</artifactId>
-			<version>5.7.0</version>
+			<version>${activemq-core.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.derby</groupId>
 			<artifactId>derby</artifactId>
-			<version>10.8.1.2</version>
+			<version>${derby.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.12</version>
+			<version>${junit.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<!-- the JTA API -->
 		<dependency>
 			<groupId>javax.transaction</groupId>
 			<artifactId>jta</artifactId>
-			<version>1.1</version>
+			<version>${jta.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.geronimo.specs</groupId>
 			<artifactId>geronimo-jta_1.0.1B_spec</artifactId>
-			<version>1.0</version>
+			<version>${geronimo.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>javax.validation</groupId>
 			<artifactId>validation-api</artifactId>
-			<version>2.0.1.Final</version>
+			<version>${validation-api.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.hibernate.validator</groupId>
 			<artifactId>hibernate-validator</artifactId>
-			<version>6.1.2.Final</version>
+			<version>${hibernate-validator.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>javax.el</groupId>
 			<artifactId>javax.el-api</artifactId>
-			<version>3.0.0</version>
+			<version>${javax.el-api.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.glassfish.web</groupId>
 			<artifactId>javax.el</artifactId>
-			<version>2.2.4</version>
+			<version>${javax.el.version}</version>
 		</dependency>
 	</dependencies>
 
 	<properties>
 		<atomikos-version>5.0.6</atomikos-version>
 		<spring-version>5.1.6.RELEASE</spring-version>
 		<hibernate.version>5.4.3.Final</hibernate.version>
+		<spring-data-jpa.version>1.11.23.RELEASE</spring-data-jpa.version>
+		<activemq-core.version>5.7.0</activemq-core.version>
+		<derby.version>10.8.1.2</derby.version>
+		<jta.version>1.1</jta.version>
+		<geronimo.version>1.0</geronimo.version>
+		<validation-api.version>2.0.1.Final</validation-api.version>
+		<hibernate-validator.version>6.1.2.Final</hibernate-validator.version>
+		<javax.el-api.version>3.0.0</javax.el-api.version>
+		<javax.el.version>2.2.4</javax.el.version>
 	</properties>
 
 </project>
diff --git a/core-groovy-2/determine-datatype/pom.xml b/core-groovy-2/determine-datatype/pom.xml
@@ -34,7 +34,11 @@
         <dependency>
             <groupId>org.junit</groupId>
             <artifactId>junit5-engine</artifactId>
-            <version>5.0.0-ALPHA</version>
+            <version>${junit5.version}</version>
         </dependency>
     </dependencies>
+
+    <properties>
+        <junit5.version>5.0.0-ALPHA</junit5.version>
+    </properties>
 </project>
diff --git a/core-java-modules/core-java-concurrency-2/pom.xml b/core-java-modules/core-java-concurrency-2/pom.xml
@@ -19,31 +19,31 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.13</version>
+            <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.googlecode.thread-weaver</groupId>
             <artifactId>threadweaver</artifactId>
-            <version>0.2</version>
+            <version>${threadweaver.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.google.code.tempus-fugit</groupId>
             <artifactId>tempus-fugit</artifactId>
-            <version>1.1</version>
+            <version>${tempus-fugit.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.googlecode.multithreadedtc</groupId>
             <artifactId>multithreadedtc</artifactId>
-            <version>1.01</version>
+            <version>${multithreadedtc.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.openjdk.jcstress</groupId>
             <artifactId>jcstress-core</artifactId>
-            <version>0.5</version>
+            <version>${jcstress-core.version}</version>
         </dependency>
     </dependencies>
 
@@ -63,8 +63,8 @@
                 <version>3.1</version>
                 <configuration>
                     <compilerVersion>${javac.target}</compilerVersion>
-                    <source>${javac.target}</source>
-                    <target>${javac.target}</target>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
                 </configuration>
             </plugin>
 
@@ -99,7 +99,11 @@
     </build>
 
     <properties>
-        <javac.target>1.8</javac.target>
+	    <junit.version>4.13</junit.version>
+        <threadweaver.version>0.2</threadweaver.version>
+        <tempus-fugit.version>1.1</tempus-fugit.version>
+        <multithreadedtc.version>1.01</multithreadedtc.version>
+        <jcstress-core.version>0.5</jcstress-core.version>
     </properties>
 
 </project>
diff --git a/core-java-modules/core-java-io-2/pom.xml b/core-java-modules/core-java-io-2/pom.xml
@@ -50,7 +50,7 @@
         <dependency>
             <groupId>com.github.tomakehurst</groupId>
             <artifactId>wiremock</artifactId>
-            <version>2.26.3</version>
+            <version>${wiremock.version}</version>
             <scope>test</scope>
         </dependency>
 
@@ -80,6 +80,7 @@
     <properties>
         <assertj.version>3.6.1</assertj.version>
         <maven-javadoc-plugin.version>3.0.0-M1</maven-javadoc-plugin.version>
+        <wiremock.version>2.26.3</wiremock.version>
     </properties>
 
 </project>
diff --git a/core-java-modules/core-java-io-conversions-2/pom.xml b/core-java-modules/core-java-io-conversions-2/pom.xml
@@ -24,7 +24,7 @@
         <dependency>
             <groupId>org.json</groupId>
             <artifactId>json</artifactId>
-            <version>20200518</version>
+            <version>${json.version}</version>
         </dependency>
     </dependencies>
 
@@ -38,4 +38,8 @@
         </resources>
     </build>
 
+    <properties>
+        <json.version>20200518</json.version>
+    </properties>
+
 </project>
diff --git a/core-java-modules/core-java-regex/pom.xml b/core-java-modules/core-java-regex/pom.xml
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>3.15.0</version>
+            <version>${assertj-core.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -44,4 +44,8 @@
         </resources>
     </build>
 
+    <properties>
+        <assertj-core.version>3.15.0</assertj-core.version>
+    </properties>
+
 </project>
diff --git a/core-java-modules/core-java-security-2/pom.xml b/core-java-modules/core-java-security-2/pom.xml
@@ -41,7 +41,7 @@
         <dependency>
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
-            <version>2.3.1</version>
+            <version>${jaxb-api.version}</version>
         </dependency>
 
 
@@ -54,6 +54,7 @@
 
         <!-- testing -->
         <assertj-core.version>3.10.0</assertj-core.version>
+        <jaxb-api.version>2.3.1</jaxb-api.version>
     </properties>
 
 </project>
diff --git a/image-processing/pom.xml b/image-processing/pom.xml
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>org.openpnp</groupId>
             <artifactId>opencv</artifactId>
-            <version>3.4.2-0</version>
+            <version>${opencv.version}</version>
         </dependency>
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
@@ -68,6 +68,7 @@
         <imageio.version>3.3.2</imageio.version>
         <tess4j.version>4.5.1</tess4j.version>
         <tesseract-platform.version>4.1.0-1.5.2</tesseract-platform.version>
+        <opencv.version>3.4.2-0</opencv.version>
     </properties>
 
 </project>
diff --git a/jackson-modules/jackson-conversions-2/pom.xml b/jackson-modules/jackson-conversions-2/pom.xml
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.datatype</groupId>
             <artifactId>jackson-datatype-jsr310</artifactId>
-            <version>2.9.8</version>
+            <version>${jackson-datatype.version}</version>
         </dependency>
         <!-- CSV -->
         <dependency>
@@ -51,6 +51,7 @@
 
     <properties>
         <assertj.version>3.11.0</assertj.version>
+        <jackson-datatype.version>2.9.8</jackson-datatype.version>
     </properties>
 
 </project>
diff --git a/json-2/pom.xml b/json-2/pom.xml
@@ -47,12 +47,13 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.9</version>
+            <version>${commons-lang3.version}</version>
         </dependency>
     </dependencies>
     <properties>
         <jsoniter.version>0.9.23</jsoniter.version>
         <assertj-core.version>3.11.1</assertj-core.version>
         <moshi.version>1.9.2</moshi.version>
+        <commons-lang3.version>3.9</commons-lang3.version>
     </properties>
 </project>
diff --git a/kotlin-libraries/pom.xml b/kotlin-libraries/pom.xml
@@ -151,7 +151,6 @@
     </dependencies>
 
     <properties>
-        <junit.version>4.12</junit.version>
         <mockito-kotlin.version>1.5.0</mockito-kotlin.version>
         <kodein.version>4.1.0</kodein.version>
         <klaxon.version>3.0.4</klaxon.version>

diff --git a/kotlin-quasar/pom.xml b/kotlin-quasar/pom.xml
@@ -148,7 +148,6 @@
         <dependency.plugin.version>3.1.1</dependency.plugin.version> 
         <surefire.plugin.version>2.22.1</surefire.plugin.version>
         <exec.plugin.version>1.3.2</exec.plugin.version>
-        <junit.version>4.12</junit.version>
     </properties>
 
 </project>
diff --git a/libraries-3/pom.xml b/libraries-3/pom.xml
@@ -73,19 +73,19 @@
           <dependency>
             <groupId>com.uber.nullaway</groupId>
             <artifactId>nullaway</artifactId>
-            <version>0.3.0</version>
+            <version>${nullaway.version}</version>
         </dependency>
         <dependency>
             <groupId>org.codehaus.plexus</groupId>
             <artifactId>plexus-compiler-javac-errorprone</artifactId>
-            <version>2.8</version>
+            <version>${plexus-compiler.version}</version>
         </dependency>
         <!-- override plexus-compiler-javac-errorprone's dependency on
              Error Prone with the latest version -->
         <dependency>
             <groupId>com.google.errorprone</groupId>
             <artifactId>error_prone_core</artifactId>
-            <version>2.1.3</version>
+            <version>${errorprone.version}</version>
         </dependency>
     </dependencies>
 
@@ -230,5 +230,8 @@
         <httpclient.version>4.5.12</httpclient.version>
         <velocity-engine-core.version>2.2</velocity-engine-core.version>
         <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
+        <nullaway.version>0.3.0</nullaway.version>
+        <plexus-compiler.version>2.8</plexus-compiler.version>
+        <errorprone.version>2.1.3</errorprone.version>
     </properties>
 </project>
diff --git a/libraries-4/pom.xml b/libraries-4/pom.xml
@@ -91,7 +91,7 @@
         <dependency>
             <groupId>org.glassfish.web</groupId>
             <artifactId>javax.el</artifactId>
-            <version>2.2.4</version>
+            <version>${glassfish.web.version}</version>
         </dependency>
     </dependencies>
 
@@ -111,6 +111,7 @@
         <awaitility.version>3.0.0</awaitility.version>
         <streamex.version>0.6.5</streamex.version>
         <javax.el.version>3.0.0</javax.el.version>
+        <glassfish.web.version>2.2.4</glassfish.web.version>
     </properties>
 
 </project>
diff --git a/libraries-concurrency/pom.xml b/libraries-concurrency/pom.xml
@@ -16,17 +16,17 @@
         <dependency>
             <groupId>co.paralleluniverse</groupId>
             <artifactId>quasar-core</artifactId>
-            <version>0.8.0</version>
+            <version>${quasar.version}</version>
         </dependency>
         <dependency>
             <groupId>co.paralleluniverse</groupId>
             <artifactId>quasar-actors</artifactId>
-            <version>0.8.0</version>
+            <version>${quasar.version}</version>
         </dependency>
         <dependency>
             <groupId>co.paralleluniverse</groupId>
             <artifactId>quasar-reactive-streams</artifactId>
-            <version>0.8.0</version>
+            <version>${quasar.version}</version>
         </dependency>
     </dependencies>
 
@@ -78,4 +78,8 @@
             </plugin>
         </plugins>
     </build>
+
+    <properties>
+        <quasar.version>0.8.0</quasar.version>
+    </properties>
 </project>
diff --git a/micronaut/pom.xml b/micronaut/pom.xml
@@ -144,7 +144,6 @@
         <jdk.version>1.8</jdk.version>
         <annotation.api.version>1.3.2</annotation.api.version>
         <lombok.version>1.2.3</lombok.version>
-        <junit.version>4.12</junit.version>
         <reactor.version>3.1.6.RELEASE</reactor.version>
         <compiler.plugin.version>3.7.0</compiler.plugin.version>
         <exec.plugin.version>1.6.0</exec.plugin.version>

diff --git a/parent-boot-2/pom.xml b/parent-boot-2/pom.xml
@@ -82,6 +82,7 @@
         <!-- plugins -->
         <thin.version>1.0.22.RELEASE</thin.version>
         <spring-boot.version>2.2.6.RELEASE</spring-boot.version>
+        <aspectjweaver.version>1.9.1</aspectjweaver.version>
     </properties>
 
 </project>