diff options
| -rw-r--r-- | config-model-fat/pom.xml | 9 | ||||
| -rw-r--r-- | parent/pom.xml | 2 |
2 files changed, 8 insertions, 3 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> diff --git a/parent/pom.xml b/parent/pom.xml index 411cc5ede9e..6cf09e73c8c 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -81,7 +81,7 @@ <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> - <version>2.4.0</version> + <version>3.5.0</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> |