Skip to content

Commit 11c4f01

Browse files
fabapp2fabapp2
committed
Unified Maven dependency versions
1 parent 010e255 commit 11c4f01

File tree

7 files changed

+132
-61
lines changed
  • pom.xml
  • spring-rewrite-commons-gradle/spring-rewrite-commons-rewrite-gradle-model
  • spring-rewrite-commons-launcher
  • spring-rewrite-commons-maven-embedder
  • spring-rewrite-commons-starters/spring-rewrite-commons-starter-boot-upgrade
  • spring-rewrite-commons-test

7 files changed

+132
-61
lines changed

‎pom.xml

+55-5
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,17 @@
3535
<!-- prod dependencies -->
3636
<spring-boot.version>3.2.1</spring-boot.version>
3737
<rewrite.version>8.13.4</rewrite.version>
38-
<rewrite-kotlin.version>1.8.4</rewrite-kotlin.version>
39-
<rewrite-polyglot.version>1.8.11</rewrite-polyglot.version>
38+
<rewrite-kotlin.version>1.10.0</rewrite-kotlin.version>
39+
<rewrite-polyglot.version>1.9.2</rewrite-polyglot.version>
4040
<rewrite-maven-plugin.version>5.20.0</rewrite-maven-plugin.version>
4141
<jaxb-api.version>2.3.1</jaxb-api.version>
4242

4343
<!-- testing dependencies -->
44-
<maven.version>3.9.1</maven.version>
45-
<maven-resolver.version>1.9.13</maven-resolver.version>
44+
<maven.version>3.9.6</maven.version>
45+
<maven-resolver.version>1.9.18</maven-resolver.version>
46+
<maven-embedder.version>3.9.6</maven-embedder.version>
4647
<maven-wagon-http.version>3.5.3</maven-wagon-http.version>
47-
<plexus-cypher.version>1.8</plexus-cypher.version>
48+
<plexus-cypher.version>2.0</plexus-cypher.version>
4849
<maven-invoker.version>3.2.0</maven-invoker.version>
4950
<junit-pioneer.version>2.1.0</junit-pioneer.version>
5051

@@ -118,6 +119,37 @@
118119
<artifactId>spring-rewrite-commons-test</artifactId>
119120
<version>0.1.0-SNAPSHOT</version>
120121
</dependency>
122+
<dependency>
123+
<groupId>org.apache.maven</groupId>
124+
<artifactId>maven-embedder</artifactId>
125+
<version>${maven-embedder.version}</version> <!-- Use the latest version available -->
126+
<exclusions>
127+
<exclusion>
128+
<groupId>org.codehaus.plexus</groupId>
129+
<artifactId>plexus-component-annotations</artifactId>
130+
</exclusion>
131+
<!-- org.apache.maven:maven-embedder:jar:3.9.6 brings maven-shared-utils:3.3.4 while 3.4.2 is right -->
132+
<exclusion>
133+
<groupId>org.apache.maven.shared</groupId>
134+
<artifactId>maven-shared-utils</artifactId>
135+
</exclusion>
136+
<exclusion>
137+
<groupId>org.sonatype.plexus</groupId>
138+
<artifactId>plexus-cipher</artifactId>
139+
</exclusion>
140+
</exclusions>
141+
</dependency>
142+
<dependency>
143+
<groupId>org.apache.maven.shared</groupId>
144+
<artifactId>maven-invoker</artifactId>
145+
<version>${maven-invoker.version}</version>
146+
<exclusions>
147+
<exclusion>
148+
<groupId>org.apache.maven.shared</groupId>
149+
<artifactId>maven-shared-utils</artifactId>
150+
</exclusion>
151+
</exclusions>
152+
</dependency>
121153
</dependencies>
122154
</dependencyManagement>
123155

@@ -306,6 +338,24 @@ limitations under the License.
306338
<exclude>com.google.guava:guava</exclude> <!-- from org.apache.maven:maven-embedder -->
307339
<exclude>org.xerial.snappy:snappy-java</exclude> <!-- from org.openrewrite.maven:rewrite-maven-plugin -->
308340
<exclude>org.ow2.asm:asm-util</exclude> <!-- from org.openrewrite:rewrite-java -->
341+
<!--
342+
[ERROR] Dependency convergence error for commons-io:commons-io:jar:2.11.0 paths to dependency are:
343+
[ERROR] +-org.springframework.rewrite:spring-rewrite-commons-starter-boot-upgrade:jar:0.1.0-SNAPSHOT
344+
[ERROR] +-org.springframework.rewrite:spring-rewrite-commons-launcher:jar:0.1.0-SNAPSHOT:compile
345+
[ERROR] +-org.springframework.rewrite:spring-rewrite-commons-test:jar:0.1.0-SNAPSHOT:compile
346+
[ERROR] +-commons-io:commons-io:jar:2.11.0:compile
347+
[ERROR] and
348+
[ERROR] +-org.springframework.rewrite:spring-rewrite-commons-starter-boot-upgrade:jar:0.1.0-SNAPSHOT
349+
[ERROR] +-org.springframework.rewrite:spring-rewrite-commons-launcher:jar:0.1.0-SNAPSHOT:compile
350+
[ERROR] +-org.openrewrite.maven:rewrite-maven-plugin:jar:5.20.0:compile
351+
[ERROR] +-org.apache.maven.shared:maven-filtering:jar:3.3.1:compile
352+
[ERROR] +-commons-io:commons-io:jar:2.11.0:compile
353+
[ERROR] and
354+
[ERROR] +-org.springframework.rewrite:spring-rewrite-commons-starter-boot-upgrade:jar:0.1.0-SNAPSHOT
355+
[ERROR] +-org.openrewrite.recipe:rewrite-migrate-java:jar:2.7.1:compile
356+
[ERROR] +-commons-io:commons-io:jar:2.15.1:compile
357+
-->
358+
<exclude>commons-io:commons-io</exclude>
309359
</excludes>
310360
</dependencyConvergence>
311361
</rules>

‎spring-rewrite-commons-gradle/spring-rewrite-commons-rewrite-gradle-model/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<maven.compiler.source>17</maven.compiler.source>
1717
<maven.compiler.target>17</maven.compiler.target>
1818
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
19-
<gradle-tooling-model.version>1.1.2</gradle-tooling-model.version>
19+
<gradle-tooling-model.version>1.5.0</gradle-tooling-model.version>
2020
</properties>
2121

2222
<dependencies>

‎spring-rewrite-commons-launcher/pom.xml

-9
Original file line numberDiff line numberDiff line change
@@ -100,16 +100,8 @@
100100
<dependency>
101101
<groupId>org.apache.maven</groupId>
102102
<artifactId>maven-embedder</artifactId>
103-
<version>${maven.version}</version>
104-
<exclusions>
105-
<exclusion>
106-
<groupId>org.sonatype.plexus</groupId>
107-
<artifactId>plexus-cipher</artifactId>
108-
</exclusion>
109-
</exclusions>
110103
</dependency>
111104

112-
113105
<dependency>
114106
<groupId>org.openrewrite.maven</groupId>
115107
<artifactId>rewrite-maven-plugin</artifactId>
@@ -154,7 +146,6 @@
154146
<dependency>
155147
<groupId>org.apache.maven.shared</groupId>
156148
<artifactId>maven-invoker</artifactId>
157-
<version>${maven-invoker.version}</version>
158149
<scope>test</scope>
159150
</dependency>
160151
<dependency>

‎spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/maven/MavenPasswordDecrypter.java

+1-6
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,7 @@ class MavenPasswordDecrypter {
3939
private final SecDispatcher secDispatcher;
4040

4141
public MavenPasswordDecrypter() {
42-
try {
43-
this.secDispatcher = new DefaultSecDispatcher(new DefaultPlexusCipher());
44-
}
45-
catch (PlexusCipherException e) {
46-
throw new RuntimeException(e);
47-
}
42+
this.secDispatcher = new DefaultSecDispatcher(new DefaultPlexusCipher());
4843
}
4944

5045
public void decryptMavenServerPasswords(MavenSettings mavenSettings, Path mavenSecuritySettingsFile) {

‎spring-rewrite-commons-maven-embedder/pom.xml

+14-39
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,13 @@
66
<groupId>org.springframework.rewrite</groupId>
77
<artifactId>spring-rewrite-commons</artifactId>
88
<version>0.1.0-SNAPSHOT</version>
9-
<relativePath/> <!-- lookup parent from repository -->
9+
<relativePath>../pom.xml</relativePath> <!-- lookup parent from repository -->
1010
</parent>
1111
<artifactId>spring-rewrite-commons-maven-embedder</artifactId>
1212
<name>Spring Rewrite Maven Embedder</name>
1313
<description>Maven Embedder with access to Maven lifecycle events</description>
1414
<properties>
1515
<java.version>17</java.version>
16-
<maven.version>3.9.3</maven.version>
17-
<maven-resolver.version>1.9.13</maven-resolver.version>
18-
<maven-wagon-http.version>3.5.3</maven-wagon-http.version>
19-
<plexus-cypher.version>1.8</plexus-cypher.version>
20-
<maven-invoker.version>3.2.0</maven-invoker.version>
21-
<maven-embedder.version>3.9.3</maven-embedder.version>
2216
</properties>
2317
<dependencies>
2418
<dependency>
@@ -28,18 +22,16 @@
2822
<dependency>
2923
<groupId>org.apache.maven</groupId>
3024
<artifactId>maven-embedder</artifactId>
31-
<version>${maven-embedder.version}</version> <!-- Use the latest version available -->
32-
<exclusions>
33-
<exclusion>
34-
<groupId>org.codehaus.plexus</groupId>
35-
<artifactId>plexus-component-annotations</artifactId>
36-
</exclusion>
37-
</exclusions>
3825
</dependency>
26+
<dependency>
27+
<groupId>org.apache.maven.shared</groupId>
28+
<artifactId>maven-shared-utils</artifactId>
29+
<version>3.4.2</version>
30+
</dependency>
31+
3932
<dependency>
4033
<groupId>org.apache.maven.shared</groupId>
4134
<artifactId>maven-invoker</artifactId>
42-
<version>${maven-invoker.version}</version> <!-- Make sure to use the latest version -->
4335
</dependency>
4436
<dependency>
4537
<groupId>org.apache.maven.resolver</groupId>
@@ -62,28 +54,25 @@
6254
<version>${maven-resolver.version}</version> <!-- Check for the latest version -->
6355
</dependency>
6456
<dependency>
65-
<groupId>org.apache.maven.wagon</groupId>
66-
<artifactId>wagon-http</artifactId>
67-
<version>${maven-wagon-http.version}</version>
68-
57+
<groupId>org.apache.maven.resolver</groupId>
58+
<artifactId>maven-resolver-impl</artifactId>
59+
<version>${maven-resolver.version}</version>
6960
</dependency>
7061
<dependency>
7162
<groupId>org.apache.maven.resolver</groupId>
7263
<artifactId>maven-resolver-transport-wagon</artifactId>
7364
<version>${maven-resolver.version}</version>
74-
7565
</dependency>
7666
<dependency>
7767
<groupId>org.apache.maven.resolver</groupId>
7868
<artifactId>maven-resolver-connector-basic</artifactId>
7969
<version>${maven-resolver.version}</version>
80-
8170
</dependency>
82-
<dependency>
83-
<groupId>org.apache.maven.resolver</groupId>
84-
<artifactId>maven-resolver-impl</artifactId>
85-
<version>${maven-resolver.version}</version>
8671

72+
<dependency>
73+
<groupId>org.apache.maven.wagon</groupId>
74+
<artifactId>wagon-http</artifactId>
75+
<version>${maven-wagon-http.version}</version>
8776
</dependency>
8877
<dependency>
8978
<groupId>org.apache.maven</groupId>
@@ -96,11 +85,6 @@
9685
<artifactId>maven-compat</artifactId>
9786
<version>${maven.version}</version>
9887
</dependency>
99-
<dependency>
100-
<groupId>org.apache.maven.shared</groupId>
101-
<artifactId>maven-invoker</artifactId>
102-
<version>${maven-invoker.version}</version>
103-
</dependency>
10488

10589
<dependency>
10690
<groupId>org.springframework.boot</groupId>
@@ -115,13 +99,4 @@
11599
</dependency>
116100
</dependencies>
117101

118-
<build>
119-
<plugins>
120-
<plugin>
121-
<groupId>org.springframework.boot</groupId>
122-
<artifactId>spring-boot-maven-plugin</artifactId>
123-
</plugin>
124-
</plugins>
125-
</build>
126-
127102
</project>

‎spring-rewrite-commons-starters/spring-rewrite-commons-starter-boot-upgrade/pom.xml

+60
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,28 @@
4545
<dependency>
4646
<groupId>org.openrewrite.recipe</groupId>
4747
<artifactId>rewrite-migrate-java</artifactId>
48+
<!--
49+
[ERROR] Dependency convergence error for org.openrewrite.recipe:rewrite-static-analysis:jar:1.2.0 paths to dependency are:
50+
[ERROR] +-org.springframework.rewrite:spring-rewrite-commons-examples:pom:0.1.0-SNAPSHOT
51+
[ERROR] +-org.springframework.rewrite:spring-rewrite-commons-starter-boot-upgrade:jar:0.1.0-SNAPSHOT:compile
52+
[ERROR] +-org.openrewrite.recipe:rewrite-migrate-java:jar:2.7.0:compile
53+
[ERROR] +-org.openrewrite.recipe:rewrite-static-analysis:jar:1.2.0:runtime
54+
[ERROR] and
55+
[ERROR] +-org.springframework.rewrite:spring-rewrite-commons-examples:pom:0.1.0-SNAPSHOT
56+
[ERROR] +-org.springframework.rewrite:spring-rewrite-commons-starter-boot-upgrade:jar:0.1.0-SNAPSHOT:compile
57+
[ERROR] +-org.openrewrite.recipe:rewrite-testing-frameworks:jar:2.3.0:compile
58+
[ERROR] +-org.openrewrite.recipe:rewrite-static-analysis:jar:1.2.1:runtime
59+
[ERROR] and
60+
[ERROR] +-org.springframework.rewrite:spring-rewrite-commons-examples:pom:0.1.0-SNAPSHOT
61+
[ERROR] +-org.springframework.rewrite:spring-rewrite-commons-starter-boot-upgrade:jar:0.1.0-SNAPSHOT:compile
62+
[ERROR] +-org.openrewrite.recipe:rewrite-static-analysis:jar:1.2.1:compile
63+
-->
64+
<exclusions>
65+
<exclusion>
66+
<groupId>org.openrewrite.recipe</groupId>
67+
<artifactId>rewrite-static-analysis</artifactId>
68+
</exclusion>
69+
</exclusions>
4870
</dependency>
4971
<dependency>
5072
<groupId>org.openrewrite.recipe</groupId>
@@ -57,6 +79,44 @@
5779
<dependency>
5880
<groupId>org.openrewrite.recipe</groupId>
5981
<artifactId>rewrite-testing-frameworks</artifactId>
82+
<exclusions>
83+
<!--
84+
[ERROR] Dependency convergence error for org.apache.commons:commons-compress:jar:1.25.0 paths to dependency are:
85+
[ERROR] +-org.springframework.rewrite:spring-rewrite-commons-starter-boot-upgrade:jar:0.1.0-SNAPSHOT
86+
[ERROR] +-org.springframework.rewrite:spring-rewrite-commons-launcher:jar:0.1.0-SNAPSHOT:compile
87+
[ERROR] +-org.springframework.rewrite:spring-rewrite-commons-test:jar:0.1.0-SNAPSHOT:compile
88+
[ERROR] +-org.openrewrite:rewrite-core:jar:8.14.0:compile
89+
[ERROR] +-org.apache.commons:commons-compress:jar:1.25.0:runtime
90+
[ERROR] and
91+
[ERROR] +-org.springframework.rewrite:spring-rewrite-commons-starter-boot-upgrade:jar:0.1.0-SNAPSHOT
92+
[ERROR] +-org.openrewrite.recipe:rewrite-testing-frameworks:jar:2.3.1:compile
93+
[ERROR] +-org.testcontainers:testcontainers:jar:1.19.3:runtime
94+
[ERROR] +-org.apache.commons:commons-compress:jar:1.24.0:runtime
95+
-->
96+
<exclusion>
97+
<groupId>org.apache.commons</groupId>
98+
<artifactId>commons-compress</artifactId>
99+
</exclusion>
100+
<!--
101+
[ERROR] Dependency convergence error for net.java.dev.jna:jna:jar:5.14.0 paths to dependency are:
102+
[ERROR] +-org.springframework.rewrite:spring-rewrite-commons-starter-boot-upgrade:jar:0.1.0-SNAPSHOT
103+
[ERROR] +-org.springframework.rewrite:spring-rewrite-commons-launcher:jar:0.1.0-SNAPSHOT:compile
104+
[ERROR] +-org.springframework.rewrite:spring-rewrite-commons-test:jar:0.1.0-SNAPSHOT:compile
105+
[ERROR] +-org.openrewrite:rewrite-core:jar:8.14.0:compile
106+
[ERROR] +-net.java.dev.jna:jna-platform:jar:5.14.0:runtime
107+
[ERROR] +-net.java.dev.jna:jna:jar:5.14.0:runtime
108+
[ERROR] and
109+
[ERROR] +-org.springframework.rewrite:spring-rewrite-commons-starter-boot-upgrade:jar:0.1.0-SNAPSHOT
110+
[ERROR] +-org.openrewrite.recipe:rewrite-testing-frameworks:jar:2.3.1:compile
111+
[ERROR] +-org.testcontainers:testcontainers:jar:1.19.3:runtime
112+
[ERROR] +-com.github.docker-java:docker-java-transport-zerodep:jar:3.3.4:runtime
113+
[ERROR] +-net.java.dev.jna:jna:jar:5.13.0:runtime
114+
-->
115+
<exclusion>
116+
<groupId>net.java.dev.jna</groupId>
117+
<artifactId>jna</artifactId>
118+
</exclusion>
119+
</exclusions>
60120
</dependency>
61121
<dependency>
62122
<groupId>org.openrewrite.recipe</groupId>

‎spring-rewrite-commons-test/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<dependency>
2727
<groupId>commons-io</groupId>
2828
<artifactId>commons-io</artifactId>
29-
<version>2.6</version>
29+
<version>2.11.0</version>
3030
</dependency>
3131
<!-- Using shaded JGit from OR -->
3232
<dependency>

0 commit comments

Comments
 (0)