aboutsummaryrefslogtreecommitdiffstats
path: root/config-model-fat
diff options
context:
space:
mode:
authorgjoranv <gv@oath.com>2018-05-25 12:18:07 +0200
committergjoranv <gv@oath.com>2018-06-06 12:03:14 +0200
commit08626325aaaf78a62c028445f157f32988b7857f (patch)
tree26ccea7d1d45ac52cf5f4905f8619185054ffeff /config-model-fat
parentede96019cbd83febc87dddec635910a5a7c39e02 (diff)
Upgrade maven-bundle-plugin to 3.5.0 to allow module-info.class
- Error with previous versions: [ERROR] Bundle com.yahoo.vespa:config-model-fat-amended:bundle:6-SNAPSHOT : Exception: java.lang.ArrayIndexOutOfBoundsException: 19 [ERROR] Bundle com.yahoo.vespa:config-model-fat-amended:bundle:6-SNAPSHOT : Invalid class file module-info.class (java.lang.ArrayIndexOutOfBoundsException: 19)
Diffstat (limited to 'config-model-fat')
-rw-r--r--config-model-fat/pom.xml9
1 files changed, 7 insertions, 2 deletions
diff --git a/config-model-fat/pom.xml b/config-model-fat/pom.xml
index 3ef9925510c..649d8a37bf6 100644
--- a/config-model-fat/pom.xml
+++ b/config-model-fat/pom.xml
@@ -25,6 +25,13 @@
<artifactId>guava</artifactId>
<version>13.0.1</version>
</dependency>
+ <dependency>
+ <!-- TODO: can probably be removed. Added to get the same set of embedded deps with maven-bundle-plugin 3.5 as with 2.4. -->
+ <groupId>com.yahoo.vespa</groupId>
+ <artifactId>annotations</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
<dependency>
<groupId>com.yahoo.vespa</groupId>
@@ -114,8 +121,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <!-- version >= 2.5.0 causes java.lang.ArrayIndexOutOfBoundsException: 176 -->
- <version>2.4.0</version>
<extensions>true</extensions>
<configuration>
<instructions>