This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-resolver.git
The following commit(s) were added to refs/heads/master by this push:
new d75ea07c [MRESOLVER-434] Upgrade Parent to 41
d75ea07c is described below
commit d75ea07c9a3cec3224edd7aaeb7eb34ae48460a8
Author: Slawomir Jaranowski <[email protected]>
AuthorDate: Fri Nov 17 20:31:42 2023 +0100
[MRESOLVER-434] Upgrade Parent to 41
---
maven-resolver-transport-wagon/pom.xml | 5 ++++
pom.xml | 42 +++++++---------------------------
2 files changed, 13 insertions(+), 34 deletions(-)
diff --git a/maven-resolver-transport-wagon/pom.xml
b/maven-resolver-transport-wagon/pom.xml
index abb24508..d3037346 100644
--- a/maven-resolver-transport-wagon/pom.xml
+++ b/maven-resolver-transport-wagon/pom.xml
@@ -71,6 +71,11 @@
<artifactId>plexus-utils</artifactId>
<optional>true</optional>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-xml</artifactId>
+ <optional>true</optional>
+ </dependency>
<dependency>
<groupId>org.eclipse.sisu</groupId>
<artifactId>org.eclipse.sisu.plexus</artifactId>
diff --git a/pom.xml b/pom.xml
index 5d893e1e..acc12785 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
- <version>40</version>
+ <version>41</version>
<relativePath />
</parent>
@@ -193,10 +193,16 @@
<scope>test</scope>
</dependency>
+ <!-- we need override plexus-util/xml versions from parent -->
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>3.5.1</version>
+ <version>4.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-xml</artifactId>
+ <version>4.0.2</version>
</dependency>
<dependency>
@@ -560,38 +566,6 @@
</archive>
</configuration>
</plugin>
- <!-- Remove when Parent 41 used -->
- <plugin>
- <groupId>com.diffplug.spotless</groupId>
- <artifactId>spotless-maven-plugin</artifactId>
- <version>2.40.0</version>
- <configuration>
- <java>
- <!-- orders of used formatters are important MPOM-376 -->
- <!-- eg. palantir override importOrder, so should be first -->
- <palantirJavaFormat>
- <version>2.38.0</version>
- </palantirJavaFormat>
- <removeUnusedImports />
- <importOrder>
- <file>config/maven-eclipse-importorder.txt</file>
- </importOrder>
- <licenseHeader>
- <file>config/maven-header-plain.txt</file>
- </licenseHeader>
- </java>
- <pom>
- <sortPom>
- <expandEmptyElements>false</expandEmptyElements>
- <!-- https://issues.apache.org/jira/browse/MRELEASE-1111 -->
-
<spaceBeforeCloseEmptyElement>true</spaceBeforeCloseEmptyElement>
- </sortPom>
- </pom>
- <upToDateChecking>
- <enabled>true</enabled>
- </upToDateChecking>
- </configuration>
- </plugin>
</plugins>
</pluginManagement>
<plugins>
