diff options
| author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2022-06-22 11:21:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-22 11:21:12 +0200 |
| commit | a42bd3417161b499d64fec03c24aff2c355b646b (patch) | |
| tree | 9f61318b4744ae83a33976645397a30007f92817 | |
| parent | 3b7f3a0d41e9c9b0337caa69cd0cda995fb1a244 (diff) | |
| parent | 30889648c5275d81070be697ca00947132e5851f (diff) | |
Merge pull request #23133 from vespa-engine/move-bouncycastle-exclusion
Move bouncycastle exclusion
| -rw-r--r-- | container-dev/pom.xml | 13 | ||||
| -rw-r--r-- | container-test/pom.xml | 8 | ||||
| -rw-r--r-- | container/pom.xml | 4 | ||||
| -rw-r--r-- | jdisc-security-filters/pom.xml | 6 |
4 files changed, 4 insertions, 27 deletions
diff --git a/container-dev/pom.xml b/container-dev/pom.xml index 715340c4913..0ba3a9ed468 100644 --- a/container-dev/pom.xml +++ b/container-dev/pom.xml @@ -17,13 +17,6 @@ <packaging>jar</packaging> <dependencies> <dependency> - <!-- This dep is a workaround for bugs 7272469, 7259035 --> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-annotations</artifactId> - <version>${jackson2.version}</version> - </dependency> - - <dependency> <groupId>com.yahoo.vespa</groupId> <artifactId>jdisc_core</artifactId> <version>${project.version}</version> @@ -248,12 +241,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>jrt</artifactId> <version>${project.version}</version> - <exclusions> - <exclusion> - <groupId>org.bouncycastle</groupId> - <artifactId>bcpkix-jdk15on</artifactId> - </exclusion> - </exclusions> </dependency> <!-- NOTE: Dependencies below are added explicitly to exclude transitive deps that are not provided runtime by the container, diff --git a/container-test/pom.xml b/container-test/pom.xml index ab5a2dc3612..7d49a276663 100644 --- a/container-test/pom.xml +++ b/container-test/pom.xml @@ -103,14 +103,6 @@ <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/container/pom.xml b/container/pom.xml index b2a3a1baef8..4cda7b346b3 100644 --- a/container/pom.xml +++ b/container/pom.xml @@ -23,6 +23,10 @@ <version>${project.version}</version> <exclusions> <exclusion> + <groupId>org.bouncycastle</groupId> + <artifactId>bcpkix-jdk15on</artifactId> + </exclusion> + <exclusion> <groupId>org.ow2.asm</groupId> <artifactId>asm</artifactId> </exclusion> diff --git a/jdisc-security-filters/pom.xml b/jdisc-security-filters/pom.xml index dcfb61de3cc..475a8b7e3e9 100644 --- a/jdisc-security-filters/pom.xml +++ b/jdisc-security-filters/pom.xml @@ -29,12 +29,6 @@ <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> <!-- test --> <dependency> |