andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Upgrade dependencies to versions which use ASM 6.0.0+

Browse Source 
Motivation:

We need to upgrade our dependencies to versions which use ASM 6.0.0+ to support compiling on java9.

Modifications:

Update animal-sniffer-maven-plugin and maven-shade-plugin.

Result:

Fixes https://github.com/netty/netty/issues/6100
This commit is contained in:
Johno Crawford 2017-10-07 10:28:06 +02:00 committed by Norman Maurer
parent 5eca326c35
commit f301edfb9d
2 changed files with 5 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
common/pom.xml
View File

@ -102,30 +102,6 @@
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
<!-- Needed to support JDK9 -->
<!-- See https://github.com/netty/netty/issues/6100 -->
<dependencies>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>${asm.version}</version>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-commons</artifactId>
<version>${asm.version}</version>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-analysis</artifactId>
<version>${asm.version}</version>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-util</artifactId>
<version>${asm.version}</version>
</dependency>
</dependencies>
</plugin> </plugin>
<!-- Add generated collection sources. --> <!-- Add generated collection sources. -->
<plugin> <plugin>

20
pom.xml
View File

@ -77,10 +77,6 @@
<argLine.java9>--add-modules java.xml.bind ${argLine.java9.extras}</argLine.java9> <argLine.java9>--add-modules java.xml.bind ${argLine.java9.extras}</argLine.java9>
<!-- Not use alpn agent as Java9 supports alpn out of the box --> <!-- Not use alpn agent as Java9 supports alpn out of the box -->
<argLine.alpnAgent /> <argLine.alpnAgent />
<!-- This is needed as earlier ASM versions not support java9 -->
<!-- https://issues.apache.org/jira/browse/MSHADE-242 -->
<!-- https://github.com/netty/netty/issues/6100 -->
<asm.version>6.0_BETA</asm.version>
<!-- Skip as maven plugin not works with Java9 yet --> <!-- Skip as maven plugin not works with Java9 yet -->
<skipOsgiTestsuite>true</skipOsgiTestsuite> <skipOsgiTestsuite>true</skipOsgiTestsuite>
<forbiddenapis.skip>true</forbiddenapis.skip> <forbiddenapis.skip>true</forbiddenapis.skip>
@ -200,7 +196,6 @@
<logging.config>${project.basedir}/../common/src/test/resources/logback-test.xml</logging.config> <logging.config>${project.basedir}/../common/src/test/resources/logback-test.xml</logging.config>
<logging.logLevel>debug</logging.logLevel> <logging.logLevel>debug</logging.logLevel>
<log4j2.version>2.6.2</log4j2.version> <log4j2.version>2.6.2</log4j2.version>
<asm.version>5.1</asm.version>
<enforcer.plugin.version>1.4.1</enforcer.plugin.version> <enforcer.plugin.version>1.4.1</enforcer.plugin.version>
<testJavaHome>${env.JAVA_HOME}</testJavaHome> <testJavaHome>${env.JAVA_HOME}</testJavaHome>
<skipOsgiTestsuite>false</skipOsgiTestsuite> <skipOsgiTestsuite>false</skipOsgiTestsuite>
@ -641,15 +636,7 @@
be used even when compiling with java 1.7+ --> be used even when compiling with java 1.7+ -->
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId> <artifactId>animal-sniffer-maven-plugin</artifactId>
<version>1.11</version> <version>1.16</version>
<dependencies>
<!-- Upgrade ASM and support Java 8 bytecode -->
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-all</artifactId>
<version>${asm.version}</version>
</dependency>
</dependencies>
<configuration> <configuration>
<signature> <signature>
<groupId>org.codehaus.mojo.signature</groupId> <groupId>org.codehaus.mojo.signature</groupId>
@ -704,6 +691,9 @@
<ignore>java.util.zip.CRC32</ignore> <ignore>java.util.zip.CRC32</ignore>
<ignore>java.util.zip.Adler32</ignore> <ignore>java.util.zip.Adler32</ignore>
<!-- NioDatagramChannel implementation -->
<ignore>java.net.ProtocolFamily</ignore>
<!-- JDK 9 --> <!-- JDK 9 -->
<ignore>java.nio.ByteBuffer</ignore> <ignore>java.nio.ByteBuffer</ignore>
<ignore>java.nio.CharBuffer</ignore> <ignore>java.nio.CharBuffer</ignore>
@ -1160,7 +1150,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId> <artifactId>maven-shade-plugin</artifactId>
<version>2.4.3</version> <version>3.1.0</version>
</plugin> </plugin>
<!-- Workaround for the 'M2E plugin execution not covered' problem. <!-- Workaround for the 'M2E plugin execution not covered' problem.