From 4a7b25c3dd99d153b01531b052377e0f3cf22f88 Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Wed, 11 Sep 2013 13:59:40 +0200 Subject: [PATCH 1/2] [MNG-5513] Artifact filtering for Eclipse Aether fixed The filtering was left unchanged, while Aether GroupID changed from org.sonatype.aether to org.eclipse.aether, basically letting Plugins to reference Eclipse Aether that would produce runtime Linkage errors. --- .../java/org/apache/maven/DefaultArtifactFilterManager.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java b/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java index 76768345cf99..4c6500b7236d 100644 --- a/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java +++ b/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java @@ -80,9 +80,9 @@ public class DefaultArtifactFilterManager artifacts.add( "org.apache.maven:maven-settings-builder" ); artifacts.add( "org.apache.maven:maven-toolchain" ); artifacts.add( "org.apache.maven.wagon:wagon-provider-api" ); - artifacts.add( "org.sonatype.aether:aether-api" ); - artifacts.add( "org.sonatype.aether:aether-spi" ); - artifacts.add( "org.sonatype.aether:aether-impl" ); + artifacts.add( "org.eclipse.aether:aether-api" ); + artifacts.add( "org.eclipse.aether:aether-spi" ); + artifacts.add( "org.eclipse.aether:aether-impl" ); /* * NOTE: Don't exclude the wagons or any of their dependencies (apart from the wagon API). This would otherwise From 97732f7ee7ed82796049aab6a2251028c7cfa38f Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Wed, 11 Sep 2013 14:01:15 +0200 Subject: [PATCH 2/2] [MNG-5513] Restoring Maven 3.0.x style behavior As it was importing org.sonatype.aether.impl and sub packages, but since Aether move to Eclipse the org.eclipse.aether.internal.impl is no longer sub package of org.eclipse.aether.impl (but it was in Sonatype Aether) --- .../org/apache/maven/classrealm/DefaultClassRealmManager.java | 1 + 1 file changed, 1 insertion(+) diff --git a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java index 1798875c002d..41c7dc2906a0 100644 --- a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java +++ b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java @@ -169,6 +169,7 @@ private void importMavenApi( Map imports ) imports.put( "org.eclipse.aether.deployment", coreRealm ); imports.put( "org.eclipse.aether.graph", coreRealm ); imports.put( "org.eclipse.aether.impl", coreRealm ); + imports.put( "org.eclipse.aether.internal.impl", coreRealm ); imports.put( "org.eclipse.aether.installation", coreRealm ); imports.put( "org.eclipse.aether.metadata", coreRealm ); imports.put( "org.eclipse.aether.repository", coreRealm );