From cf2cedf003f11e207befaa10227c19e28a92b5ca Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Wed, 2 Nov 2016 14:12:00 +0100
Subject: [PATCH] Port to Eclipse Aether and Eclipse Sisu

---
 .../exec/DefaultMavenPluginManagerHelper.java      | 28 +---------------------
 .../exec/TestDefaultMavenReportExecutor.java       | 10 ++++----
 2 files changed, 6 insertions(+), 32 deletions(-)

diff --git a/src/main/java/org/apache/maven/reporting/exec/DefaultMavenPluginManagerHelper.java b/src/main/java/org/apache/maven/reporting/exec/DefaultMavenPluginManagerHelper.java
index 4de901e..5cd3985 100644
--- a/src/main/java/org/apache/maven/reporting/exec/DefaultMavenPluginManagerHelper.java
+++ b/src/main/java/org/apache/maven/reporting/exec/DefaultMavenPluginManagerHelper.java
@@ -94,35 +94,9 @@ public class DefaultMavenPluginManagerHelper
         }
     }
 
-    private boolean isEclipseAether()
-    {
-        if ( isEclipseAether == null )
-        {
-            try
-            {
-                ClassLoader cl = Thread.currentThread().getContextClassLoader();
-                cl.loadClass( "org.sonatype.aether.graph.DependencyFilter" );
-                isEclipseAether = false;
-            }
-            catch ( ClassNotFoundException e )
-            {
-                isEclipseAether = true;
-            }
-        }
-
-        return isEclipseAether.booleanValue();
-    }
-
     private Object createExclusionsDependencyFilter( List<String> artifactIdsList )
     {
-        if ( isEclipseAether() )
-        {
-            return new org.eclipse.aether.util.filter.ExclusionsDependencyFilter( artifactIdsList );
-        }
-        else
-        {
-            return new org.sonatype.aether.util.filter.ExclusionsDependencyFilter( artifactIdsList );
-        }
+        return new org.eclipse.aether.util.filter.ExclusionsDependencyFilter( artifactIdsList );
     }
 
     public PluginDescriptor getPluginDescriptor( Plugin plugin, MavenSession session )
diff --git a/src/test/java/org/apache/maven/reporting/exec/TestDefaultMavenReportExecutor.java b/src/test/java/org/apache/maven/reporting/exec/TestDefaultMavenReportExecutor.java
index a6c37bf..adfe03a 100644
--- a/src/test/java/org/apache/maven/reporting/exec/TestDefaultMavenReportExecutor.java
+++ b/src/test/java/org/apache/maven/reporting/exec/TestDefaultMavenReportExecutor.java
@@ -44,11 +44,11 @@ import org.codehaus.plexus.PlexusTestCase;
 import org.codehaus.plexus.classworlds.realm.ClassRealm;
 import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
 import org.codehaus.plexus.logging.Logger;
-import org.sonatype.aether.RepositorySystemSession;
-import org.sonatype.aether.artifact.Artifact;
-import org.sonatype.aether.repository.RemoteRepository;
-import org.sonatype.aether.repository.WorkspaceReader;
-import org.sonatype.aether.repository.WorkspaceRepository;
+import org.eclipse.aether.RepositorySystemSession;
+import org.eclipse.aether.artifact.Artifact;
+import org.eclipse.aether.repository.RemoteRepository;
+import org.eclipse.aether.repository.WorkspaceReader;
+import org.eclipse.aether.repository.WorkspaceRepository;
 
 import java.io.File;
 import java.util.Collections;
-- 
2.7.4