diff options
-rw-r--r-- | dependency-versions/pom.xml | 1 | ||||
-rw-r--r-- | maven-plugins/allowed-maven-dependencies.txt | 4 | ||||
-rw-r--r-- | parent/pom.xml | 10 | ||||
-rw-r--r-- | vespa-dependencies-enforcer/allowed-maven-dependencies.txt | 6 | ||||
-rw-r--r-- | vespa-enforcer-extensions/pom.xml | 2 |
5 files changed, 17 insertions, 6 deletions
diff --git a/dependency-versions/pom.xml b/dependency-versions/pom.xml index 62afa4b17f7..1e2286d6d7b 100644 --- a/dependency-versions/pom.xml +++ b/dependency-versions/pom.xml @@ -93,6 +93,7 @@ <curator.vespa.version>5.5.0</curator.vespa.version> <dropwizard.metrics.vespa.version>4.1.12.1</dropwizard.metrics.vespa.version> <!-- ZK 3.9.1 requires this --> <eclipse-collections.vespa.version>11.1.0</eclipse-collections.vespa.version> + <eclipse-sisu.vespa.version>0.9.0.M2</eclipse-sisu.vespa.version> <felix.vespa.version>7.0.5</felix.vespa.version> <felix.log.vespa.version>1.3.0</felix.log.vespa.version> <findbugs.vespa.version>3.0.2</findbugs.vespa.version> <!-- Should be kept in sync with guava --> diff --git a/maven-plugins/allowed-maven-dependencies.txt b/maven-plugins/allowed-maven-dependencies.txt index 3972ddcd085..b0b8055cd76 100644 --- a/maven-plugins/allowed-maven-dependencies.txt +++ b/maven-plugins/allowed-maven-dependencies.txt @@ -55,8 +55,8 @@ org.codehaus.plexus:plexus-sec-dispatcher:2.0 org.codehaus.plexus:plexus-utils:${maven-shade-plugin.vespa.version} org.eclipse.aether:aether-api:1.0.0.v20140518 org.eclipse.aether:aether-util:1.0.0.v20140518 -org.eclipse.sisu:org.eclipse.sisu.inject:0.3.5 -org.eclipse.sisu:org.eclipse.sisu.plexus:0.3.5 +org.eclipse.sisu:org.eclipse.sisu.inject:${eclipse-sisu.vespa.version} +org.eclipse.sisu:org.eclipse.sisu.plexus:${eclipse-sisu.vespa.version} org.hamcrest:hamcrest-core:${hamcrest.vespa.version} org.hamcrest:hamcrest:${hamcrest.vespa.version} org.iq80.snappy:snappy:0.4 diff --git a/parent/pom.xml b/parent/pom.xml index 7642b87ac7b..4009c78a0c1 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -992,6 +992,16 @@ <version>${eclipse-collections.vespa.version}</version> </dependency> <dependency> + <groupId>org.eclipse.sisu</groupId> + <artifactId>org.eclipse.sisu.inject</artifactId> + <version>${eclipse-sisu.vespa.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.sisu</groupId> + <artifactId>org.eclipse.sisu.plexus</artifactId> + <version>${eclipse-sisu.vespa.version}</version> + </dependency> + <dependency> <groupId>org.eclipse.collections</groupId> <artifactId>eclipse-collections-api</artifactId> <version>${eclipse-collections.vespa.version}</version> diff --git a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt index 525c77f7df6..38770f078fc 100644 --- a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt +++ b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt @@ -140,7 +140,7 @@ org.bouncycastle:bcprov-jdk18on:${bouncycastle.vespa.version} org.bouncycastle:bcutil-jdk18on:${bouncycastle.vespa.version} org.codehaus.plexus:plexus-archiver:4.8.0 org.codehaus.plexus:plexus-classworlds:2.7.0 -org.codehaus.plexus:plexus-component-annotations:1.5.5 +org.codehaus.plexus:plexus-component-annotations:2.1.0 org.codehaus.plexus:plexus-container-default:1.0-alpha-9-stable-1 org.codehaus.plexus:plexus-interpolation:1.26 org.codehaus.plexus:plexus-io:${maven-enforcer-plugin.vespa.version} @@ -166,8 +166,8 @@ org.eclipse.jetty:jetty-security:${jetty.vespa.version} org.eclipse.jetty:jetty-server:${jetty.vespa.version} org.eclipse.jetty:jetty-servlet:${jetty.vespa.version} org.eclipse.jetty:jetty-util:${jetty.vespa.version} -org.eclipse.sisu:org.eclipse.sisu.inject:0.3.5 -org.eclipse.sisu:org.eclipse.sisu.plexus:0.3.5 +org.eclipse.sisu:org.eclipse.sisu.inject:${eclipse-sisu.vespa.version} +org.eclipse.sisu:org.eclipse.sisu.plexus:${eclipse-sisu.vespa.version} org.fusesource.jansi:jansi:1.18 org.glassfish.jaxb:jaxb-core:${jaxb.runtime.vespa.version} org.glassfish.jaxb:jaxb-runtime:${jaxb.runtime.vespa.version} diff --git a/vespa-enforcer-extensions/pom.xml b/vespa-enforcer-extensions/pom.xml index 10cd2b8096b..c0b5e34076f 100644 --- a/vespa-enforcer-extensions/pom.xml +++ b/vespa-enforcer-extensions/pom.xml @@ -62,7 +62,7 @@ <!-- generate index of project components --> <groupId>org.eclipse.sisu</groupId> <artifactId>sisu-maven-plugin</artifactId> - <version>0.9.0.M2</version> + <version>${eclipse-sisu.vespa.version}</version> <executions> <execution> <goals> |