From a15603c85e9cc2934880f64f5d513475191f57a8 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Mon, 10 Aug 2020 13:09:22 -0400 Subject: [PATCH 1/2] deprecate SonatypeAetherFilterTransformer --- .../filter/resolve/transform/ArtifactIncludeNode.java | 3 +-- .../resolve/transform/EclipseAetherFilterTransformer.java | 2 +- .../resolve/transform/SonatypeAetherFilterTransformer.java | 4 +++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/apache/maven/shared/artifact/filter/resolve/transform/ArtifactIncludeNode.java b/src/main/java/org/apache/maven/shared/artifact/filter/resolve/transform/ArtifactIncludeNode.java index b5e03d2..86806d6 100644 --- a/src/main/java/org/apache/maven/shared/artifact/filter/resolve/transform/ArtifactIncludeNode.java +++ b/src/main/java/org/apache/maven/shared/artifact/filter/resolve/transform/ArtifactIncludeNode.java @@ -39,10 +39,9 @@ class ArtifactIncludeNode implements Node /** * Note: an artifact doesn't contain exclusion information, so it won't be available here. - * When required switch to filtering based on Aether + * When required switch to filtering based on Aether. * * @see EclipseAetherNode - * @see SonatypeAetherNode */ @Override public Dependency getDependency() diff --git a/src/main/java/org/apache/maven/shared/artifact/filter/resolve/transform/EclipseAetherFilterTransformer.java b/src/main/java/org/apache/maven/shared/artifact/filter/resolve/transform/EclipseAetherFilterTransformer.java index 303bede..043a3da 100644 --- a/src/main/java/org/apache/maven/shared/artifact/filter/resolve/transform/EclipseAetherFilterTransformer.java +++ b/src/main/java/org/apache/maven/shared/artifact/filter/resolve/transform/EclipseAetherFilterTransformer.java @@ -44,7 +44,7 @@ import org.eclipse.aether.util.filter.ScopeDependencyFilter; /** - * FilterTransformer implementation for Eclipses Aether + * FilterTransformer implementation for Eclipse Aether. * * @author Robert Scholte * @since 3.0 diff --git a/src/main/java/org/apache/maven/shared/artifact/filter/resolve/transform/SonatypeAetherFilterTransformer.java b/src/main/java/org/apache/maven/shared/artifact/filter/resolve/transform/SonatypeAetherFilterTransformer.java index 36bce51..68ed2ad 100644 --- a/src/main/java/org/apache/maven/shared/artifact/filter/resolve/transform/SonatypeAetherFilterTransformer.java +++ b/src/main/java/org/apache/maven/shared/artifact/filter/resolve/transform/SonatypeAetherFilterTransformer.java @@ -44,11 +44,13 @@ import org.sonatype.aether.util.filter.ScopeDependencyFilter; /** - * FilterTransformer implementation for Sonatypes Aether + * FilterTransformer implementation for Sonatype Aether * + * @deprecated update to Maven 3.10 or later and replace Sonatype Aether with Eclipse Aether * @author Robert Scholte * @since 3.0 */ +@Deprecated public class SonatypeAetherFilterTransformer implements FilterTransformer { From b58a5840596aa7e541d93eabe0d32c62a9e07de8 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Sun, 16 Aug 2020 09:50:49 -0400 Subject: [PATCH 2/2] fix version number --- .../resolve/transform/SonatypeAetherFilterTransformer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/apache/maven/shared/artifact/filter/resolve/transform/SonatypeAetherFilterTransformer.java b/src/main/java/org/apache/maven/shared/artifact/filter/resolve/transform/SonatypeAetherFilterTransformer.java index 68ed2ad..cdd9e14 100644 --- a/src/main/java/org/apache/maven/shared/artifact/filter/resolve/transform/SonatypeAetherFilterTransformer.java +++ b/src/main/java/org/apache/maven/shared/artifact/filter/resolve/transform/SonatypeAetherFilterTransformer.java @@ -46,12 +46,12 @@ /** * FilterTransformer implementation for Sonatype Aether * - * @deprecated update to Maven 3.10 or later and replace Sonatype Aether with Eclipse Aether + * @deprecated update to Maven 3.1.0 or later and replace Sonatype Aether with Eclipse Aether * @author Robert Scholte * @since 3.0 */ @Deprecated -public class SonatypeAetherFilterTransformer +public class implements FilterTransformer { /**