Merge pull request #9535 from amit2103/JAVA-1830

Java 1830

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>

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>

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>

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>

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>