Skip to content

Commit 510f119

Browse files
jzheauxjzheaux
authored
Merge pull request eugenp#9535 from amit2103/JAVA-1830
Java 1830
2 parents 565f8c9 + d2eb05b commit 510f119

File tree

39 files changed

+134
-65
lines changed

39 files changed

+134
-65
lines changed

‎atomikos/pom.xml‎

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<dependency>
4242
<groupId>org.springframework.data</groupId>
4343
<artifactId>spring-data-jpa</artifactId>
44-
<version>1.11.23.RELEASE</version>
44+
<version>${spring-data-jpa.version}</version>
4545
</dependency>
4646
<dependency>
4747
<groupId>org.springframework</groupId>
@@ -64,56 +64,65 @@
6464
<dependency>
6565
<groupId>org.apache.activemq</groupId>
6666
<artifactId>activemq-core</artifactId>
67-
<version>5.7.0</version>
67+
<version>${activemq-core.version}</version>
6868
</dependency>
6969
<dependency>
7070
<groupId>org.apache.derby</groupId>
7171
<artifactId>derby</artifactId>
72-
<version>10.8.1.2</version>
72+
<version>${derby.version}</version>
7373
</dependency>
7474
<dependency>
7575
<groupId>junit</groupId>
7676
<artifactId>junit</artifactId>
77-
<version>4.12</version>
77+
<version>${junit.version}</version>
7878
<scope>test</scope>
7979
</dependency>
8080
<!-- the JTA API -->
8181
<dependency>
8282
<groupId>javax.transaction</groupId>
8383
<artifactId>jta</artifactId>
84-
<version>1.1</version>
84+
<version>${jta.version}</version>
8585
</dependency>
8686
<dependency>
8787
<groupId>org.apache.geronimo.specs</groupId>
8888
<artifactId>geronimo-jta_1.0.1B_spec</artifactId>
89-
<version>1.0</version>
89+
<version>${geronimo.version}</version>
9090
</dependency>
9191
<dependency>
9292
<groupId>javax.validation</groupId>
9393
<artifactId>validation-api</artifactId>
94-
<version>2.0.1.Final</version>
94+
<version>${validation-api.version}</version>
9595
</dependency>
9696
<dependency>
9797
<groupId>org.hibernate.validator</groupId>
9898
<artifactId>hibernate-validator</artifactId>
99-
<version>6.1.2.Final</version>
99+
<version>${hibernate-validator.version}</version>
100100
</dependency>
101101
<dependency>
102102
<groupId>javax.el</groupId>
103103
<artifactId>javax.el-api</artifactId>
104-
<version>3.0.0</version>
104+
<version>${javax.el-api.version}</version>
105105
</dependency>
106106
<dependency>
107107
<groupId>org.glassfish.web</groupId>
108108
<artifactId>javax.el</artifactId>
109-
<version>2.2.4</version>
109+
<version>${javax.el.version}</version>
110110
</dependency>
111111
</dependencies>
112112

113113
<properties>
114114
<atomikos-version>5.0.6</atomikos-version>
115115
<spring-version>5.1.6.RELEASE</spring-version>
116116
<hibernate.version>5.4.3.Final</hibernate.version>
117+
<spring-data-jpa.version>1.11.23.RELEASE</spring-data-jpa.version>
118+
<activemq-core.version>5.7.0</activemq-core.version>
119+
<derby.version>10.8.1.2</derby.version>
120+
<jta.version>1.1</jta.version>
121+
<geronimo.version>1.0</geronimo.version>
122+
<validation-api.version>2.0.1.Final</validation-api.version>
123+
<hibernate-validator.version>6.1.2.Final</hibernate-validator.version>
124+
<javax.el-api.version>3.0.0</javax.el-api.version>
125+
<javax.el.version>2.2.4</javax.el.version>
117126
</properties>
118127

119128
</project>

‎core-groovy-2/determine-datatype/pom.xml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,11 @@
3434
<dependency>
3535
<groupId>org.junit</groupId>
3636
<artifactId>junit5-engine</artifactId>
37-
<version>5.0.0-ALPHA</version>
37+
<version>${junit5.version}</version>
3838
</dependency>
3939
</dependencies>
40+
41+
<properties>
42+
<junit5.version>5.0.0-ALPHA</junit5.version>
43+
</properties>
4044
</project>

‎core-java-modules/core-java-concurrency-2/pom.xml‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,31 +19,31 @@
1919
<dependency>
2020
<groupId>junit</groupId>
2121
<artifactId>junit</artifactId>
22-
<version>4.13</version>
22+
<version>${junit.version}</version>
2323
<scope>test</scope>
2424
</dependency>
2525
<dependency>
2626
<groupId>com.googlecode.thread-weaver</groupId>
2727
<artifactId>threadweaver</artifactId>
28-
<version>0.2</version>
28+
<version>${threadweaver.version}</version>
2929
<scope>test</scope>
3030
</dependency>
3131
<dependency>
3232
<groupId>com.google.code.tempus-fugit</groupId>
3333
<artifactId>tempus-fugit</artifactId>
34-
<version>1.1</version>
34+
<version>${tempus-fugit.version}</version>
3535
<scope>test</scope>
3636
</dependency>
3737
<dependency>
3838
<groupId>com.googlecode.multithreadedtc</groupId>
3939
<artifactId>multithreadedtc</artifactId>
40-
<version>1.01</version>
40+
<version>${multithreadedtc.version}</version>
4141
<scope>test</scope>
4242
</dependency>
4343
<dependency>
4444
<groupId>org.openjdk.jcstress</groupId>
4545
<artifactId>jcstress-core</artifactId>
46-
<version>0.5</version>
46+
<version>${jcstress-core.version}</version>
4747
</dependency>
4848
</dependencies>
4949

@@ -63,8 +63,8 @@
6363
<version>3.1</version>
6464
<configuration>
6565
<compilerVersion>${javac.target}</compilerVersion>
66-
<source>${javac.target}</source>
67-
<target>${javac.target}</target>
66+
<source>${java.version}</source>
67+
<target>${java.version}</target>
6868
</configuration>
6969
</plugin>
7070

@@ -99,7 +99,11 @@
9999
</build>
100100

101101
<properties>
102-
<javac.target>1.8</javac.target>
102+
<junit.version>4.13</junit.version>
103+
<threadweaver.version>0.2</threadweaver.version>
104+
<tempus-fugit.version>1.1</tempus-fugit.version>
105+
<multithreadedtc.version>1.01</multithreadedtc.version>
106+
<jcstress-core.version>0.5</jcstress-core.version>
103107
</properties>
104108

105109
</project>

‎core-java-modules/core-java-io-2/pom.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<dependency>
5151
<groupId>com.github.tomakehurst</groupId>
5252
<artifactId>wiremock</artifactId>
53-
<version>2.26.3</version>
53+
<version>${wiremock.version}</version>
5454
<scope>test</scope>
5555
</dependency>
5656

@@ -80,6 +80,7 @@
8080
<properties>
8181
<assertj.version>3.6.1</assertj.version>
8282
<maven-javadoc-plugin.version>3.0.0-M1</maven-javadoc-plugin.version>
83+
<wiremock.version>2.26.3</wiremock.version>
8384
</properties>
8485

8586
</project>

‎core-java-modules/core-java-io-conversions-2/pom.xml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<dependency>
2525
<groupId>org.json</groupId>
2626
<artifactId>json</artifactId>
27-
<version>20200518</version>
27+
<version>${json.version}</version>
2828
</dependency>
2929
</dependencies>
3030

@@ -38,4 +38,8 @@
3838
</resources>
3939
</build>
4040

41+
<properties>
42+
<json.version>20200518</json.version>
43+
</properties>
44+
4145
</project>

‎core-java-modules/core-java-regex/pom.xml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<dependency>
3030
<groupId>org.assertj</groupId>
3131
<artifactId>assertj-core</artifactId>
32-
<version>3.15.0</version>
32+
<version>${assertj-core.version}</version>
3333
<scope>test</scope>
3434
</dependency>
3535
</dependencies>
@@ -44,4 +44,8 @@
4444
</resources>
4545
</build>
4646

47+
<properties>
48+
<assertj-core.version>3.15.0</assertj-core.version>
49+
</properties>
50+
4751
</project>

‎core-java-modules/core-java-security-2/pom.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<dependency>
4242
<groupId>javax.xml.bind</groupId>
4343
<artifactId>jaxb-api</artifactId>
44-
<version>2.3.1</version>
44+
<version>${jaxb-api.version}</version>
4545
</dependency>
4646

4747

@@ -54,6 +54,7 @@
5454

5555
<!-- testing -->
5656
<assertj-core.version>3.10.0</assertj-core.version>
57+
<jaxb-api.version>2.3.1</jaxb-api.version>
5758
</properties>
5859

5960
</project>

‎image-processing/pom.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<dependency>
3939
<groupId>org.openpnp</groupId>
4040
<artifactId>opencv</artifactId>
41-
<version>3.4.2-0</version>
41+
<version>${opencv.version}</version>
4242
</dependency>
4343
<dependency>
4444
<groupId>com.twelvemonkeys.imageio</groupId>
@@ -68,6 +68,7 @@
6868
<imageio.version>3.3.2</imageio.version>
6969
<tess4j.version>4.5.1</tess4j.version>
7070
<tesseract-platform.version>4.1.0-1.5.2</tesseract-platform.version>
71+
<opencv.version>3.4.2-0</opencv.version>
7172
</properties>
7273

7374
</project>

‎jackson-modules/jackson-conversions-2/pom.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<dependency>
2424
<groupId>com.fasterxml.jackson.datatype</groupId>
2525
<artifactId>jackson-datatype-jsr310</artifactId>
26-
<version>2.9.8</version>
26+
<version>${jackson-datatype.version}</version>
2727
</dependency>
2828
<!-- CSV -->
2929
<dependency>
@@ -51,6 +51,7 @@
5151

5252
<properties>
5353
<assertj.version>3.11.0</assertj.version>
54+
<jackson-datatype.version>2.9.8</jackson-datatype.version>
5455
</properties>
5556

5657
</project>

‎json-2/pom.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,13 @@
4747
<dependency>
4848
<groupId>org.apache.commons</groupId>
4949
<artifactId>commons-lang3</artifactId>
50-
<version>3.9</version>
50+
<version>${commons-lang3.version}</version>
5151
</dependency>
5252
</dependencies>
5353
<properties>
5454
<jsoniter.version>0.9.23</jsoniter.version>
5555
<assertj-core.version>3.11.1</assertj-core.version>
5656
<moshi.version>1.9.2</moshi.version>
57+
<commons-lang3.version>3.9</commons-lang3.version>
5758
</properties>
5859
</project>

0 commit comments

Comments
 (0)