Skip to content

Commit 010e255

Browse files
committed
Remove version conflicts
* Bump Maven to 3.9.3 * Remove shrinkwrap
1 parent 9a62652 commit 010e255

File tree

2 files changed

+38
-19
lines changed

2 files changed

+38
-19
lines changed

pom.xml

+30-8
Original file line numberDiff line numberDiff line change
@@ -106,14 +106,6 @@
106106

107107
<dependencyManagement>
108108
<dependencies>
109-
<dependency>
110-
<groupId>org.openrewrite</groupId>
111-
<artifactId>rewrite-bom</artifactId>
112-
<version>${rewrite.version}</version>
113-
<type>pom</type>
114-
<scope>import</scope>
115-
</dependency>
116-
117109
<dependency>
118110
<groupId>org.springframework.boot</groupId>
119111
<artifactId>spring-boot-dependencies</artifactId>
@@ -129,6 +121,15 @@
129121
</dependencies>
130122
</dependencyManagement>
131123

124+
<dependencies>
125+
<dependency>
126+
<groupId>org.openrewrite</groupId>
127+
<artifactId>rewrite-bom</artifactId>
128+
<version>${rewrite.version}</version>
129+
<type>pom</type>
130+
</dependency>
131+
</dependencies>
132+
132133
<build>
133134
<pluginManagement>
134135
<plugins>
@@ -236,6 +237,7 @@ limitations under the License.
236237
<!-- @formatter:on -->
237238
</inlineHeader>
238239
<excludes>
240+
<exclude>**/CLIReportingUtils.java</exclude>
239241
<exclude>**/internal/**</exclude>
240242
<exclude>**/demo/**</exclude>
241243
<exclude>**/.sdkmanrc</exclude>
@@ -284,6 +286,26 @@ limitations under the License.
284286
<dependencyConvergence>
285287
<excludes>
286288
<exclude>org.jetbrains:annotations</exclude>
289+
<exclude>org.ow2.asm:asm</exclude> <!-- through org.openrewrite.maven:rewrite-maven-plugin:jar:5.20.0:compile -->
290+
<!--
291+
[ERROR] +-org.springframework.rewrite:spring-rewrite-commons-maven-embedder:jar:0.1.0-SNAPSHOT
292+
[ERROR] +-org.apache.maven:maven-embedder:jar:3.9.3:compile
293+
[ERROR] +-javax.annotation:javax.annotation-api:jar:1.3.2:compile
294+
[ERROR] and
295+
[ERROR] +-org.springframework.rewrite:spring-rewrite-commons-maven-embedder:jar:0.1.0-SNAPSHOT
296+
[ERROR] +-org.apache.maven:maven-embedder:jar:3.9.3:compile
297+
[ERROR] +-org.eclipse.sisu:org.eclipse.sisu.plexus:jar:0.3.5:compile
298+
[ERROR] +-javax.annotation:javax.annotation-api:jar:1.2:compile
299+
-->
300+
<exclude>javax.annotation:javax.annotation-api</exclude>
301+
<!--
302+
303+
-->
304+
<exclude>org.codehaus.plexus:plexus-utils</exclude>
305+
<exclude>org.codehaus.plexus:plexus-classworlds</exclude>
306+
<exclude>com.google.guava:guava</exclude> <!-- from org.apache.maven:maven-embedder -->
307+
<exclude>org.xerial.snappy:snappy-java</exclude> <!-- from org.openrewrite.maven:rewrite-maven-plugin -->
308+
<exclude>org.ow2.asm:asm-util</exclude> <!-- from org.openrewrite:rewrite-java -->
287309
</excludes>
288310
</dependencyConvergence>
289311
</rules>

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

+8-11
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,12 @@
1313
<description>Maven Embedder with access to Maven lifecycle events</description>
1414
<properties>
1515
<java.version>17</java.version>
16-
<shrinkwrap-resolvers.version>3.3.0</shrinkwrap-resolvers.version>
17-
<maven.version>3.9.1</maven.version>
16+
<maven.version>3.9.3</maven.version>
1817
<maven-resolver.version>1.9.13</maven-resolver.version>
1918
<maven-wagon-http.version>3.5.3</maven-wagon-http.version>
2019
<plexus-cypher.version>1.8</plexus-cypher.version>
2120
<maven-invoker.version>3.2.0</maven-invoker.version>
22-
<maven-embedder.version>3.9.1</maven-embedder.version>
21+
<maven-embedder.version>3.9.3</maven-embedder.version>
2322
</properties>
2423
<dependencies>
2524
<dependency>
@@ -30,6 +29,12 @@
3029
<groupId>org.apache.maven</groupId>
3130
<artifactId>maven-embedder</artifactId>
3231
<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>
3338
</dependency>
3439
<dependency>
3540
<groupId>org.apache.maven.shared</groupId>
@@ -51,13 +56,6 @@
5156
<artifactId>lombok</artifactId>
5257
</dependency>
5358

54-
<dependency>
55-
<groupId>org.jboss.shrinkwrap.resolver</groupId>
56-
<artifactId>shrinkwrap-resolver-depchain</artifactId>
57-
<version>${shrinkwrap-resolvers.version}</version>
58-
<type>pom</type>
59-
</dependency>
60-
6159
<dependency>
6260
<groupId>org.apache.maven.resolver</groupId>
6361
<artifactId>maven-resolver-api</artifactId>
@@ -102,7 +100,6 @@
102100
<groupId>org.apache.maven.shared</groupId>
103101
<artifactId>maven-invoker</artifactId>
104102
<version>${maven-invoker.version}</version>
105-
106103
</dependency>
107104

108105
<dependency>

0 commit comments

Comments
 (0)