This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch parent-42-maven-3.6.3
in repository https://gitbox.apache.org/repos/asf/maven-jxr.git
commit 2d507e044e8ae424d760c005d781bcb719a0d37b
Author: Michael Osipov <micha...@apache.org>
AuthorDate: Fri May 31 21:59:20 2024 +0200
[JXR-191] Upgrade to Parent 42 and Maven 3.6.3
This closes #114
---
maven-jxr-plugin/pom.xml | 35 ++++++++++++++++++-----------------
pom.xml | 21 +--------------------
2 files changed, 19 insertions(+), 37 deletions(-)
diff --git a/maven-jxr-plugin/pom.xml b/maven-jxr-plugin/pom.xml
index 47f4871..b7b5335 100644
--- a/maven-jxr-plugin/pom.xml
+++ b/maven-jxr-plugin/pom.xml
@@ -38,8 +38,10 @@ under the License.
</prerequisites>
<properties>
- <mavenVersion>3.2.5</mavenVersion>
- <aetherVersion>1.0.0.v20140518</aetherVersion>
+ <mavenVersion>3.6.3</mavenVersion>
+ <resolverVersion>1.4.1</resolverVersion>
+ <!-- like Maven 3.6.3 -->
+ <wagonVersion>3.5.3</wagonVersion>
</properties>
<dependencies>
@@ -82,8 +84,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-provider-api</artifactId>
- <version>2.8</version>
- <!-- like Maven 3.2.5 -->
+ <version>${wagonVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.reporting</groupId>
@@ -130,33 +131,33 @@ under the License.
</exclusions>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
- <artifactId>aether-api</artifactId>
- <version>${aetherVersion}</version>
+ <groupId>org.apache.maven.resolver</groupId>
+ <artifactId>maven-resolver-api</artifactId>
+ <version>${resolverVersion}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
- <artifactId>aether-impl</artifactId>
- <version>${aetherVersion}</version>
+ <groupId>org.apache.maven.resolver</groupId>
+ <artifactId>maven-resolver-impl</artifactId>
+ <version>${resolverVersion}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
- <artifactId>aether-connector-basic</artifactId>
- <version>${aetherVersion}</version>
+ <groupId>org.apache.maven.resolver</groupId>
+ <artifactId>maven-resolver-connector-basic</artifactId>
+ <version>${resolverVersion}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
- <artifactId>aether-transport-wagon</artifactId>
- <version>${aetherVersion}</version>
+ <groupId>org.apache.maven.resolver</groupId>
+ <artifactId>maven-resolver-transport-wagon</artifactId>
+ <version>${resolverVersion}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-http-lightweight</artifactId>
- <version>3.5.1</version>
+ <version>${wagonVersion}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index aa591d8..69fca1a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
- <version>41</version>
+ <version>42</version>
<relativePath />
</parent>
@@ -126,25 +126,6 @@ under the License.
</dependencies>
</dependencyManagement>
- <build>
- <pluginManagement>
- <!-- use the same plugin version in project and in IT tests -->
- <!-- additionally versions upgrade will be tracked -->
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>${javadocPluginVersion}</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>${sitePluginVersion}</version>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
<profiles>
<profile>
<id>reporting</id>
