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 2018/09/30 18:37:17 UTC
[maven-plugin-tools] 01/03: Upgrade ASM to 6.2 for Java 10,11...
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MPLUGIN-336
in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git
commit d98171b2a0835f9ba750d9b1fff6a4a73c19f386
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Mon Jul 16 11:33:53 2018 +0200
Upgrade ASM to 6.2 for Java 10,11...
... support
This upgrades ASM to 6.2 for Java 10 and early Java 11 support.
---
.../plugin/generator/PluginHelpGenerator.java | 4 +-
pom.xml | 53 +++++++---------------
2 files changed, 18 insertions(+), 39 deletions(-)
diff --git a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java
index 23c3ed9..6d5c396 100644
--- a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java
+++ b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java
@@ -36,8 +36,8 @@ import org.codehaus.plexus.velocity.VelocityComponent;
import org.objectweb.asm.ClassReader;
import org.objectweb.asm.ClassVisitor;
import org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.commons.ClassRemapper;
import org.objectweb.asm.commons.Remapper;
-import org.objectweb.asm.commons.RemappingClassAdapter;
import org.objectweb.asm.commons.SimpleRemapper;
import java.io.File;
@@ -421,7 +421,7 @@ public class PluginHelpGenerator
Remapper packageRemapper =
new SimpleRemapper( HELP_MOJO_CLASS_NAME, packageAsDirectory + '/' + HELP_MOJO_CLASS_NAME );
- ClassVisitor cv = new RemappingClassAdapter( cw, packageRemapper );
+ ClassVisitor cv = new ClassRemapper( cw, packageRemapper );
try
{
diff --git a/pom.xml b/pom.xml
index 06455ff..6cb39f3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,7 +97,7 @@
<antVersion>1.7.1</antVersion>
<mavenInvokerPluginVersion>3.0.1</mavenInvokerPluginVersion>
<maven.site.path>plugin-tools-archives/plugin-tools-LATEST</maven.site.path>
- <asmVersion>5.0.2</asmVersion>
+ <asmVersion>6.2</asmVersion>
</properties>
<dependencyManagement>
@@ -291,6 +291,21 @@
<plugins>
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>enforce-bytecode-version</id>
+ <configuration>
+ <rules>
+ <enforceBytecodeVersion>
+ <excludes>
+ <!-- ASM supports Java 1.5+, see https://asm.ow2.io/faq.html#Q14 -->
+ <exclude>org.ow2.asm:*</exclude>
+ </excludes>
+ </enforceBytecodeVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
<dependencies>
<dependency>
<groupId>org.codehaus.mojo</groupId>
@@ -398,41 +413,5 @@
</plugins>
</reporting>
</profile>
- <profile>
- <activation>
- <jdk>[1.9,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <id>enforce-bytecode-version</id>
- <configuration>
- <rules>
- <enforceBytecodeVersion>
- <ignoreClasses>
- <ignoreClass>module-info</ignoreClass>
- </ignoreClasses>
- </enforceBytecodeVersion>
- </rules>
- </configuration>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>extra-enforcer-rules</artifactId>
- <version>1.0-beta-5</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
- <properties>
- <asmVersion>6.1.1</asmVersion>
- </properties>
- </profile>
</profiles>
</project>