[MSHARED-974] Remove obsolete code and references to Sonatype Aether

apache · Feb 1, 2021 · 17819fe · 17819fe
1 parent 1f67266
commit 17819fe
Show file tree

Hide file tree

Showing 13 changed files with 5 additions and 727 deletions.
diff --git a/pom.xml b/pom.xml
@@ -55,7 +55,7 @@
   </distributionManagement>
 
   <properties>
-    <maven.version>3.1.0</maven.version>
+    <maven.version>3.1.1</maven.version>
     <javaVersion>7</javaVersion>
     <project.build.outputTimestamp>2021-01-23T01:12:59Z</project.build.outputTimestamp>
   </properties>
@@ -105,18 +105,6 @@
       <version>2.6</version>
     </dependency>
 
-    <dependency>
-      <groupId>org.sonatype.aether</groupId>
-      <artifactId>aether-api</artifactId>
-      <version>1.7</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.sonatype.aether</groupId>
-      <artifactId>aether-util</artifactId>
-      <version>1.7</version>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.maven.resolver</groupId>
       <artifactId>maven-resolver-api</artifactId>

diff --git a/...n/java/org/apache/maven/shared/artifact/filter/collection/ArtifactTransitivityFilter.java b/...n/java/org/apache/maven/shared/artifact/filter/collection/ArtifactTransitivityFilter.java
@@ -27,10 +27,9 @@
 import org.apache.maven.project.ProjectBuildingException;
 import org.apache.maven.project.ProjectBuildingRequest;
 import org.apache.maven.project.ProjectBuildingResult;
+import org.eclipse.aether.graph.Dependency;
 
-import java.lang.reflect.InvocationTargetException;
 import java.util.LinkedHashSet;
-import java.util.List;
 import java.util.Set;
 
 /**
@@ -79,85 +78,19 @@ public ArtifactTransitivityFilter( Artifact artifact, ProjectBuildingRequest bui
         DependencyResolutionResult resolutionResult = buildingResult.getDependencyResolutionResult();
         if ( resolutionResult != null )
         {
-            if ( isMaven31() )
+            for ( Dependency dependency : resolutionResult.getDependencies() )
             {
-                try
-                {
-                    @SuppressWarnings( "unchecked" ) List<org.eclipse.aether.graph.Dependency> dependencies =
-                        (List<org.eclipse.aether.graph.Dependency>) Invoker.invoke( resolutionResult,
-                                                                                    "getDependencies" );
-
-                    for ( org.eclipse.aether.graph.Dependency dependency : dependencies )
-                    {
-                        Artifact mavenArtifact = 
-                                        (Artifact) Invoker.invoke( RepositoryUtils.class, "toArtifact",
-                                                                    org.eclipse.aether.artifact.Artifact.class,
-                                                                    dependency.getArtifact() );
-
-                        transitiveArtifacts.add( mavenArtifact.getDependencyConflictId() );
-                    }
-                }
-                catch ( IllegalAccessException | InvocationTargetException | NoSuchMethodException e )
-                {
-                    // don't want to pollute method signature with ReflectionExceptions
-                    throw new RuntimeException( e.getMessage(), e );
-                }
-            }
-            else
-            {
-                try
-                {
-                    @SuppressWarnings( "unchecked" ) List<org.sonatype.aether.graph.Dependency> dependencies =
-                        (List<org.sonatype.aether.graph.Dependency>) Invoker.invoke( resolutionResult,
-                                                                                     "getDependencies" );
-
-                    for ( org.sonatype.aether.graph.Dependency dependency : dependencies )
-                    {
-                        Artifact mavenArtifact = 
-                                        (Artifact) Invoker.invoke( RepositoryUtils.class, "toArtifact",
-                                                                    org.sonatype.aether.artifact.Artifact.class,
-                                                                    dependency.getArtifact() );
-
-                        transitiveArtifacts.add( mavenArtifact.getDependencyConflictId() );
-                    }
-                }
-                catch ( IllegalAccessException | InvocationTargetException | NoSuchMethodException e )
-                {
-                    // don't want to pollute method signature with ReflectionExceptions
-                    throw new RuntimeException( e.getMessage(), e );
-                }
+                Artifact mavenArtifact = RepositoryUtils.toArtifact( dependency.getArtifact() );
+                transitiveArtifacts.add( mavenArtifact.getDependencyConflictId() );
             }
         }
     }
 
-    /**
-     * @return true if the current Maven version is Maven 3.1.
-     */
-    protected static boolean isMaven31()
-    {
-        return canFindCoreClass( "org.eclipse.aether.artifact.Artifact" ); // Maven 3.1 specific
-    }
-
-    private static boolean canFindCoreClass( String className )
-    {
-        try
-        {
-            Thread.currentThread().getContextClassLoader().loadClass( className );
-
-            return true;
-        }
-        catch ( ClassNotFoundException e )
-        {
-            return false;
-        }
-    }
-
     /**
      * {@inheritDoc}
      */
     public Set<Artifact> filter( Set<Artifact> artifacts )
     {
-
         Set<Artifact> result = new LinkedHashSet<>();
         for ( Artifact artifact : artifacts )
         {

diff --git a/src/main/java/org/apache/maven/shared/artifact/filter/collection/Invoker.java b/src/main/java/org/apache/maven/shared/artifact/filter/collection/Invoker.java
diff --git a/src/main/java/org/apache/maven/shared/artifact/filter/resolve/AndFilter.java b/src/main/java/org/apache/maven/shared/artifact/filter/resolve/AndFilter.java
@@ -28,7 +28,6 @@
  * @author Robert Scholte
  * @since 3.0
  * 
- * @see org.sonatype.aether.util.filter.AndDependencyFilter
  * @see org.eclipse.aether.util.filter.AndDependencyFilter
  */
 public class AndFilter

diff --git a/src/main/java/org/apache/maven/shared/artifact/filter/resolve/ExclusionsFilter.java b/src/main/java/org/apache/maven/shared/artifact/filter/resolve/ExclusionsFilter.java
@@ -28,7 +28,6 @@
  * @author Robert Scholte
  * @since 3.0
  * 
- * @see org.sonatype.aether.util.filter.ExclusionsDependencyFilter
  * @see org.eclipse.aether.util.filter.ExclusionsDependencyFilter
  */
 public class ExclusionsFilter

diff --git a/src/main/java/org/apache/maven/shared/artifact/filter/resolve/OrFilter.java b/src/main/java/org/apache/maven/shared/artifact/filter/resolve/OrFilter.java
@@ -28,7 +28,6 @@
  * @author Robert Scholte
  * @since 3.0
  * 
- * @see org.sonatype.aether.util.filter.OrDependencyFilter
  * @see org.eclipse.aether.util.filter.OrDependencyFilter
  */
 public class OrFilter implements TransformableFilter

diff --git a/src/main/java/org/apache/maven/shared/artifact/filter/resolve/PatternExclusionsFilter.java b/src/main/java/org/apache/maven/shared/artifact/filter/resolve/PatternExclusionsFilter.java
@@ -40,9 +40,7 @@
  * @author Robert Scholte
  * @since 3.0
  * 
- * @see org.sonatype.aether.util.filter.PatternExclusionsDependencyFilter
  * @see org.eclipse.aether.util.filter.PatternExclusionsDependencyFilter
- * @see org.sonatype.aether.version.VersionScheme
  * @see org.eclipse.aether.version.VersionScheme
  */
 public class PatternExclusionsFilter implements TransformableFilter

diff --git a/src/main/java/org/apache/maven/shared/artifact/filter/resolve/PatternInclusionsFilter.java b/src/main/java/org/apache/maven/shared/artifact/filter/resolve/PatternInclusionsFilter.java
@@ -41,9 +41,7 @@
  * @author Robert Scholte
  * @since 3.0
  * 
- * @see org.sonatype.aether.util.filter.PatternInclusionsDependencyFilter
  * @see org.eclipse.aether.util.filter.PatternInclusionsDependencyFilter
- * @see org.sonatype.aether.version.VersionScheme
  * @see org.eclipse.aether.version.VersionScheme
  */
 public class PatternInclusionsFilter implements TransformableFilter

diff --git a/src/main/java/org/apache/maven/shared/artifact/filter/resolve/ScopeFilter.java b/src/main/java/org/apache/maven/shared/artifact/filter/resolve/ScopeFilter.java
@@ -29,7 +29,6 @@
  * @author Robert Scholte
  * @since 3.0
  * 
- * @see org.sonatype.aether.util.filter.ScopeDependencyFilter
  * @see org.eclipse.aether.util.filter.ScopeDependencyFilter
  */
 public class ScopeFilter implements TransformableFilter