Skip to content

Commit fcb0f98

Browse files
panos-kakospanos-kakos
committed
[JAVA-25997] Clean up
1 parent 8042c7d commit fcb0f98

File tree

19 files changed

+102
-86
lines changed

19 files changed

+102
-86
lines changed

‎spring-core-2/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@
149149
<plugin>
150150
<groupId>org.apache.maven.plugins</groupId>
151151
<artifactId>maven-war-plugin</artifactId>
152-
<version>${maven.version}</version>
152+
<version>${maven-war-plugin.version}</version>
153153
<configuration>
154154
<failOnMissingWebXml>false</failOnMissingWebXml>
155155
</configuration>
@@ -166,7 +166,7 @@
166166
<easymock.version>3.6</easymock.version>
167167
<shedlock.version>2.1.0</shedlock.version>
168168
<javassist.version>3.22.0-GA</javassist.version>
169-
<maven.version>3.2.2</maven.version>
169+
<maven-war-plugin.version.version>3.2.2</maven-war-plugin.version.version>
170170
</properties>
171171

172172
</project>

‎spring-core-4/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
<dependency>
7575
<groupId>org.apache.commons</groupId>
7676
<artifactId>commons-text</artifactId>
77-
<version>${apache-commons-text.version}</version>
77+
<version>${commons-text.version}</version>
7878
</dependency>
7979
</dependencies>
8080

@@ -84,7 +84,7 @@
8484
<awaitility.version>4.0.2</awaitility.version>
8585
<servlet-api.version>4.0.0</servlet-api.version>
8686
<annotation-api.version>1.3.2</annotation-api.version>
87-
<apache-commons-text.version>1.10.0</apache-commons-text.version>
87+
<commons-text.version>1.10.0</commons-text.version>
8888
</properties>
8989

9090
</project>

‎spring-credhub/pom.xml

+2-3
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<dependency>
2828
<groupId>org.springframework.credhub</groupId>
2929
<artifactId>spring-credhub-starter</artifactId>
30-
<version>2.2.0</version>
30+
<version>${spring-credhub-starter.version}</version>
3131
</dependency>
3232
<dependency>
3333
<groupId>com.google.code.gson</groupId>
@@ -36,8 +36,7 @@
3636
</dependencies>
3737

3838
<properties>
39-
<maven.compiler.source>8</maven.compiler.source>
40-
<maven.compiler.target>8</maven.compiler.target>
39+
<spring-credhub-starter.version>2.2.0</spring-credhub-starter.version>
4140
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4241
</properties>
4342

‎spring-ejb-modules/ejb-beans/pom.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,12 @@
6666
<dependency>
6767
<groupId>org.apache.activemq</groupId>
6868
<artifactId>activemq-broker</artifactId>
69-
<version>${activemq.broker.version}</version>
69+
<version>${activemq-broker.version}</version>
7070
</dependency>
7171
<dependency>
7272
<groupId>org.apache.activemq.tooling</groupId>
7373
<artifactId>activemq-junit</artifactId>
74-
<version>${activemq.junit.version}</version>
74+
<version>${activemq-junit.version}</version>
7575
<scope>test</scope>
7676
</dependency>
7777
<dependency>
@@ -187,8 +187,8 @@
187187
<wildfly.version>8.2.1.Final</wildfly.version>
188188
<javax.ejb-api.version>3.2</javax.ejb-api.version>
189189
<springframework.version>5.2.3.RELEASE</springframework.version>
190-
<activemq.broker.version>5.16.3</activemq.broker.version>
191-
<activemq.junit.version>5.16.3</activemq.junit.version>
190+
<activemq-broker.version>5.16.3</activemq-broker.version>
191+
<activemq-junit.version>5.16.3</activemq-junit.version>
192192
<mockito.version>2.21.0</mockito.version>
193193
<maven-dependency-plugin.version>2.8</maven-dependency-plugin.version>
194194
<wildfly-ejb.version>8.2.1.Final</wildfly-ejb.version>

‎spring-kafka-2/pom.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
<dependency>
5454
<groupId>org.testcontainers</groupId>
5555
<artifactId>junit-jupiter</artifactId>
56-
<version>${testcontainers-kafka.version}</version>
56+
<version>${testcontainers-junit-jupiter.version}</version>
5757
<scope>test</scope>
5858
</dependency>
5959
<dependency>
@@ -65,6 +65,7 @@
6565

6666
<properties>
6767
<testcontainers-kafka.version>1.16.2</testcontainers-kafka.version>
68+
<testcontainers-junit-jupiter>1.16.2</testcontainers-junit-jupiter>
6869
</properties>
6970

7071
</project>

‎spring-kafka/pom.xml

+4-2
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@
2626
<dependency>
2727
<groupId>org.springframework.boot</groupId>
2828
<artifactId>spring-boot-starter-actuator</artifactId>
29-
<version>3.0.5</version>
29+
<version>${spring-boot-starter-actuator.version}</version>
3030
</dependency>
3131
<dependency>
3232
<groupId>io.micrometer</groupId>
3333
<artifactId>micrometer-registry-prometheus</artifactId>
34-
<version>1.10.5</version>
34+
<version>${micrometer-registry-prometheus.version}</version>
3535
</dependency>
3636
<dependency>
3737
<groupId>org.springframework.kafka</groupId>
@@ -90,6 +90,8 @@
9090
</build>
9191

9292
<properties>
93+
<spring-boot-starter-actuator.version>3.0.5</spring-boot-starter-actuator.version>
94+
<micrometer-registry-prometheus.version>1.10.5</micrometer-registry-prometheus.version>
9395
<testcontainers-kafka.version>1.16.2</testcontainers-kafka.version>
9496
</properties>
9597

‎spring-katharsis/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<dependency>
3434
<groupId>io.katharsis</groupId>
3535
<artifactId>katharsis-spring</artifactId>
36-
<version>${katharsis.version}</version>
36+
<version>${katharsis-spring.version}</version>
3737
<exclusions>
3838
<exclusion>
3939
<groupId>org.apache.commons</groupId>
@@ -132,7 +132,7 @@
132132
</profiles>
133133

134134
<properties>
135-
<katharsis.version>3.0.2</katharsis.version>
135+
<katharsis-spring.version>3.0.2</katharsis-spring.version>
136136
<reflections.version>0.9.10</reflections.version>
137137
<cargo-maven2-plugin.version>1.6.1</cargo-maven2-plugin.version>
138138
</properties>

‎spring-mobile/pom.xml

-8
Original file line numberDiff line numberDiff line change
@@ -37,24 +37,16 @@
3737
<plugin>
3838
<groupId>org.apache.maven.plugins</groupId>
3939
<artifactId>maven-war-plugin</artifactId>
40-
<version>${maven-war-plugin.version}</version>
4140
</plugin>
4241
<plugin>
4342
<groupId>org.apache.maven.plugins</groupId>
4443
<artifactId>maven-compiler-plugin</artifactId>
45-
<version>${maven-compiler-plugin.version}</version>
46-
<configuration>
47-
<source>${maven.compiler.source}</source>
48-
<target>${maven.compiler.target}</target>
49-
</configuration>
5044
</plugin>
5145
</plugins>
5246
</build>
5347

5448
<properties>
5549
<spring-mobile-device.version>1.1.5.RELEASE</spring-mobile-device.version>
56-
<maven.compiler.source>11</maven.compiler.source>
57-
<maven.compiler.target>11</maven.compiler.target>
5850
</properties>
5951

6052
</project>

‎spring-pulsar/pom.xml

+5-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<dependency>
2828
<groupId>org.springframework.pulsar</groupId>
2929
<artifactId>spring-pulsar-spring-boot-starter</artifactId>
30-
<version>0.2.0</version>
30+
<version>${spring-pulsar-spring-boot-starter.version}</version>
3131
</dependency>
3232

3333
<dependency>
@@ -46,4 +46,8 @@
4646
</plugins>
4747
</build>
4848

49+
<properties>
50+
<spring-pulsar-spring-boot-starter.version>0.2.0</spring-pulsar-spring-boot-starter.version>
51+
</properties>
52+
4953
</project>

‎spring-reactive-modules/spring-5-reactive/pom.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@
124124
<plugins>
125125
<plugin>
126126
<artifactId>maven-resources-plugin</artifactId>
127-
<version>3.0.1</version>
127+
<version>${maven-resources-plugin.version}</version>
128128
<executions>
129129
<execution>
130130
<id>copy-resources</id>
@@ -159,6 +159,7 @@
159159
<johnzon.version>1.1.3</johnzon.version>
160160
<jsonb-api.version>1.0</jsonb-api.version>
161161
<geronimo-json_1.1_spec.version>1.0</geronimo-json_1.1_spec.version>
162+
<maven-resources-plugin.version>3.0.1</maven-resources-plugin.version>
162163
</properties>
163164

164165
</project>

‎spring-reactive-modules/spring-reactive-data-2/pom.xml

+7-5
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@
1313
<version>1.0.0-SNAPSHOT</version>
1414
</parent>
1515

16-
<properties>
17-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
18-
</properties>
19-
2016
<dependencies>
2117
<dependency>
2218
<groupId>org.springframework.boot</groupId>
@@ -62,8 +58,14 @@
6258
<dependency>
6359
<groupId>javax.validation</groupId>
6460
<artifactId>validation-api</artifactId>
65-
<version>2.0.1.Final</version>
61+
<version>${validation-api.version}</version>
6662
</dependency>
6763
</dependencies>
6864

65+
66+
<properties>
67+
<validation-api.version>2.0.1.Final</validation-api.version>
68+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
69+
</properties>
70+
6971
</project>

‎spring-reactive-modules/spring-reactive-security/pom.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,12 @@
8080
<dependency>
8181
<groupId>io.reactivex.rxjava2</groupId>
8282
<artifactId>rxjava</artifactId>
83-
<version>${rxjava-version}</version>
83+
<version>${rxjava.version}</version>
8484
</dependency>
8585
<dependency>
8686
<groupId>io.projectreactor</groupId>
8787
<artifactId>reactor-test</artifactId>
88-
<version>${project-reactor-test}</version>
88+
<version>${project-reactor-test.version}</version>
8989
<scope>test</scope>
9090
</dependency>
9191
<dependency>
@@ -114,11 +114,11 @@
114114

115115
<properties>
116116
<reactor-spring.version>1.0.1.RELEASE</reactor-spring.version>
117-
<rxjava-version>2.1.12</rxjava-version>
117+
<rxjava.version>2.1.12</rxjava.version>
118118
<johnzon.version>1.1.3</johnzon.version>
119119
<jsonb-api.version>1.0</jsonb-api.version>
120120
<geronimo-json_1.1_spec.version>1.0</geronimo-json_1.1_spec.version>
121-
<project-reactor-test>3.1.6.RELEASE</project-reactor-test>
121+
<project-reactor-test.version>3.1.6.RELEASE</project-reactor-test.version>
122122
</properties>
123123

124124
</project>

‎spring-remoting-modules/pom.xml

-6
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,10 @@
4343
<groupId>org.apache.maven.plugins</groupId>
4444
<artifactId>maven-compiler-plugin</artifactId>
4545
<version>${maven-compiler-plugin.version}</version>
46-
<configuration>
47-
<source>${maven.compiler.source}</source>
48-
<target>${maven.compiler.target}</target>
49-
</configuration>
5046
</plugin>
5147
</plugins>
5248
</build>
5349
<properties>
54-
<maven.compiler.source>11</maven.compiler.source>
55-
<maven.compiler.target>11</maven.compiler.target>
5650
</properties>
5751

5852
</project>

‎spring-shell/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
<plugin>
2929
<groupId>org.apache.maven.plugins</groupId>
3030
<artifactId>maven-war-plugin</artifactId>
31-
<version>${maven-war-plugin.version}</version>
3231
<configuration>
3332
<warSourceDirectory>src/main/webapp</warSourceDirectory>
3433
<failOnMissingWebXml>false</failOnMissingWebXml>

‎spring-soap/pom.xml

+6-3
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<dependency>
3535
<groupId>jakarta.xml.bind</groupId>
3636
<artifactId>jakarta.xml.bind-api</artifactId>
37-
<version>4.0.0</version>
37+
<version>${jakarta.xml.bind-api.version}</version>
3838
</dependency>
3939

4040
<dependency>
@@ -58,7 +58,7 @@
5858
<plugin>
5959
<groupId>org.codehaus.mojo</groupId>
6060
<artifactId>jaxb2-maven-plugin</artifactId>
61-
<version>3.1.0</version>
61+
<version>${jaxb2-maven-plugin.version}</version>
6262
<executions>
6363
<execution>
6464
<id>xjc</id>
@@ -79,7 +79,7 @@
7979
<plugin>
8080
<groupId>org.jvnet.jaxb2.maven2</groupId>
8181
<artifactId>maven-jaxb2-plugin</artifactId>
82-
<version>0.15.3</version>
82+
<version>${maven-jaxb2-plugin.version}</version>
8383
<executions>
8484
<execution>
8585
<goals>
@@ -103,5 +103,8 @@
103103

104104
<properties>
105105
<java.version>17</java.version>
106+
<jakarta.xml.bind-api.version>4.0.0</jakarta.xml.bind-api.version>
107+
<jaxb2-maven-plugin.version>3.1.0</jaxb2-maven-plugin.version>
108+
<maven-jaxb2-plugin.version>0.15.3</maven-jaxb2-plugin.version>
106109
</properties>
107110
</project>

‎spring-swagger-codegen/custom-validations-opeanpi-codegen/pom.xml

+10-5
Original file line numberDiff line numberDiff line change
@@ -29,22 +29,22 @@
2929
<dependency>
3030
<groupId>org.hibernate</groupId>
3131
<artifactId>hibernate-validator</artifactId>
32-
<version>6.0.10.Final</version>
32+
<version>${hibernate-validator.version}</version>
3333
</dependency>
3434
<dependency>
3535
<groupId>javax.validation</groupId>
3636
<artifactId>validation-api</artifactId>
37-
<version>2.0.1.Final</version>
37+
<version>${validation-api.version}</version>
3838
</dependency>
3939
<dependency>
4040
<groupId>org.openapitools</groupId>
4141
<artifactId>openapi-generator</artifactId>
42-
<version>3.3.4</version>
42+
<version>${openapi-generator.version}</version>
4343
</dependency>
4444
<dependency>
4545
<groupId>com.fasterxml.jackson.core</groupId>
4646
<artifactId>jackson-databind</artifactId>
47-
<version>2.10.0.pr3</version>
47+
<version>${jackson-databind.version}</version>
4848
</dependency>
4949
<dependency>
5050
<groupId>org.springdoc</groupId>
@@ -62,7 +62,7 @@
6262
<plugin>
6363
<groupId>org.openapitools</groupId>
6464
<artifactId>openapi-generator-maven-plugin</artifactId>
65-
<version>5.1.0</version>
65+
<version>${openapi-generator-maven-plugin.version}</version>
6666
<executions>
6767
<execution>
6868
<goals>
@@ -97,6 +97,11 @@
9797
<springfox-version>3.0.0</springfox-version>
9898
<log4j2.version>2.17.1</log4j2.version>
9999
<springdoc.version>1.7.0</springdoc.version>
100+
<hibernate-validator.version>6.0.10.Final</hibernate-validator.version>
101+
<validation-api.version>2.0.1.Final</validation-api.version>
102+
<openapi-generator.version>3.3.4</openapi-generator.version>
103+
<jackson-databind.version>2.10.0.pr3</jackson-databind.version>
104+
<openapi-generator-maven-plugin.version>5.1.0</openapi-generator-maven-plugin.version>
100105
</properties>
101106

102107
</project>

0 commit comments

Comments
 (0)