diff options
| author | gjoranv <gv@yahooinc.com> | 2023-07-19 15:57:11 +0200 |
|---|---|---|
| committer | gjoranv <gv@yahooinc.com> | 2023-07-19 15:57:11 +0200 |
| commit | 80aaa891a300d88c9d27c53eea391bed5ca1faf8 (patch) | |
| tree | 1211d8f79c021496079669eb7b1ac6e790ba562d /cloud-tenant-base-dependencies-enforcer | |
| parent | 08a4ea6f90c5ba95a0a232c991ddfddeb37c537c (diff) | |
Use dependency version properties from 'dependency-versions'
- Remove repeated blocks of dependency properties
- NOTE: use 'junit.vespa.tenant.version' for custom junit version
in hosted-tenant-base and tenant-cd-api
Diffstat (limited to 'cloud-tenant-base-dependencies-enforcer')
| -rw-r--r-- | cloud-tenant-base-dependencies-enforcer/pom.xml | 59 |
1 files changed, 11 insertions, 48 deletions
diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml index 5a0ceb98322..b098339a0c8 100644 --- a/cloud-tenant-base-dependencies-enforcer/pom.xml +++ b/cloud-tenant-base-dependencies-enforcer/pom.xml @@ -16,43 +16,6 @@ <version>8-SNAPSHOT</version> <packaging>pom</packaging> - <properties> - <junit5.platform.vespa.version>1.8.1</junit5.platform.vespa.version> - - <!-- MUST BE KEPT IN SYNC WITH parent/pom.xml --> - <athenz.vespa.version>1.11.34</athenz.vespa.version> - - <bouncycastle.vespa.version>1.74</bouncycastle.vespa.version> - <commons-codec.vespa.version>1.15</commons-codec.vespa.version> - <felix.vespa.version>7.0.5</felix.vespa.version> - <httpclient5.vespa.version>5.2.1</httpclient5.vespa.version> - <httpcore5.vespa.version>5.2.2</httpcore5.vespa.version> - <httpclient.vespa.version>4.5.14</httpclient.vespa.version> - <httpcore.vespa.version>4.4.16</httpcore.vespa.version> - <junit5.vespa.version>5.8.1</junit5.vespa.version> <!-- TODO: in parent this is named 'junit.version' --> - <onnxruntime.vespa.version>1.13.1</onnxruntime.vespa.version> - <openai-gpt3.vespa.version>0.12.0</openai-gpt3.vespa.version> - <!-- END parent/pom.xml --> - - - <!-- ALL BELOW MUST BE KEPT IN SYNC WITH container-dependency-versions pom - Copied here because cloud-tenant-base does not have a parent. --> - <aopalliance.vespa.version>1.0</aopalliance.vespa.version> - <guava.vespa.version>32.1.1-jre</guava.vespa.version> - <guice.vespa.version>4.2.3</guice.vespa.version> - <jackson2.vespa.version>2.15.2</jackson2.vespa.version> - <jackson-databind.vespa.version>2.15.2</jackson-databind.vespa.version> - <javax.inject.vespa.version>1</javax.inject.vespa.version> - <javax.servlet-api.vespa.version>3.1.0</javax.servlet-api.vespa.version> - <javax.ws.rs-api.vespa.version>2.0.1</javax.ws.rs-api.vespa.version> - <jaxb.vespa.version>2.3.0</jaxb.vespa.version> - <jetty.vespa.version>11.0.15</jetty.vespa.version> - <org.lz4.vespa.version>1.8.0</org.lz4.vespa.version> - <org.json.vespa.version>20230227</org.json.vespa.version> <!-- TODO: Remove on Vespa 9 --> - <slf4j.vespa.version>1.7.32</slf4j.vespa.version> <!-- WARNING: when updated, also update c.y.v.tenant:base pom --> - <xml-apis.vespa.version>1.4.01</xml-apis.vespa.version> - </properties> - <build> <plugins> <plugin> @@ -193,12 +156,12 @@ <include>org.apache.commons:commons-math3:3.6.1:test</include> <include>org.apache.felix:org.apache.felix.framework:${felix.vespa.version}:test</include> <include>org.apache.felix:org.apache.felix.log:1.0.1:test</include> - <include>org.apache.httpcomponents.client5:httpclient5:${httpclient5.vespa.version}:test</include> - <include>org.apache.httpcomponents.core5:httpcore5:${httpcore5.vespa.version}:test</include> - <include>org.apache.httpcomponents.core5:httpcore5-h2:${httpcore5.vespa.version}:test</include> - <include>org.apache.httpcomponents:httpclient:${httpclient.vespa.version}:test</include> - <include>org.apache.httpcomponents:httpcore:${httpcore.vespa.version}:test</include> - <include>org.apache.httpcomponents:httpmime:${httpclient.vespa.version}:test</include> + <include>org.apache.httpcomponents.client5:httpclient5:${apache.httpclient5.vespa.version}:test</include> + <include>org.apache.httpcomponents.core5:httpcore5:${apache.httpcore5.vespa.version}:test</include> + <include>org.apache.httpcomponents.core5:httpcore5-h2:${apache.httpcore5.vespa.version}:test</include> + <include>org.apache.httpcomponents:httpclient:${apache.httpclient.vespa.version}:test</include> + <include>org.apache.httpcomponents:httpcore:${apache.httpcore.vespa.version}:test</include> + <include>org.apache.httpcomponents:httpmime:${apache.httpclient.vespa.version}:test</include> <include>org.apache.opennlp:opennlp-tools:1.9.3:test</include> <include>org.apiguardian:apiguardian-api:1.1.2:test</include> <include>org.bouncycastle:bcpkix-jdk18on:${bouncycastle.vespa.version}:test</include> @@ -226,11 +189,11 @@ <include>org.hamcrest:hamcrest-core:1.3:test</include> <include>org.hdrhistogram:HdrHistogram:2.1.12:test</include> <include>org.json:json:${org.json.vespa.version}:test</include> - <include>org.junit.jupiter:junit-jupiter-api:${junit5.vespa.version}:test</include> - <include>org.junit.jupiter:junit-jupiter-engine:${junit5.vespa.version}:test</include> - <include>org.junit.platform:junit-platform-commons:${junit5.platform.vespa.version}:test</include> - <include>org.junit.platform:junit-platform-engine:${junit5.platform.vespa.version}:test</include> - <include>org.junit.vintage:junit-vintage-engine:${junit5.vespa.version}:test</include> + <include>org.junit.jupiter:junit-jupiter-api:${junit.vespa.version}:test</include> + <include>org.junit.jupiter:junit-jupiter-engine:${junit.vespa.version}:test</include> + <include>org.junit.platform:junit-platform-commons:${junit.platform.vespa.version}:test</include> + <include>org.junit.platform:junit-platform-engine:${junit.platform.vespa.version}:test</include> + <include>org.junit.vintage:junit-vintage-engine:${junit.vespa.version}:test</include> <include>org.lz4:lz4-java:${org.lz4.vespa.version}:test</include> <include>org.opentest4j:opentest4j:1.2.0:test</include> <include>org.osgi:org.osgi.compendium:4.1.0:test</include> |