This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch DOXIASITETOOLS-338
in repository https://gitbox.apache.org/repos/asf/maven-doxia-sitetools.git
commit 6f232441482c220e8d31c05a50161ca55c45f30d
Author: Michael Osipov <micha...@apache.org>
AuthorDate: Tue May 7 20:44:57 2024 +0200
[DOXIASITETOOLS-338] Upgrade to Parent 42
This closes #153
---
doxia-integration-tools/pom.xml | 26 +++++++++++++-------------
pom.xml | 6 +++---
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/doxia-integration-tools/pom.xml b/doxia-integration-tools/pom.xml
index 9f3cbc6..1677622 100644
--- a/doxia-integration-tools/pom.xml
+++ b/doxia-integration-tools/pom.xml
@@ -69,7 +69,7 @@
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-aether-provider</artifactId>
+ <artifactId>maven-resolver-provider</artifactId>
<version>${mavenVersion}</version>
<scope>provided</scope>
</dependency>
@@ -80,9 +80,9 @@
<scope>provided</scope>
</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>provided</scope>
</dependency>
@@ -161,21 +161,21 @@
<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>
diff --git a/pom.xml b/pom.xml
index d337f2b..10e959b 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>
@@ -67,10 +67,10 @@ under the License.
<properties>
<javaVersion>8</javaVersion>
+ <mavenVersion>3.6.3</mavenVersion>
<doxiaVersion>2.0.0-M10</doxiaVersion>
<slf4jVersion>1.7.36</slf4jVersion>
- <mavenVersion>3.2.5</mavenVersion>
- <aetherVersion>1.0.0.v20140518</aetherVersion>
+ <resolverVersion>1.4.1</resolverVersion>
<wagonVersion>3.5.3</wagonVersion>
<l10nPluginVersion>1.0.0</l10nPluginVersion>
<maven.site.path>doxia-sitetools-archives/doxia-sitetools-LATEST</maven.site.path>
