|
 |
caa12d |
From 2adad987d89aa6ab94fa1351756730c3c09dd35d Mon Sep 17 00:00:00 2001
|
|
|
caa12d |
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
|
|
caa12d |
Date: Mon, 12 Oct 2015 13:03:40 +0200
|
|
|
caa12d |
Subject: [PATCH] Remove Maven 3.0 specific code
|
|
|
caa12d |
|
|
|
caa12d |
---
|
|
|
caa12d |
.../collection/ArtifactTransitivityFilter.java | 32 +---------------------
|
|
|
caa12d |
1 file changed, 1 insertion(+), 31 deletions(-)
|
|
|
caa12d |
|
|
|
caa12d |
diff --git a/src/main/java/org/apache/maven/shared/artifact/filter/collection/ArtifactTransitivityFilter.java b/src/main/java/org/apache/maven/shared/artifact/filter/collection/ArtifactTransitivityFilter.java
|
|
|
caa12d |
index 7db1664..df749db 100644
|
|
|
caa12d |
--- a/src/main/java/org/apache/maven/shared/artifact/filter/collection/ArtifactTransitivityFilter.java
|
|
|
caa12d |
+++ b/src/main/java/org/apache/maven/shared/artifact/filter/collection/ArtifactTransitivityFilter.java
|
|
|
caa12d |
@@ -116,37 +116,7 @@ public class ArtifactTransitivityFilter
|
|
|
caa12d |
}
|
|
|
caa12d |
else
|
|
|
caa12d |
{
|
|
|
caa12d |
- try
|
|
|
caa12d |
- {
|
|
|
caa12d |
- @SuppressWarnings( "unchecked" ) List<org.sonatype.aether.graph.Dependency> dependencies =
|
|
|
caa12d |
- (List<org.sonatype.aether.graph.Dependency>) Invoker.invoke( resolutionResult,
|
|
|
caa12d |
- "getDependencies" );
|
|
|
caa12d |
-
|
|
|
caa12d |
- for ( org.sonatype.aether.graph.Dependency dependency : dependencies )
|
|
|
caa12d |
- {
|
|
|
caa12d |
- Artifact mavenArtifact =
|
|
|
caa12d |
- (Artifact) Invoker.invoke( RepositoryUtils.class, "toArtifact",
|
|
|
caa12d |
- org.sonatype.aether.artifact.Artifact.class,
|
|
|
caa12d |
- dependency.getArtifact() );
|
|
|
caa12d |
-
|
|
|
caa12d |
- transitiveArtifacts.add( mavenArtifact.getDependencyConflictId() );
|
|
|
caa12d |
- }
|
|
|
caa12d |
- }
|
|
|
caa12d |
- catch ( IllegalAccessException e )
|
|
|
caa12d |
- {
|
|
|
caa12d |
- // don't want to pollute method signature with ReflectionExceptions
|
|
|
caa12d |
- throw new RuntimeException( e.getMessage(), e );
|
|
|
caa12d |
- }
|
|
|
caa12d |
- catch ( InvocationTargetException e )
|
|
|
caa12d |
- {
|
|
|
caa12d |
- // don't want to pollute method signature with ReflectionExceptions
|
|
|
caa12d |
- throw new RuntimeException( e.getMessage(), e );
|
|
|
caa12d |
- }
|
|
|
caa12d |
- catch ( NoSuchMethodException e )
|
|
|
caa12d |
- {
|
|
|
caa12d |
- // don't want to pollute method signature with ReflectionExceptions
|
|
|
caa12d |
- throw new RuntimeException( e.getMessage(), e );
|
|
|
caa12d |
- }
|
|
|
caa12d |
+ throw new RuntimeException( "Maven older than 3.1 are not supported" );
|
|
|
caa12d |
}
|
|
|
caa12d |
}
|
|
|
caa12d |
}
|
|
|
caa12d |
--
|
|
|
caa12d |
2.7.4
|
|
|
caa12d |
|