diff options
| -rw-r--r-- | cloud-tenant-base-dependencies-enforcer/pom.xml | 7 | ||||
| -rw-r--r-- | container-dependencies-enforcer/pom.xml | 2 | ||||
| -rw-r--r-- | container-dependency-versions/pom.xml | 11 | ||||
| -rw-r--r-- | container-test/pom.xml | 8 | ||||
| -rw-r--r-- | controller-api/pom.xml | 7 | ||||
| -rw-r--r-- | parent/pom.xml | 11 | ||||
| -rwxr-xr-x | provided-dependencies/pom.xml | 8 | ||||
| -rw-r--r-- | zookeeper-server/pom.xml | 6 |
8 files changed, 35 insertions, 25 deletions
diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml index 729cd91e314..5359428fe22 100644 --- a/cloud-tenant-base-dependencies-enforcer/pom.xml +++ b/cloud-tenant-base-dependencies-enforcer/pom.xml @@ -21,6 +21,7 @@ <!-- MUST BE KEPT IN SYNC WITH parent/pom.xml --> <athenz.version>1.10.54</athenz.version> + <bouncycastle.version>1.68</bouncycastle.version> <felix.version>7.0.1</felix.version> <httpclient5.version>5.1.2</httpclient5.version> <httpclient.version>4.5.13</httpclient.version> @@ -33,7 +34,6 @@ <!-- ALL BELOW MUST BE KEPT IN SYNC WITH container-dependency-versions pom Copied here because vz-tenant-base does not have a parent. --> <aopalliance.version>1.0</aopalliance.version> - <bouncycastle.version>1.68</bouncycastle.version> <guava.version>27.1-jre</guava.version> <guice.version>4.2.3</guice.version> <jackson2.version>2.13.3</jackson2.version> @@ -94,8 +94,6 @@ <include>javax.servlet:javax.servlet-api:[${javax.servlet-api.version}]:jar:provided</include> <include>javax.ws.rs:javax.ws.rs-api:[${javax.ws.rs-api.version}]:jar:provided</include> <include>javax.xml.bind:jaxb-api:[${jaxb.version}]:jar:provided</include> - <include>org.bouncycastle:bcpkix-jdk15on:[${bouncycastle.version}]:jar:provided</include> - <include>org.bouncycastle:bcprov-jdk15on:[${bouncycastle.version}]:jar:provided</include> <include>org.slf4j:jcl-over-slf4j:[${slf4j.version}]:jar:provided</include> <include>org.slf4j:log4j-over-slf4j:[${slf4j.version}]:jar:provided</include> <include>org.slf4j:slf4j-api:[${slf4j.version}]:jar:provided</include> @@ -219,7 +217,8 @@ <include>org.apache.httpcomponents:httpmime:${httpclient.version}:jar:test</include> <include>org.apache.opennlp:opennlp-tools:1.9.3:jar:test</include> <include>org.apiguardian:apiguardian-api:1.1.0:jar:test</include> - <include>org.codehaus.woodstox:stax2-api:3.1.4:jar:test</include> + <include>org.bouncycastle:bcpkix-jdk15on:[${bouncycastle.version}]:jar:test</include> + <include>org.bouncycastle:bcprov-jdk15on:[${bouncycastle.version}]:jar:test</include> <include>org.codehaus.woodstox:stax2-api:3.1.4:jar:test</include> <include>org.eclipse.jetty.alpn:alpn-api:[${jetty-alpn.version}]:jar:test</include> <include>org.eclipse.jetty.http2:http2-common:[${jetty.version}]:jar:test</include> <include>org.eclipse.jetty.http2:http2-hpack:[${jetty.version}]:jar:test</include> diff --git a/container-dependencies-enforcer/pom.xml b/container-dependencies-enforcer/pom.xml index 56ebc92f88d..c38ff5f9f2a 100644 --- a/container-dependencies-enforcer/pom.xml +++ b/container-dependencies-enforcer/pom.xml @@ -80,8 +80,6 @@ <include>javax.servlet:javax.servlet-api:[${javax.servlet-api.version}]:jar:provided</include> <include>javax.ws.rs:javax.ws.rs-api:[${javax.ws.rs-api.version}]:jar:provided</include> <include>javax.xml.bind:jaxb-api:[${jaxb.version}]:jar:provided</include> - <include>org.bouncycastle:bcpkix-jdk15on:[${bouncycastle.version}]:jar:provided</include> - <include>org.bouncycastle:bcprov-jdk15on:[${bouncycastle.version}]:jar:provided</include> <include>org.slf4j:jcl-over-slf4j:[${slf4j.version}]:jar:provided</include> <include>org.slf4j:log4j-over-slf4j:[${slf4j.version}]:jar:provided</include> <include>org.slf4j:slf4j-api:[${slf4j.version}]:jar:provided</include> diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml index a47b91f3231..3379dfb1704 100644 --- a/container-dependency-versions/pom.xml +++ b/container-dependency-versions/pom.xml @@ -130,16 +130,6 @@ <!-- jaxb end --> <dependency> - <groupId>org.bouncycastle</groupId> - <artifactId>bcpkix-jdk15on</artifactId> - <version>${bouncycastle.version}</version> - </dependency> - <dependency> - <groupId>org.bouncycastle</groupId> - <artifactId>bcprov-jdk15on</artifactId> - <version>${bouncycastle.version}</version> - </dependency> - <dependency> <groupId>org.slf4j</groupId> <artifactId>jcl-over-slf4j</artifactId> <version>${slf4j.version}</version> @@ -245,7 +235,6 @@ <properties> <aopalliance.version>1.0</aopalliance.version> - <bouncycastle.version>1.68</bouncycastle.version> <guava.version>27.1-jre</guava.version> <guice.version>4.2.3</guice.version> <jackson2.version>2.13.3</jackson2.version> diff --git a/container-test/pom.xml b/container-test/pom.xml index c6474730f42..c8ead0089d1 100644 --- a/container-test/pom.xml +++ b/container-test/pom.xml @@ -98,6 +98,14 @@ <scope>compile</scope> </dependency> <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcpkix-jdk15on</artifactId> + </dependency> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-jdk15on</artifactId> + </dependency> + <dependency> <!-- required for container-search code using org.json --> <groupId>org.json</groupId> <artifactId>json</artifactId> diff --git a/controller-api/pom.xml b/controller-api/pom.xml index 42e96e0331a..580809c4181 100644 --- a/controller-api/pom.xml +++ b/controller-api/pom.xml @@ -67,6 +67,13 @@ <scope>provided</scope> </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>security-utils</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + <!-- compile --> <dependency> diff --git a/parent/pom.xml b/parent/pom.xml index 05b3df87e51..976a74ec152 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -774,6 +774,16 @@ <version>3.11.1</version> </dependency> <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcpkix-jdk15on</artifactId> + <version>${bouncycastle.version}</version> + </dependency> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-jdk15on</artifactId> + <version>${bouncycastle.version}</version> + </dependency> + <dependency> <groupId>org.codehaus.jettison</groupId> <artifactId>jettison</artifactId> <version>1.3.1</version> @@ -984,6 +994,7 @@ find zkfacade/src/main/java/org/apache/curator -name package-info.java | \ xargs perl -pi -e 's/major = [0-9]+, minor = [0-9]+, micro = [0-9]+/major = 5, minor = 3, micro = 0/g' --> + <bouncycastle.version>1.68</bouncycastle.version> <curator.version>5.2.1</curator.version> <commons.codec.version>1.15</commons.codec.version> <commons.math3.version>3.6.1</commons.math3.version> diff --git a/provided-dependencies/pom.xml b/provided-dependencies/pom.xml index a1a1c1b85b1..562db6d4f1f 100755 --- a/provided-dependencies/pom.xml +++ b/provided-dependencies/pom.xml @@ -33,14 +33,6 @@ </exclusions> </dependency> <dependency> - <groupId>org.bouncycastle</groupId> - <artifactId>bcprov-jdk15on</artifactId> - </dependency> - <dependency> - <groupId>org.bouncycastle</groupId> - <artifactId>bcpkix-jdk15on</artifactId> - </dependency> - <dependency> <groupId>com.yahoo.vespa</groupId> <artifactId>config-lib</artifactId> <version>${project.version}</version> diff --git a/zookeeper-server/pom.xml b/zookeeper-server/pom.xml index 34f4c0e9191..06bb3a131af 100644 --- a/zookeeper-server/pom.xml +++ b/zookeeper-server/pom.xml @@ -23,6 +23,12 @@ <version>${project.version}</version> <scope>provided</scope> </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>security-utils</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> </dependencies> <build> <plugins> |