diff options
| author | gjoranv <gjoranv@gmail.com> | 2023-07-21 10:17:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-21 10:17:03 +0200 |
| commit | 535a452f4a968a73a1f3c1e6a18a1edb2d4ff2c2 (patch) | |
| tree | f837f6949b129e39c2eea7a602024b77eb18d29c /container-disc | |
| parent | ef7a3efa5f9f2647e4e3ef61c21295e9f60fe793 (diff) | |
| parent | 9c4c77c3f9388d588aa3984f82203e4c688239f1 (diff) | |
Merge pull request #27827 from vespa-engine/new-parent-pom
New parent pom
Diffstat (limited to 'container-disc')
| -rw-r--r-- | container-disc/pom.xml | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/container-disc/pom.xml b/container-disc/pom.xml index 16ce99220f1..4ec141d2758 100644 --- a/container-disc/pom.xml +++ b/container-disc/pom.xml @@ -196,19 +196,19 @@ hosted-zone-api-jar-with-dependencies.jar, container-apache-http-client-bundle-jar-with-dependencies.jar, security-utils.jar, - bcprov-jdk18on-${bouncycastle.version}.jar, <!-- Used by security-utils --> - bcpkix-jdk18on-${bouncycastle.version}.jar, <!-- Used by security-utils --> - bcutil-jdk18on-${bouncycastle.version}.jar, <!-- Used by security-utils --> + bcprov-jdk18on-${bouncycastle.vespa.version}.jar, <!-- Used by security-utils --> + bcpkix-jdk18on-${bouncycastle.vespa.version}.jar, <!-- Used by security-utils --> + bcutil-jdk18on-${bouncycastle.vespa.version}.jar, <!-- Used by security-utils --> <!-- END Bundles needed to retrieve config, or used by container-disc --> - jackson-annotations-${jackson2.version}.jar, - jackson-core-${jackson2.version}.jar, - jackson-databind-${jackson-databind.version}.jar, - jackson-datatype-jdk8-${jackson2.version}.jar, - jackson-datatype-jsr310-${jackson2.version}.jar, + jackson-annotations-${jackson2.vespa.version}.jar, + jackson-core-${jackson2.vespa.version}.jar, + jackson-databind-${jackson-databind.vespa.version}.jar, + jackson-datatype-jdk8-${jackson2.vespa.version}.jar, + jackson-datatype-jsr310-${jackson2.vespa.version}.jar, <!-- Only one instance of javax.ws.rs.client.ClientBuilder can be loaded by the JVM --> - javax.ws.rs-api-${javax.ws.rs-api.version}.jar + javax.ws.rs-api-${javax.ws.rs-api.vespa.version}.jar </discPreInstallBundle> <!-- Enable Spifly ServiceLoader weaving. Required for Jetty ALPN/HTTP2 --> |