rfscholte closed pull request #2: [MSHARED-761] Make mvn dependency:analyze work with OpenJDK 11 URL: https://github.com/apache/maven-dependency-analyzer/pull/2
This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): 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 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 DefaultClassVisitor( SignatureVisitor signatureVisitor, AnnotationVisitor 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 MethodVisitor visitMethod( final int access, final String name, final Str 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 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 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 DefaultSignatureVisitor( ResultCollector resultCollector ) { - super( Opcodes.ASM6 ); + super( Opcodes.ASM7 ); this.resultCollector = resultCollector; } ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected] With regards, Apache Git Services
