pool/maven-reporting-exec
SHA256
6
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-reporting-exec?expand=0&rev=3

Browse Source
This commit is contained in:
Fridrich Strba 2019-05-05 05:54:25 +00:00 committed by Git OBS Bridge
parent 65db808d46
commit 2dba77a516
1 changed files with 0 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
0001-Port-to-Maven-3.1.0-Eclipse-Aether-and-Eclipse-Sisu.patch
View File

@ -1,61 +0,0 @@
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 5be4eea..b15879c 100644
--- a/src/main/java/org/apache/maven/reporting/exec/DefaultMavenPluginManagerHelper.java
+++ b/src/main/java/org/apache/maven/reporting/exec/DefaultMavenPluginManagerHelper.java
@@ -91,34 +91,9 @@ public class DefaultMavenPluginManagerHelper
}
}
- private boolean isEclipseAether()
- {
- if ( isEclipseAether == null )
- {
- try
- {
- Thread.currentThread().getContextClassLoader().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;