This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-dependency-analyzer.git
The following commit(s) were added to refs/heads/master by this push:
new 0acf0e6 [MSHARED-761] Make mvn dependency:analyze work with OpenJDK 11
0acf0e6 is described below
commit 0acf0e60cfc3de47bf43eb03264175e32024a7b3
Author: Mickaël SEBIRE <mickseb...@gmail.com>
AuthorDate: Mon Oct 8 21:04:34 2018 +0200
[MSHARED-761] Make mvn dependency:analyze work with OpenJDK 11
---
pom.xml | 4 ++--
.../dependency/analyzer/asm/DefaultAnnotationVisitor.java | 2 +-
.../shared/dependency/analyzer/asm/DefaultClassVisitor.java | 12 +++++++++++-
.../shared/dependency/analyzer/asm/DefaultFieldVisitor.java | 2 +-
.../shared/dependency/analyzer/asm/DefaultMethodVisitor.java | 2 +-
.../dependency/analyzer/asm/DefaultSignatureVisitor.java | 2 +-
6 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index f2dbb95..6c7a181 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
* "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.
+ * under the License.
*
-->
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
@@ -76,7 +76,7 @@
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
- <version>6.1.1</version>
+ <version>7.0-beta</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
diff --git
a/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultAnnotationVisitor.java
b/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultAnnotationVisitor.java
index 0006220..da55ab3 100644
---
a/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultAnnotationVisitor.java
+++
b/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultAnnotationVisitor.java
@@ -37,7 +37,7 @@ public class DefaultAnnotationVisitor
public DefaultAnnotationVisitor( ResultCollector resultCollector )
{
- super( Opcodes.ASM6 );
+ super( Opcodes.ASM7 );
this.resultCollector = resultCollector;
}
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 f107e02..c07aec2 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
@@ -57,7 +57,7 @@ public class DefaultClassVisitor
FieldVisitor fieldVisitor, MethodVisitor
methodVisitor,
ResultCollector resultCollector )
{
- super( Opcodes.ASM6 );
+ super( Opcodes.ASM7 );
this.signatureVisitor = signatureVisitor;
this.annotationVisitor = annotationVisitor;
this.fieldVisitor = fieldVisitor;
@@ -123,6 +123,16 @@ public class DefaultClassVisitor
return methodVisitor;
}
+ public void visitNestHost( final String nestHost )
+ {
+ resultCollector.addName( nestHost );
+ }
+
+ public void visitNestMember( final String nestMember )
+ {
+ resultCollector.addName( nestMember );
+ }
+
// private methods --------------------------------------------------------
private void addSignature( final String signature )
diff --git
a/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultFieldVisitor.java
b/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultFieldVisitor.java
index de4f622..37b51a6 100644
---
a/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultFieldVisitor.java
+++
b/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultFieldVisitor.java
@@ -39,7 +39,7 @@ public class DefaultFieldVisitor
public DefaultFieldVisitor( AnnotationVisitor annotationVisitor,
ResultCollector resultCollector )
{
- super( Opcodes.ASM6 );
+ super( Opcodes.ASM7 );
this.annotationVisitor = annotationVisitor;
this.resultCollector = resultCollector;
}
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 bde6173..24ca79d 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
@@ -48,7 +48,7 @@ public class DefaultMethodVisitor
public DefaultMethodVisitor( AnnotationVisitor annotationVisitor,
SignatureVisitor signatureVisitor,
ResultCollector resultCollector )
{
- super( Opcodes.ASM6 );
+ super( Opcodes.ASM7 );
this.annotationVisitor = annotationVisitor;
this.signatureVisitor = signatureVisitor;
this.resultCollector = resultCollector;
diff --git
a/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultSignatureVisitor.java
b/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultSignatureVisitor.java
index 609ccb6..74a76b2 100644
---
a/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultSignatureVisitor.java
+++
b/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultSignatureVisitor.java
@@ -36,7 +36,7 @@ public class DefaultSignatureVisitor
public DefaultSignatureVisitor( ResultCollector resultCollector )
{
- super( Opcodes.ASM6 );
+ super( Opcodes.ASM7 );
this.resultCollector = resultCollector;
}
