Fixed #447 - Move to use maven-resolver instead of aether

khmarbaise · Dec 30, 2023 · 79ee2e5 · 79ee2e5
1 parent b1672b7
commit 79ee2e5
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/itf-documentation/src/main/asciidoc/release-notes/_release-notes-0.14.0.adoc b/itf-documentation/src/main/asciidoc/release-notes/_release-notes-0.14.0.adoc
@@ -24,6 +24,7 @@
 :issue-421: https://github.com/khmarbaise/maven-it-extension/issues/421[Fixed #421]
 :issue-421: https://github.com/khmarbaise/maven-it-extension/issues/421[Fixed #421]
 :issue-444: https://github.com/khmarbaise/maven-it-extension/issues/444[Fixed #444]
+:issue-447: https://github.com/khmarbaise/maven-it-extension/issues/447[Fixed #447]
 
 :release_0_14_0: https://github.com/khmarbaise/maven-it-extension/milestone/14
 
@@ -50,7 +51,7 @@
 
 *Build Improvements*
 
- * {issue-???} - ?
+ * {issue-447} - Move to use maven-resolver instead of aether
 
 *Documentation Improvements*
 

diff --git a/itf-maven-plugin/pom.xml b/itf-maven-plugin/pom.xml
@@ -48,15 +48,13 @@
      ! The following is required to get that running on Maven 3.8.X and below
     -->
     <dependency>
-      <groupId>org.eclipse.aether</groupId>
-      <artifactId>aether-api</artifactId>
-      <version>${aetherVersion}</version>
+      <groupId>org.apache.maven.resolver</groupId>
+      <artifactId>maven-resolver-api</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.aether</groupId>
-      <artifactId>aether-util</artifactId>
-      <version>${aetherVersion}</version>
+      <groupId>org.apache.maven.resolver</groupId>
+      <artifactId>maven-resolver-util</artifactId>
       <!-- To work in Maven versions older than 3.9.0 -->
       <scope>compile</scope>
     </dependency>

diff --git a/pom.xml b/pom.xml
@@ -63,6 +63,7 @@
     <trimStackTrace>false</trimStackTrace>
     <automatic-module-name>com.soebes.itf.extension</automatic-module-name>
     <maven-plugin-plugin.version>3.10.2</maven-plugin-plugin.version>
+    <maven-resolver.version>1.9.18</maven-resolver.version>
   </properties>
 
   <dependencyManagement>
@@ -118,6 +119,16 @@
         <artifactId>maven-model</artifactId>
         <version>3.2.5</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.maven.resolver</groupId>
+        <artifactId>maven-resolver-api</artifactId>
+        <version>${maven-resolver.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.maven.resolver</groupId>
+        <artifactId>maven-resolver-util</artifactId>
+        <version>${maven-resolver.version}</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>