diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml index e7d5608057..6fc5a7310a 100644 --- a/apache-maven/pom.xml +++ b/apache-maven/pom.xml @@ -90,12 +90,12 @@ under the License. wagon-file - org.eclipse.aether - aether-connector-basic + org.apache.maven.resolver + maven-resolver-connector-basic - org.eclipse.aether - aether-transport-wagon + org.apache.maven.resolver + maven-resolver-transport-wagon org.apache.maven diff --git a/maven-aether-provider/pom.xml b/maven-aether-provider/pom.xml index 0f3cb615c7..91d1ae73e0 100644 --- a/maven-aether-provider/pom.xml +++ b/maven-aether-provider/pom.xml @@ -31,7 +31,7 @@ under the License. maven-aether-provider Maven Aether Provider - Extensions to Aether for utilizing Maven POM and repository metadata. + Extensions to Maven Resolver for utilizing Maven POM and repository metadata. @@ -47,20 +47,20 @@ under the License. maven-repository-metadata - org.eclipse.aether - aether-api + org.apache.maven.resolver + maven-resolver-api - org.eclipse.aether - aether-spi + org.apache.maven.resolver + maven-resolver-spi - org.eclipse.aether - aether-util + org.apache.maven.resolver + maven-resolver-util - org.eclipse.aether - aether-impl + org.apache.maven.resolver + maven-resolver-impl org.codehaus.plexus @@ -88,13 +88,13 @@ under the License. - org.eclipse.aether - aether-connector-basic + org.apache.maven.resolver + maven-resolver-connector-basic test - org.eclipse.aether - aether-transport-wagon + org.apache.maven.resolver + maven-resolver-transport-wagon test diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml index 3a0a45c2bb..876c11c118 100644 --- a/maven-compat/pom.xml +++ b/maven-compat/pom.xml @@ -58,6 +58,22 @@ under the License. org.apache.maven maven-core + + org.apache.maven + maven-aether-provider + + + org.apache.maven.resolver + maven-resolver-api + + + org.apache.maven.resolver + maven-resolver-util + + + org.apache.maven.resolver + maven-resolver-impl + org.codehaus.plexus plexus-utils @@ -85,13 +101,13 @@ under the License. test - org.eclipse.aether - aether-connector-basic + org.apache.maven.resolver + maven-resolver-connector-basic test - org.eclipse.aether - aether-transport-wagon + org.apache.maven.resolver + maven-resolver-transport-wagon test diff --git a/maven-core/pom.xml b/maven-core/pom.xml index d147dd88bf..ad5484af19 100644 --- a/maven-core/pom.xml +++ b/maven-core/pom.xml @@ -73,16 +73,20 @@ under the License. maven-aether-provider - org.eclipse.aether - aether-impl + org.apache.maven.resolver + maven-resolver-impl - org.eclipse.aether - aether-api + org.apache.maven.resolver + maven-resolver-api - org.eclipse.aether - aether-util + org.apache.maven.resolver + maven-resolver-spi + + + org.apache.maven.resolver + maven-resolver-util org.apache.maven.shared diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml index 75b92c9ec5..30ad2ce897 100644 --- a/maven-embedder/pom.xml +++ b/maven-embedder/pom.xml @@ -50,6 +50,14 @@ under the License. org.apache.maven maven-model-builder + + org.apache.maven.resolver + maven-resolver-api + + + org.apache.maven.resolver + maven-resolver-util + org.apache.maven maven-compat diff --git a/pom.xml b/pom.xml index b61e0af660..0e3b9a7c26 100644 --- a/pom.xml +++ b/pom.xml @@ -65,7 +65,7 @@ under the License. 1.7 1.8.3 1.3 - 1.0.2.v20150114 + 1.0.3 1.7.5 true @@ -328,34 +328,34 @@ under the License. - org.eclipse.aether - aether-api - ${aetherVersion} + org.apache.maven.resolver + maven-resolver-api + ${resolverVersion} - org.eclipse.aether - aether-spi - ${aetherVersion} + org.apache.maven.resolver + maven-resolver-spi + ${resolverVersion} - org.eclipse.aether - aether-impl - ${aetherVersion} + org.apache.maven.resolver + maven-resolver-impl + ${resolverVersion} - org.eclipse.aether - aether-util - ${aetherVersion} + org.apache.maven.resolver + maven-resolver-util + ${resolverVersion} - org.eclipse.aether - aether-connector-basic - ${aetherVersion} + org.apache.maven.resolver + maven-resolver-connector-basic + ${resolverVersion} - org.eclipse.aether - aether-transport-wagon - ${aetherVersion} + org.apache.maven.resolver + maven-resolver-transport-wagon + ${resolverVersion} @@ -639,6 +639,7 @@ under the License. true true + http://download.eclipse.org/aether/aether-core/${aetherVersion}/apidocs/ https://codehaus-plexus.github.io/plexus-containers/plexus-container-default/apidocs/