summaryrefslogtreecommitdiffstats
path: root/parent
diff options
context:
space:
mode:
authorgjoranv <gv@oath.com>2018-06-28 18:02:41 +0200
committergjoranv <gv@oath.com>2018-06-29 17:20:22 +0200
commiteace6c1fea47df407977732da2d9f5312c5d9239 (patch)
tree8bde78a96d15496dec692c4647d749561b5d1b71 /parent
parent9118a8b241ebae28b7e12be21c4fdb1dca062641 (diff)
Java 10: Update asm and use latest asm for maven-shade-plugin.
Problem shading JAR vespa-http-client.jar entry com/yahoo/vespa/http/client/Result$ResultType.class: java.lang.IllegalArgumentException IllegalArgumentException at org.objectweb.asm.ClassReader.<init> (ClassReader.java:160)
Diffstat (limited to 'parent')
-rw-r--r--parent/pom.xml11
1 files changed, 10 insertions, 1 deletions
diff --git a/parent/pom.xml b/parent/pom.xml
index c2c556d4586..33817452ae2 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -171,6 +171,14 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.1.1</version>
+ <dependencies>
+ <!-- TODO: Remove for shade-plugin 3.1.2 - https://issues.apache.org/jira/browse/MSHADE-289 -->
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>${asm.version}</version>
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -385,7 +393,7 @@
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
- <version>6.1.1</version>
+ <version>${asm.version}</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
@@ -650,6 +658,7 @@
<properties>
<antlr.version>3.5.2</antlr.version>
<antlr4.version>4.5</antlr4.version>
+ <asm.version>6.2</asm.version>
<!-- Athenz dependencies. Make sure these dependencies matches those in Vespa's internal repositories -->
<athenz.version>1.7.43</athenz.version>
<commons-lang.version>2.6</commons-lang.version>