You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2014/04/28 08:33:55 UTC
svn commit: r1590555 - in
/maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer:
DefaultProjectDependencyAnalyzer.java asm/DefaultClassVisitor.java
asm/DefaultMethodVisitor.java
Author: olamy
Date: Mon Apr 28 06:33:54 2014
New Revision: 1590555
URL: http://svn.apache.org/r1590555
Log:
[MSHARED-327] maven-dependency-analyzer not compatible with Java 8
Modified:
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultClassVisitor.java
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultMethodVisitor.java
Modified: maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java?rev=1590555&r1=1590554&r2=1590555&view=diff
==============================================================================
--- maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java (original)
+++ maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java Mon Apr 28 06:33:54 2014
@@ -187,7 +187,7 @@ public class DefaultProjectDependencyAna
if ( declaredArtifacts == null )
{
- declaredArtifacts = Collections.<Artifact>emptySet();
+ declaredArtifacts = Collections.emptySet();
}
return declaredArtifacts;
Modified: maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultClassVisitor.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultClassVisitor.java?rev=1590555&r1=1590554&r2=1590555&view=diff
==============================================================================
--- maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultClassVisitor.java (original)
+++ maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultClassVisitor.java Mon Apr 28 06:33:54 2014
@@ -140,4 +140,6 @@ public class DefaultClassVisitor
new SignatureReader( signature ).acceptType( signatureVisitor );
}
}
+
+
}
Modified: maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultMethodVisitor.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultMethodVisitor.java?rev=1590555&r1=1590554&r2=1590555&view=diff
==============================================================================
--- maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultMethodVisitor.java (original)
+++ maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultMethodVisitor.java Mon Apr 28 06:33:54 2014
@@ -91,6 +91,7 @@ public class DefaultMethodVisitor
*/
}
+ // TODO remove
public void visitMethodInsn( final int opcode, final String owner, final String name, final String desc )
{
resultCollector.addName( owner );
@@ -102,6 +103,13 @@ public class DefaultMethodVisitor
*/
}
+ // 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 @@ public class DefaultMethodVisitor
}
}
+
+
private void addTypeSignature( final String signature )
{
if ( signature != null )