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

3 files changed, 26 insertions, 58 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>
diff --git a/dependency-versions/pom.xml b/dependency-versions/pom.xml
index fd168a88bda..0db8e36df10 100644
--- a/dependency-versions/pom.xml
+++ b/dependency-versions/pom.xml
@@ -80,6 +80,7 @@
         <jjwt.vespa.version>0.11.5</jjwt.vespa.version>
         <jna.vespa.version>5.11.0</jna.vespa.version>
         <junit.vespa.version>5.8.1</junit.vespa.version>
+        <junit.platform.vespa.version>1.8.1</junit.platform.vespa.version>
         <maven-archiver.vespa.version>3.6.0</maven-archiver.vespa.version>
         <maven-wagon.vespa.version>2.10</maven-wagon.vespa.version>
         <mockito.vespa.version>4.0.0</mockito.vespa.version>
diff --git a/hosted-tenant-base/pom.xml b/hosted-tenant-base/pom.xml
index 8f6063bf44e..7bf3a9a5152 100644
--- a/hosted-tenant-base/pom.xml
+++ b/hosted-tenant-base/pom.xml
@@ -13,6 +13,13 @@
     <url>https://github.com/vespa-engine</url>
     <packaging>pom</packaging>
 
+    <parent>
+        <artifactId>dependency-versions</artifactId>
+        <groupId>com.yahoo.vespa</groupId>
+        <version>8-SNAPSHOT</version>
+        <relativePath>../dependency-versions/pom.xml</relativePath>
+    </parent>
+
     <licenses>
         <license>
             <name>The Apache License, Version 2.0</name>
@@ -35,12 +42,9 @@
         <vespaversion>${project.version}</vespaversion>
         <bundle-plugin.failOnWarnings>false</bundle-plugin.failOnWarnings>
         <target_jdk_version>17</target_jdk_version>
-        <maven-compiler-plugin.vespa.version>3.10.1</maven-compiler-plugin.vespa.version>
-        <maven-surefire-plugin.vespa.version>2.22.2</maven-surefire-plugin.vespa.version>
-        <maven-dependency-plugin.vespa.version>3.6.0</maven-dependency-plugin.vespa.version>
-        <jackson2.vespa.version>2.15.2</jackson2.vespa.version>
+
         <!-- NOTE: this must not be overriden by users, and must be in sync with junit version specified in 'tenant-cd-api' -->
-        <vespa.junit.vespa.version>5.8.1</vespa.junit.vespa.version>
+        <junit.vespa.tenant.version>5.8.1</junit.vespa.tenant.version>
         <test.categories>!integration</test.categories>
 
         <!-- To allow specialized base pom to include additional "test provided" dependencies -->
@@ -98,19 +102,19 @@
             <dependency>
                 <groupId>org.junit.jupiter</groupId>
                 <artifactId>junit-jupiter-engine</artifactId>
-                <version>${vespa.junit.vespa.version}</version>
+                <version>${junit.vespa.tenant.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>org.junit.jupiter</groupId>
                 <artifactId>junit-jupiter-api</artifactId>
-                <version>${vespa.junit.vespa.version}</version>
+                <version>${junit.vespa.tenant.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>org.junit.vintage</groupId>
                 <artifactId>junit-vintage-engine</artifactId>
-                <version>${vespa.junit.vespa.version}</version>
+                <version>${junit.vespa.tenant.version}</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
@@ -245,8 +249,8 @@
                                                 <exclude>org.junit.jupiter:junit-jupiter-api:*:jar:compile</exclude>
                                                 <exclude>org.junit.jupiter:junit-jupiter-api:*:jar:provided</exclude>
                                                 <exclude>org.junit.jupiter:junit-jupiter-api:*:jar:runtime</exclude>
-                                                <exclude>org.junit.jupiter:junit-jupiter-api:(,${vespa.junit.vespa.version}):jar:*</exclude>
-                                                <exclude>org.junit.jupiter:junit-jupiter-api:(${vespa.junit.vespa.version},):jar:*</exclude>
+                                                <exclude>org.junit.jupiter:junit-jupiter-api:(,${junit.vespa.tenant.version}):jar:*</exclude>
+                                                <exclude>org.junit.jupiter:junit-jupiter-api:(${junit.vespa.tenant.version},):jar:*</exclude>
                                             </excludes>
                                         </bannedDependencies>
                                     </rules>