You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2017/10/20 10:18:14 UTC
svn commit: r1812729 - in /maven/shared/trunk/maven-dependency-analyzer/src:
main/java/org/apache/maven/shared/dependency/analyzer/
main/java/org/apache/maven/shared/dependency/analyzer/asm/
test/java/org/apache/maven/shared/dependency/analyzer/asm/
Author: rfscholte
Date: Fri Oct 20 10:18:14 2017
New Revision: 1812729
URL: http://svn.apache.org/viewvc?rev=1812729&view=rev
Log:
[MSHARED-660] Upgrade to asm 6.0 for JDK9
Change version to Opcodes.ASM6
Ignore class files with a hyphen
Added:
maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/asm/ASMDependencyAnalyzerTest.java
Modified:
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/ClassFileVisitorUtils.java
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultAnnotationVisitor.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/DefaultFieldVisitor.java
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultMethodVisitor.java
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultSignatureVisitor.java
Modified: maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/ClassFileVisitorUtils.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/ClassFileVisitorUtils.java?rev=1812729&r1=1812728&r2=1812729&view=diff
==============================================================================
--- maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/ClassFileVisitorUtils.java (original)
+++ maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/ClassFileVisitorUtils.java Fri Oct 20 10:18:14 2017
@@ -102,7 +102,8 @@ public final class ClassFileVisitorUtils
{
String name = entry.getName();
- if ( name.endsWith( ".class" ) )
+ // ignore files like package-info.class and module-info.class
+ if ( name.endsWith( ".class" ) && name.indexOf( '-' ) == -1 )
{
visitClass( name, in, visitor );
}
Modified: maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultAnnotationVisitor.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultAnnotationVisitor.java?rev=1812729&r1=1812728&r2=1812729&view=diff
==============================================================================
--- maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultAnnotationVisitor.java (original)
+++ maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultAnnotationVisitor.java Fri Oct 20 10:18:14 2017
@@ -37,7 +37,7 @@ public class DefaultAnnotationVisitor
public DefaultAnnotationVisitor( ResultCollector resultCollector )
{
- super( Opcodes.ASM5 );
+ super( Opcodes.ASM6 );
this.resultCollector = resultCollector;
}
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=1812729&r1=1812728&r2=1812729&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 Fri Oct 20 10:18:14 2017
@@ -57,7 +57,7 @@ public class DefaultClassVisitor
FieldVisitor fieldVisitor, MethodVisitor methodVisitor,
ResultCollector resultCollector )
{
- super( Opcodes.ASM5 );
+ super( Opcodes.ASM6 );
this.signatureVisitor = signatureVisitor;
this.annotationVisitor = annotationVisitor;
this.fieldVisitor = fieldVisitor;
Modified: maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultFieldVisitor.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultFieldVisitor.java?rev=1812729&r1=1812728&r2=1812729&view=diff
==============================================================================
--- maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultFieldVisitor.java (original)
+++ maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultFieldVisitor.java Fri Oct 20 10:18:14 2017
@@ -39,7 +39,7 @@ public class DefaultFieldVisitor
public DefaultFieldVisitor( AnnotationVisitor annotationVisitor, ResultCollector resultCollector )
{
- super( Opcodes.ASM5 );
+ super( Opcodes.ASM6 );
this.annotationVisitor = annotationVisitor;
this.resultCollector = resultCollector;
}
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=1812729&r1=1812728&r2=1812729&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 Fri Oct 20 10:18:14 2017
@@ -47,7 +47,7 @@ public class DefaultMethodVisitor
public DefaultMethodVisitor( AnnotationVisitor annotationVisitor, SignatureVisitor signatureVisitor,
ResultCollector resultCollector )
{
- super( Opcodes.ASM5 );
+ super( Opcodes.ASM6 );
this.annotationVisitor = annotationVisitor;
this.signatureVisitor = signatureVisitor;
this.resultCollector = resultCollector;
Modified: maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultSignatureVisitor.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultSignatureVisitor.java?rev=1812729&r1=1812728&r2=1812729&view=diff
==============================================================================
--- maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultSignatureVisitor.java (original)
+++ maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultSignatureVisitor.java Fri Oct 20 10:18:14 2017
@@ -36,7 +36,7 @@ public class DefaultSignatureVisitor
public DefaultSignatureVisitor( ResultCollector resultCollector )
{
- super( Opcodes.ASM5 );
+ super( Opcodes.ASM6 );
this.resultCollector = resultCollector;
}
Added: maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/asm/ASMDependencyAnalyzerTest.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/asm/ASMDependencyAnalyzerTest.java?rev=1812729&view=auto
==============================================================================
--- maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/asm/ASMDependencyAnalyzerTest.java (added)
+++ maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/asm/ASMDependencyAnalyzerTest.java Fri Oct 20 10:18:14 2017
@@ -0,0 +1,40 @@
+package org.apache.maven.shared.dependency.analyzer.asm;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.net.URL;
+
+import org.junit.Test;
+
+public class ASMDependencyAnalyzerTest
+{
+ private ASMDependencyAnalyzer analyzer = new ASMDependencyAnalyzer();
+
+ @Test
+ public void test() throws Exception
+ {
+ URL jarUrl = this.getClass().getResource( "/org/objectweb/asm/ClassReader.class" );
+
+ String fileUrl = jarUrl.toString().substring( "jar:".length(), jarUrl.toString().indexOf( "!/" ) );
+
+ analyzer.analyze( new URL(fileUrl) );
+ }
+
+}