You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2018/08/18 21:02:24 UTC
[maven-plugin-tools] branch MPLUGIN-336 updated (be1c9de -> d9ffdaf)
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a change to branch MPLUGIN-336
in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git.
discard be1c9de [MPLUGIN-336] - Upgrade ASM to 6.2 for Java 10,11... o This upgrades ASM to 6.2 for Java 10 and early Java 11 support.
new d9ffdaf [MPLUGIN-336] - Upgrade ASM to 6.2 for Java 10,11... o This upgrades ASM to 6.2 for Java 10 and early Java 11 support.
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (be1c9de)
\
N -- N -- N refs/heads/MPLUGIN-336 (d9ffdaf)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
maven-plugin-plugin/pom.xml | 2 ++
1 file changed, 2 insertions(+)
[maven-plugin-tools] 01/01: [MPLUGIN-336] - Upgrade ASM to 6.2 for
Java 10,
11... o This upgrades ASM to 6.2 for Java 10 and early Java 11 support.
Posted by kh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch MPLUGIN-336
in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git
commit d9ffdaf4f40e9cccf3e10c8a8a16232378586c95
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Mon Jul 16 11:33:53 2018 +0200
[MPLUGIN-336] - Upgrade ASM to 6.2 for Java 10,11...
o This upgrades ASM to 6.2 for Java 10 and early Java 11 support.
---
maven-plugin-plugin/pom.xml | 2 +
.../plugin/generator/PluginHelpGenerator.java | 4 +-
pom.xml | 53 +++++++---------------
3 files changed, 20 insertions(+), 39 deletions(-)
diff --git a/maven-plugin-plugin/pom.xml b/maven-plugin-plugin/pom.xml
index e1e3a44..fdcd3a8 100644
--- a/maven-plugin-plugin/pom.xml
+++ b/maven-plugin-plugin/pom.xml
@@ -375,6 +375,8 @@
<properties>
<maven.compiler.source>${maven.compiler.source}</maven.compiler.source>
<maven.compiler.target>${maven.compiler.target}</maven.compiler.target>
+ <!-- e.g. ensure that Java7 picks up TLSv1.2 when connecting with Central -->
+ <https.protocols>${https.protocols}</https.protocols>
</properties>
</configuration>
<executions>
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>