Skip to content

Commit 06377e8

Browse files
committed
[SCM-1016] Update maven-parent to 41
This fixes build with Java 21 due to using a newer palantir formatter. Removal of direct dependencies of legacy plexus annotations.
1 parent f5d8bb4 commit 06377e8

File tree

6 files changed

+18
-46
lines changed
  • maven-scm-client
  • maven-scm-providers
    • maven-scm-provider-local
    • maven-scm-providers-git/maven-scm-provider-git-commons
    • maven-scm-providers-svn/maven-scm-provider-svn-commons
  • maven-scm-test

6 files changed

+18
-46
lines changed

maven-scm-client/pom.xml

-5
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,6 @@
7575
<artifactId>plexus-classworlds</artifactId>
7676
<scope>runtime</scope>
7777
</dependency>
78-
<dependency>
79-
<groupId>org.codehaus.plexus</groupId>
80-
<artifactId>plexus-component-annotations</artifactId>
81-
<scope>runtime</scope>
82-
</dependency>
8378
<dependency>
8479
<groupId>org.eclipse.sisu</groupId>
8580
<artifactId>org.eclipse.sisu.plexus</artifactId>

maven-scm-providers/maven-scm-provider-local/pom.xml

+4
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@
4040
<groupId>org.codehaus.plexus</groupId>
4141
<artifactId>plexus-utils</artifactId>
4242
</dependency>
43+
<dependency>
44+
<groupId>org.codehaus.plexus</groupId>
45+
<artifactId>plexus-xml</artifactId>
46+
</dependency>
4347
<dependency>
4448
<groupId>org.slf4j</groupId>
4549
<artifactId>slf4j-api</artifactId>

maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/pom.xml

+4
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@
3636
<groupId>org.codehaus.plexus</groupId>
3737
<artifactId>plexus-utils</artifactId>
3838
</dependency>
39+
<dependency>
40+
<groupId>org.codehaus.plexus</groupId>
41+
<artifactId>plexus-xml</artifactId>
42+
</dependency>
3943
<dependency>
4044
<groupId>org.slf4j</groupId>
4145
<artifactId>slf4j-api</artifactId>

maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/pom.xml

+4
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@
4141
<groupId>org.codehaus.plexus</groupId>
4242
<artifactId>plexus-utils</artifactId>
4343
</dependency>
44+
<dependency>
45+
<groupId>org.codehaus.plexus</groupId>
46+
<artifactId>plexus-xml</artifactId>
47+
</dependency>
4448
<dependency>
4549
<groupId>org.slf4j</groupId>
4650
<artifactId>slf4j-api</artifactId>

maven-scm-test/pom.xml

+4-11
Original file line numberDiff line numberDiff line change
@@ -40,22 +40,15 @@
4040
<groupId>org.codehaus.plexus</groupId>
4141
<artifactId>plexus-utils</artifactId>
4242
</dependency>
43-
<dependency>
44-
<groupId>org.eclipse.sisu</groupId>
45-
<artifactId>org.eclipse.sisu.plexus</artifactId>
46-
</dependency>
47-
48-
<!-- runtime bits needed to construct Plexus and others -->
4943
<dependency>
5044
<groupId>org.codehaus.plexus</groupId>
51-
<artifactId>plexus-classworlds</artifactId>
52-
<scope>runtime</scope>
45+
<artifactId>plexus-xml</artifactId>
5346
</dependency>
5447
<dependency>
55-
<groupId>org.codehaus.plexus</groupId>
56-
<artifactId>plexus-component-annotations</artifactId>
57-
<scope>runtime</scope>
48+
<groupId>org.eclipse.sisu</groupId>
49+
<artifactId>org.eclipse.sisu.plexus</artifactId>
5850
</dependency>
51+
5952
<dependency>
6053
<groupId>org.apache.maven.scm</groupId>
6154
<artifactId>maven-scm-manager-plexus</artifactId>

pom.xml

+2-30
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<groupId>org.apache.maven</groupId>
2525
<artifactId>maven-parent</artifactId>
26-
<version>39</version>
26+
<version>41</version>
2727
<relativePath />
2828
</parent>
2929

@@ -249,38 +249,17 @@
249249
<artifactId>plexus-classworlds</artifactId>
250250
<version>2.6.0</version>
251251
</dependency>
252-
<dependency>
253-
<groupId>org.codehaus.plexus</groupId>
254-
<artifactId>plexus-component-annotations</artifactId>
255-
<version>2.1.1</version>
256-
</dependency>
257252
<dependency>
258253
<groupId>javax.inject</groupId>
259254
<artifactId>javax.inject</artifactId>
260255
<version>1</version>
261256
</dependency>
262-
<dependency>
263-
<groupId>org.eclipse.sisu</groupId>
264-
<artifactId>org.eclipse.sisu.plexus</artifactId>
265-
<version>${sisuVersion}</version>
266-
<exclusions>
267-
<exclusion>
268-
<groupId>org.codehaus.plexus</groupId>
269-
<artifactId>plexus-component-annotations</artifactId>
270-
</exclusion>
271-
</exclusions>
272-
</dependency>
273257
<dependency>
274258
<groupId>com.google.inject</groupId>
275259
<artifactId>guice</artifactId>
276260
<version>4.2.3</version>
277261
<classifier>no_aop</classifier>
278262
</dependency>
279-
<dependency>
280-
<groupId>org.codehaus.plexus</groupId>
281-
<artifactId>plexus-utils</artifactId>
282-
<version>3.5.1</version>
283-
</dependency>
284263
<dependency>
285264
<groupId>org.codehaus.plexus</groupId>
286265
<artifactId>plexus-sec-dispatcher</artifactId>
@@ -363,13 +342,6 @@
363342
</excludes>
364343
</configuration>
365344
</plugin>
366-
<plugin>
367-
<groupId>org.apache.maven.plugins</groupId>
368-
<artifactId>maven-surefire-plugin</artifactId>
369-
<configuration>
370-
<trimStackTrace>false</trimStackTrace>
371-
</configuration>
372-
</plugin>
373345
</plugins>
374346
</pluginManagement>
375347
<plugins>
@@ -390,7 +362,7 @@
390362
</configuration>
391363
<executions>
392364
<execution>
393-
<id>check-java-1.7-compat</id>
365+
<id>check-java-8-compat</id>
394366
<goals>
395367
<goal>check</goal>
396368
</goals>

0 commit comments

Comments
 (0)