[MSHARED-327] maven-dependency-analyzer not compatible with Java 8
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1590555 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java b/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java
index 53a16cf..5f5ca1a 100644
--- a/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java
+++ b/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java
@@ -187,7 +187,7 @@
if ( declaredArtifacts == null )
{
- declaredArtifacts = Collections.<Artifact>emptySet();
+ declaredArtifacts = Collections.emptySet();
}
return declaredArtifacts;
diff --git a/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultClassVisitor.java b/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultClassVisitor.java
index 09623cf..ee9bd9e 100644
--- a/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultClassVisitor.java
+++ b/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultClassVisitor.java
@@ -140,4 +140,6 @@
new SignatureReader( signature ).acceptType( signatureVisitor );
}
}
+
+
}
diff --git a/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultMethodVisitor.java b/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultMethodVisitor.java
index 6fcd519..6e91acf 100644
--- a/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultMethodVisitor.java
+++ b/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultMethodVisitor.java
@@ -91,6 +91,7 @@
*/
}
+ // TODO remove
public void visitMethodInsn( final int opcode, final String owner, final String name, final String desc )
{
resultCollector.addName( owner );
@@ -102,6 +103,13 @@
*/
}
+ // for java 8 and default method in interfaces
+ @Override
+ public void visitMethodInsn( int opcode, String owner, String name, String desc, boolean itf )
+ {
+ resultCollector.addName( owner );
+ }
+
public void visitLdcInsn( final Object cst )
{
if ( cst instanceof Type )
@@ -133,6 +141,8 @@
}
}
+
+
private void addTypeSignature( final String signature )
{
if ( signature != null )
