From 4412059eb980293faae84110f13293780ec43e53 Mon Sep 17 00:00:00 2001 From: Jean-Francois Denise Date: Tue, 3 Dec 2024 16:57:27 +0100 Subject: [PATCH] Replace aether by maven-resolver in tests --- pom.xml | 58 ++++++++++++++++++++++++++++++++++++++++++++------- tests/pom.xml | 40 ++++++++++++++++++++++++++--------- 2 files changed, 80 insertions(+), 18 deletions(-) diff --git a/pom.xml b/pom.xml index 52e4f624..17e9fee3 100644 --- a/pom.xml +++ b/pom.xml @@ -75,7 +75,8 @@ 3.0.0-M6 4.5.13 - 1.1.0 + 1.9.18 + 3.5.3 1.2.1.Final 3.3.0 @@ -225,6 +226,12 @@ org.jboss.galleon galleon-maven-plugin ${version.org.jboss.galleon} + + + org.eclipse.aether + * + + @@ -232,7 +239,17 @@ galleon-api ${version.org.jboss.galleon} - + + org.jboss.galleon + galleon-maven-universe + ${version.org.jboss.galleon} + + + org.eclipse.aether + * + + + org.apache.maven maven-core @@ -317,14 +334,39 @@ ${version.org.apache.maven.plugin-testing.maven-plugin-testing-harness} - org.eclipse.aether - aether-connector-basic - ${version.org.eclipse.aether} + org.apache.maven.resolver + maven-resolver-api + ${version.org.apache.maven.resolver} + + + org.apache.maven.resolver + maven-resolver-spi + ${version.org.apache.maven.resolver} + + + org.apache.maven.resolver + maven-resolver-impl + ${version.org.apache.maven.resolver} + + + org.apache.maven.resolver + maven-resolver-connector-basic + ${version.org.apache.maven.resolver} + + + org.apache.maven.wagon + wagon-http + ${version.org.apache.maven.wagon} + + + org.apache.maven.resolver + maven-resolver-transport-wagon + ${version.org.apache.maven.resolver} - org.eclipse.aether - aether-transport-http - ${version.org.eclipse.aether} + org.apache.maven.resolver + maven-resolver-util + ${version.org.apache.maven.resolver} org.jboss.slf4j diff --git a/tests/pom.xml b/tests/pom.xml index d28fcbaa..3832e723 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -59,12 +59,6 @@ maven-plugin-testing-harness test - - org.apache.maven - maven-aether-provider - 3.3.9 - test - org.apache.maven maven-compat @@ -81,13 +75,39 @@ test - org.eclipse.aether - aether-connector-basic + org.apache.maven.resolver + maven-resolver-api + test + + + org.apache.maven.resolver + maven-resolver-spi + test + + + org.apache.maven.resolver + maven-resolver-impl + test + + + org.apache.maven.resolver + maven-resolver-connector-basic + test + + + org.apache.maven.resolver + maven-resolver-transport-wagon + test + + + + org.apache.maven.wagon + wagon-http test - org.eclipse.aether - aether-transport-http + org.apache.maven.resolver + maven-resolver-util test