Author: khmarbaise Date: Sat Aug 12 21:11:06 2017 New Revision: 1804872 URL: http://svn.apache.org/viewvc?rev=1804872&view=rev Log: [MCOMPILER-303] Failure of a build with JDK 9 o Upgraded org.ow2.asm:asm:6.0_ALPHA to 6.0_BETA o Activated outcommented code in AsmModuleInfoParser.
Modified: maven/plugins/trunk/maven-compiler-plugin/pom.xml maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/module/AsmModuleInfoParser.java Modified: maven/plugins/trunk/maven-compiler-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/pom.xml?rev=1804872&r1=1804871&r2=1804872&view=diff ============================================================================== --- maven/plugins/trunk/maven-compiler-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-compiler-plugin/pom.xml Sat Aug 12 21:11:06 2017 @@ -112,7 +112,7 @@ under the License. <dependency> <groupId>org.ow2.asm</groupId> <artifactId>asm</artifactId> - <version>6.0_ALPHA</version> + <version>6.0_BETA</version> </dependency> <dependency> <groupId>com.thoughtworks.qdox</groupId> Modified: maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/module/AsmModuleInfoParser.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/module/AsmModuleInfoParser.java?rev=1804872&r1=1804871&r2=1804872&view=diff ============================================================================== --- maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/module/AsmModuleInfoParser.java (original) +++ maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/module/AsmModuleInfoParser.java Sat Aug 12 21:11:06 2017 @@ -30,6 +30,7 @@ import java.util.jar.JarFile; import org.codehaus.plexus.component.annotations.Component; import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassVisitor; +import org.objectweb.asm.ModuleVisitor; //import org.objectweb.asm.ModuleVisitor; import org.objectweb.asm.Opcodes; @@ -63,22 +64,20 @@ public class AsmModuleInfoParser ClassReader reader = new ClassReader( in ); reader.accept( new ClassVisitor( Opcodes.ASM6 ) { -// REQUIRES ASM 6.0_ALPHA2 - -// @Override -// public ModuleVisitor visitModule( String name, int arg1, String arg2 ) -// { -// wrapper.builder = JavaModuleDescriptor.newModule( name ); -// -// return new ModuleVisitor( Opcodes.ASM6 ) -// { -// @Override -// public void visitRequire( String module, int access, String version ) -// { -// wrapper.builder.requires( module ); -// } -// }; -// } + @Override + public ModuleVisitor visitModule( String name, int arg1, String arg2 ) + { + wrapper.builder = JavaModuleDescriptor.newModule( name ); + + return new ModuleVisitor( Opcodes.ASM6 ) + { + @Override + public void visitRequire( String module, int access, String version ) + { + wrapper.builder.requires( module ); + } + }; + } }, 0 ); in.close();