diff options
Diffstat (limited to 'container-disc/pom.xml')
| -rw-r--r-- | container-disc/pom.xml | 42 |
1 files changed, 18 insertions, 24 deletions
diff --git a/container-disc/pom.xml b/container-disc/pom.xml index 3e42b924ec6..273270b208b 100644 --- a/container-disc/pom.xml +++ b/container-disc/pom.xml @@ -16,25 +16,29 @@ <packaging>container-plugin</packaging> <dependencies> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.junit.jupiter</groupId> <artifactId>junit-jupiter</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>org.junit.vintage</groupId> - <artifactId>junit-vintage-engine</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>com.yahoo.vespa</groupId> <artifactId>testutil</artifactId> <version>${project.version}</version> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </exclusion> + <exclusion> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-core</artifactId> + </exclusion> + <exclusion> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-library</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.mockito</groupId> @@ -185,26 +189,16 @@ <discApplicationClass>com.yahoo.container.jdisc.ConfiguredApplication</discApplicationClass> <buildLegacyVespaPlatformBundle>true</buildLegacyVespaPlatformBundle> <discPreInstallBundle> - <!-- Vespa bundles --> + <!-- BEGIN Bundles needed to retrieve config, or used by container-disc --> config-bundle-jar-with-dependencies.jar, configdefinitions-jar-with-dependencies.jar, hosted-zone-api-jar-with-dependencies.jar, - jdisc-security-filters-jar-with-dependencies.jar, - vespa-athenz-jar-with-dependencies.jar, - - <!-- Apache http client repackaged as bundle --> container-apache-http-client-bundle-jar-with-dependencies.jar, - - <!-- Vespa security utils with necessary 3rd party bundles --> security-utils.jar, - bcpkix-jdk15on-${bouncycastle.version}.jar, - bcprov-jdk15on-${bouncycastle.version}.jar, - - <!-- TODO Vespa 9 Stop providing servlet-api 3.x --> - javax.servlet-api-3.1.0.jar, + bcprov-jdk15on-${bouncycastle.version}.jar, <!-- Used by security-utils --> + <!-- END Bundles needed to retrieve config, or used by container-disc --> - <!-- Aries SPIFly repackaged --> - container-spifly.jar, + bcpkix-jdk15on-${bouncycastle.version}.jar, <!-- Used by security-utils --> jackson-annotations-${jackson2.version}.jar, jackson-core-${jackson2.version}.jar, |