diff options
author | gjoranv <gv@oath.com> | 2018-03-07 16:23:22 +0100 |
---|---|---|
committer | gjoranv <gv@oath.com> | 2018-03-07 17:10:17 +0100 |
commit | b51ad76a2c2cd8a36b356f196e470e1cfc5a60e6 (patch) | |
tree | ab497953d720f84230da241625f04a808cd3687c | |
parent | c323e678fbd4426c234a612f11ddcc7fab1f4878 (diff) |
Jdisc provides bouncycastle now, so don't hide it.
-rw-r--r-- | application/pom.xml | 10 | ||||
-rw-r--r-- | container-dependencies-enforcer/pom.xml | 2 | ||||
-rw-r--r-- | container-dependency-versions/pom.xml | 11 | ||||
-rw-r--r-- | container-dev/pom.xml | 18 | ||||
-rw-r--r-- | container-disc/pom.xml | 5 | ||||
-rw-r--r-- | container-test/pom.xml | 9 | ||||
-rw-r--r-- | parent/pom.xml | 11 | ||||
-rwxr-xr-x | provided-dependencies/pom.xml | 10 |
8 files changed, 21 insertions, 55 deletions
diff --git a/application/pom.xml b/application/pom.xml index 8103226e55d..ac9ba96cb27 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -134,16 +134,6 @@ <artifactId>commons-digester</artifactId> <version>1.8</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> </dependencies> <build> diff --git a/container-dependencies-enforcer/pom.xml b/container-dependencies-enforcer/pom.xml index 3384da7c1eb..fa55908befe 100644 --- a/container-dependencies-enforcer/pom.xml +++ b/container-dependencies-enforcer/pom.xml @@ -103,6 +103,8 @@ <include>org.apache.felix:org.apache.felix.main:[${felix.version}]:jar:provided</include> <include>org.apache.httpcomponents:httpclient:[4.3.6]:jar:provided</include> <include>org.apache.httpcomponents:httpcore:[4.3.3]: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.eclipse.jetty:jetty-http:[${jetty.version}]:jar:provided</include> <include>org.eclipse.jetty:jetty-io:[${jetty.version}]:jar:provided</include> <include>org.eclipse.jetty:jetty-util:[${jetty.version}]:jar:provided</include> diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml index eca7002b977..68736c39623 100644 --- a/container-dependency-versions/pom.xml +++ b/container-dependency-versions/pom.xml @@ -221,6 +221,16 @@ <version>4.3.3</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.eclipse.jetty</groupId> <artifactId>jetty-http</artifactId> <version>${jetty.version}</version> @@ -424,6 +434,7 @@ </dependencyManagement> <properties> + <bouncycastle.version>1.58</bouncycastle.version> <felix.version>4.2.1</felix.version> <findbugs.version>1.3.9</findbugs.version> <guava.version>18.0</guava.version> diff --git a/container-dev/pom.xml b/container-dev/pom.xml index 16006452e61..53153a05c4a 100644 --- a/container-dev/pom.xml +++ b/container-dev/pom.xml @@ -38,16 +38,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>jdisc_http_service</artifactId> <version>${project.version}</version> - <exclusions> - <exclusion> - <groupId>org.bouncycastle</groupId> - <artifactId>bcpkix-jdk15on</artifactId> - </exclusion> - <exclusion> - <groupId>org.bouncycastle</groupId> - <artifactId>bcprov-jdk15on</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> @@ -114,14 +104,6 @@ <artifactId>httpclient</artifactId> </exclusion> <exclusion> - <groupId>org.bouncycastle</groupId> - <artifactId>bcpkix-jdk15on</artifactId> - </exclusion> - <exclusion> - <groupId>org.bouncycastle</groupId> - <artifactId>bcprov-jdk15on</artifactId> - </exclusion> - <exclusion> <groupId>org.tensorflow</groupId> <artifactId>proto</artifactId> </exclusion> diff --git a/container-disc/pom.xml b/container-disc/pom.xml index 811af33ff8c..9128d1033be 100644 --- a/container-disc/pom.xml +++ b/container-disc/pom.xml @@ -143,11 +143,6 @@ <artifactId>httpclient</artifactId> <scope>compile</scope> </dependency> - <dependency> - <groupId>org.bouncycastle</groupId> - <artifactId>bcpkix-jdk15on</artifactId> - <scope>compile</scope> - </dependency> </dependencies> <properties> <!-- These versions must be the ones used by the current jersey version (see vespa_jersey2/target/dependency). diff --git a/container-test/pom.xml b/container-test/pom.xml index 26f02767062..845660f638b 100644 --- a/container-test/pom.xml +++ b/container-test/pom.xml @@ -101,14 +101,5 @@ <artifactId>commons-digester</artifactId> <version>1.8</version> </dependency> - <!-- Required for both jdisc_http_service and container-disc --> - <dependency> - <groupId>org.bouncycastle</groupId> - <artifactId>bcpkix-jdk15on</artifactId> - </dependency> - <dependency> - <groupId>org.bouncycastle</groupId> - <artifactId>bcprov-jdk15on</artifactId> - </dependency> </dependencies> </project> diff --git a/parent/pom.xml b/parent/pom.xml index cbcc218b27d..465771de9cf 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -668,16 +668,6 @@ <version>2.11.0</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>com.ibm.icu</groupId> <artifactId>icu4j</artifactId> <version>57.1</version> @@ -708,7 +698,6 @@ <asm-debug-all.version>5.0.3</asm-debug-all.version> <!-- Athenz dependencies. Make sure these dependencies matches those in Vespa's internal repositories --> <athenz.version>1.7.43</athenz.version> - <bouncycastle.version>1.58</bouncycastle.version> <commons-lang.version>2.6</commons-lang.version> <!-- WARNING: If you change curator version, you also need to update zkfacade/src/main/java/org/apache/curator/**/package-info.java diff --git a/provided-dependencies/pom.xml b/provided-dependencies/pom.xml index 33f1977c7e2..9c2cc236c2a 100755 --- a/provided-dependencies/pom.xml +++ b/provided-dependencies/pom.xml @@ -34,14 +34,20 @@ <version>${project.version}</version> </dependency> <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-jdk15on</artifactId> + </dependency> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcpkix-jdk15on</artifactId> + </dependency> + <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util</artifactId> - <version>${jetty.version}</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-http</artifactId> - <version>${jetty.version}</version> </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> |