Revert "New parent pom"

1 files changed, 18 insertions, 22 deletions

diff --git a/hosted-tenant-base/pom.xml b/hosted-tenant-base/pom.xml
index 7bf3a9a5152..f2d4c6ab012 100644
--- a/hosted-tenant-base/pom.xml
+++ b/hosted-tenant-base/pom.xml
@@ -13,13 +13,6 @@
     <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>
@@ -42,9 +35,12 @@
         <vespaversion>${project.version}</vespaversion>
         <bundle-plugin.failOnWarnings>false</bundle-plugin.failOnWarnings>
         <target_jdk_version>17</target_jdk_version>
-
+        <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
+        <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
+        <maven-dependency-plugin.version>3.6.0</maven-dependency-plugin.version>
+        <jackson2.version>2.15.2</jackson2.version>
         <!-- NOTE: this must not be overriden by users, and must be in sync with junit version specified in 'tenant-cd-api' -->
-        <junit.vespa.tenant.version>5.8.1</junit.vespa.tenant.version>
+        <vespa.junit.version>5.8.1</vespa.junit.version>
         <test.categories>!integration</test.categories>
 
         <!-- To allow specialized base pom to include additional "test provided" dependencies -->
@@ -102,19 +98,19 @@
             <dependency>
                 <groupId>org.junit.jupiter</groupId>
                 <artifactId>junit-jupiter-engine</artifactId>
-                <version>${junit.vespa.tenant.version}</version>
+                <version>${vespa.junit.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>org.junit.jupiter</groupId>
                 <artifactId>junit-jupiter-api</artifactId>
-                <version>${junit.vespa.tenant.version}</version>
+                <version>${vespa.junit.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>org.junit.vintage</groupId>
                 <artifactId>junit-vintage-engine</artifactId>
-                <version>${junit.vespa.tenant.version}</version>
+                <version>${vespa.junit.version}</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
@@ -167,7 +163,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>
-                        <version>${maven-surefire-plugin.vespa.version}</version>
+                        <version>${maven-surefire-plugin.version}</version>
                         <configuration>
                             <groups>${test.categories}</groups>
                             <redirectTestOutputToFile>false</redirectTestOutputToFile>
@@ -190,7 +186,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-report-plugin</artifactId>
-                        <version>${maven-surefire-plugin.vespa.version}</version>
+                        <version>${maven-surefire-plugin.version}</version>
                         <configuration>
                             <reportsDirectory>${env.TEST_DIR}</reportsDirectory>
                         </configuration>
@@ -249,8 +245,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:(,${junit.vespa.tenant.version}):jar:*</exclude>
-                                                <exclude>org.junit.jupiter:junit-jupiter-api:(${junit.vespa.tenant.version},):jar:*</exclude>
+                                                <exclude>org.junit.jupiter:junit-jupiter-api:(,${vespa.junit.version}):jar:*</exclude>
+                                                <exclude>org.junit.jupiter:junit-jupiter-api:(${vespa.junit.version},):jar:*</exclude>
                                             </excludes>
                                         </bannedDependencies>
                                     </rules>
@@ -381,7 +377,7 @@
                 </property>
             </activation>
             <properties>
-                <vespaversion>${vespa.compile.vespa.version}</vespaversion>
+                <vespaversion>${vespa.compile.version}</vespaversion>
             </properties>
         </profile>
 
@@ -393,7 +389,7 @@
                 </property>
             </activation>
             <properties>
-                <vespaVersion>${vespa.runtime.vespa.version}</vespaVersion>
+                <vespaVersion>${vespa.runtime.version}</vespaVersion>
             </properties>
         </profile>
         <profile>
@@ -408,7 +404,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
-                        <version>${maven.gpg.plugin.vespa.version}</version>
+                        <version>${maven.gpg.plugin.version}</version>
                         <executions>
                             <execution>
                                 <id>sign-artifacts</id>
@@ -428,7 +424,7 @@
                     <plugin>
                         <groupId>org.sonatype.plugins</groupId>
                         <artifactId>nexus-staging-maven-plugin</artifactId>
-                        <version>${nexus.staging.maven.plugin.vespa.version}</version>
+                        <version>${nexus.staging.maven.plugin.version}</version>
                         <extensions>true</extensions>
                         <configuration>
                             <serverId>ossrh</serverId>
@@ -456,7 +452,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-dependency-plugin</artifactId>
-                    <version>${maven-dependency-plugin.vespa.version}</version>
+                    <version>${maven-dependency-plugin.version}</version>
                 </plugin>
             </plugins>
         </pluginManagement>
@@ -464,7 +460,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>${maven-compiler-plugin.vespa.version}</version>
+                <version>${maven-compiler-plugin.version}</version>
                 <configuration>
                     <release>${target_jdk_version}</release>
                     <showWarnings>true</showWarnings>