Revert "New parent pom"

1 files changed, 43 insertions, 31 deletions

diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml
index ffb692f9eb3..0e210a54d87 100644
--- a/container-dependency-versions/pom.xml
+++ b/container-dependency-versions/pom.xml
@@ -2,6 +2,7 @@
 <!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
+    <groupId>com.yahoo.vespa</groupId>
     <artifactId>container-dependency-versions</artifactId>
     <packaging>pom</packaging>
     <version>8-SNAPSHOT</version>
@@ -9,13 +10,6 @@
     <description>Versions for all 3rd party dependencies provided from the Vespa container.</description>
     <url>https://github.com/vespa-engine</url>
 
-    <parent>
-        <groupId>com.yahoo.vespa</groupId>
-        <artifactId>dependency-versions</artifactId>
-        <version>8-SNAPSHOT</version>
-        <relativePath>../dependency-versions/pom.xml</relativePath>
-    </parent>
-
     <licenses>
         <license>
             <name>The Apache License, Version 2.0</name>
@@ -39,53 +33,53 @@
             <dependency>
                 <groupId>aopalliance</groupId>
                 <artifactId>aopalliance</artifactId>
-                <version>${aopalliance.vespa.version}</version>
+                <version>${aopalliance.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson.core</groupId>
                 <artifactId>jackson-annotations</artifactId>
-                <version>${jackson2.vespa.version}</version>
+                <version>${jackson2.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson.core</groupId>
                 <artifactId>jackson-core</artifactId>
-                <version>${jackson2.vespa.version}</version>
+                <version>${jackson2.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson.core</groupId>
                 <artifactId>jackson-databind</artifactId>
-                <version>${jackson-databind.vespa.version}</version>
+                <version>${jackson-databind.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson.datatype</groupId>
                 <artifactId>jackson-datatype-jdk8</artifactId>
-                <version>${jackson2.vespa.version}</version>
+                <version>${jackson2.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson.datatype</groupId>
                 <artifactId>jackson-datatype-jsr310</artifactId>
-                <version>${jackson2.vespa.version}</version>
+                <version>${jackson2.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.google.guava</groupId>
                 <artifactId>guava</artifactId>
-                <version>${guava.vespa.version}</version>
+                <version>${guava.version}</version>
             </dependency>
             <dependency>
                 <!-- Only listed because it's a dependency of Guava -->
                 <groupId>com.google.errorprone</groupId>
                 <artifactId>error_prone_annotations</artifactId>
-                <version>${error-prone-annotations.vespa.version}</version>
+                <version>${error-prone-annotations.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.google.inject</groupId>
                 <artifactId>guice</artifactId>
-                <version>${guice.vespa.version}</version>
+                <version>${guice.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.google.inject</groupId>
                 <artifactId>guice</artifactId>
-                <version>${guice.vespa.version}</version>
+                <version>${guice.version}</version>
                 <classifier>no_aop</classifier>
             </dependency>
             <dependency>
@@ -97,18 +91,18 @@
             <dependency>
                 <groupId>javax.inject</groupId>
                 <artifactId>javax.inject</artifactId>
-                <version>${javax.inject.vespa.version}</version>
+                <version>${javax.inject.version}</version>
             </dependency>
             <dependency>
                 <!-- TODO Vespa 9 Stop providing servlet-api 3.x -->
                 <groupId>javax.servlet</groupId>
               <artifactId>javax.servlet-api</artifactId>
-              <version>${javax.servlet-api.vespa.version}</version>
+              <version>${javax.servlet-api.version}</version>
             </dependency>
             <dependency>
                 <groupId>javax.ws.rs</groupId>
                 <artifactId>javax.ws.rs-api</artifactId>
-                <version>${javax.ws.rs-api.vespa.version}</version>
+                <version>${javax.ws.rs-api.version}</version>
             </dependency>
 
             <!-- jaxb start -->
@@ -117,19 +111,19 @@
                 <!-- TODO Vespa 9: stop exporting/providing and move to parent? -->
                 <groupId>javax.xml.bind</groupId>
                 <artifactId>jaxb-api</artifactId>
-                <version>${jaxb.vespa.version}</version>
+                <version>${jaxb.version}</version>
             </dependency>
             <dependency>
                 <!-- TODO Vespa 9: stop exporting/providing and move to parent? -->
                 <groupId>com.sun.xml.bind</groupId>
                 <artifactId>jaxb-core</artifactId>
-                <version>${jaxb.vespa.version}</version>
+                <version>${jaxb.version}</version>
             </dependency>
             <dependency>
                 <!-- TODO Vespa 9: stop exporting/providing and move to parent? -->
                 <groupId>com.sun.xml.bind</groupId>
                 <artifactId>jaxb-impl</artifactId>
-                <version>${jaxb.vespa.version}</version>
+                <version>${jaxb.version}</version>
             </dependency>
             <dependency>
                 <!-- Needed by jaxb-api, and possibly guice -->
@@ -143,27 +137,27 @@
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>jcl-over-slf4j</artifactId>
-                <version>${slf4j.vespa.version}</version>
+                <version>${slf4j.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>log4j-over-slf4j</artifactId>
-                <version>${slf4j.vespa.version}</version>
+                <version>${slf4j.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-api</artifactId>
-                <version>${slf4j.vespa.version}</version>
+                <version>${slf4j.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-jdk14</artifactId>
-                <version>${slf4j.vespa.version}</version>
+                <version>${slf4j.version}</version>
             </dependency>
             <dependency>
                 <groupId>xml-apis</groupId>
                 <artifactId>xml-apis</artifactId>
-                <version>${xml-apis.vespa.version}</version>
+                <version>${xml-apis.version}</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
@@ -176,7 +170,7 @@
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>versions-maven-plugin</artifactId>
-                        <version>${versions-maven-plugin.vespa.version}</version>
+                        <version>${versions-maven-plugin.version}</version>
                         <executions>
                             <execution>
                                 <phase>verify</phase>
@@ -202,7 +196,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>
@@ -222,7 +216,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>
@@ -244,4 +238,22 @@
         </profile>
     </profiles>
 
+    <properties>
+        <aopalliance.version>1.0</aopalliance.version>
+        <error-prone-annotations.version>2.18.0</error-prone-annotations.version>
+        <guava.version>32.1.1-jre</guava.version>
+        <guice.version>4.2.3</guice.version>
+        <jackson2.version>2.15.2</jackson2.version>
+        <jackson-databind.version>2.15.2</jackson-databind.version>
+        <javax.inject.version>1</javax.inject.version>
+        <javax.servlet-api.version>3.1.0</javax.servlet-api.version>
+        <javax.ws.rs-api.version>2.0.1</javax.ws.rs-api.version>
+        <jaxb.version>2.3.0</jaxb.version>
+        <slf4j.version>1.7.32</slf4j.version> <!-- WARNING: when updated, also update c.y.v.tenant:base pom -->
+        <xml-apis.version>1.4.01</xml-apis.version>
+
+        <!-- Not a dependency. Only included to allow the versions-maven-plugin to check for updates of itself  -->
+        <versions-maven-plugin.version>2.8.1</versions-maven-plugin.version>
+    </properties>
+
 </project>