Use 'vespa.version' suffix for all global version properties.

1 files changed, 24 insertions, 24 deletions

diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml
index be60cbedbf4..ffb692f9eb3 100644
--- a/container-dependency-versions/pom.xml
+++ b/container-dependency-versions/pom.xml
@@ -39,53 +39,53 @@
             <dependency>
                 <groupId>aopalliance</groupId>
                 <artifactId>aopalliance</artifactId>
-                <version>${aopalliance.version}</version>
+                <version>${aopalliance.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson.core</groupId>
                 <artifactId>jackson-annotations</artifactId>
-                <version>${jackson2.version}</version>
+                <version>${jackson2.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson.core</groupId>
                 <artifactId>jackson-core</artifactId>
-                <version>${jackson2.version}</version>
+                <version>${jackson2.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson.core</groupId>
                 <artifactId>jackson-databind</artifactId>
-                <version>${jackson-databind.version}</version>
+                <version>${jackson-databind.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson.datatype</groupId>
                 <artifactId>jackson-datatype-jdk8</artifactId>
-                <version>${jackson2.version}</version>
+                <version>${jackson2.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson.datatype</groupId>
                 <artifactId>jackson-datatype-jsr310</artifactId>
-                <version>${jackson2.version}</version>
+                <version>${jackson2.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.google.guava</groupId>
                 <artifactId>guava</artifactId>
-                <version>${guava.version}</version>
+                <version>${guava.vespa.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.version}</version>
+                <version>${error-prone-annotations.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.google.inject</groupId>
                 <artifactId>guice</artifactId>
-                <version>${guice.version}</version>
+                <version>${guice.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.google.inject</groupId>
                 <artifactId>guice</artifactId>
-                <version>${guice.version}</version>
+                <version>${guice.vespa.version}</version>
                 <classifier>no_aop</classifier>
             </dependency>
             <dependency>
@@ -97,18 +97,18 @@
             <dependency>
                 <groupId>javax.inject</groupId>
                 <artifactId>javax.inject</artifactId>
-                <version>${javax.inject.version}</version>
+                <version>${javax.inject.vespa.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.version}</version>
+              <version>${javax.servlet-api.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>javax.ws.rs</groupId>
                 <artifactId>javax.ws.rs-api</artifactId>
-                <version>${javax.ws.rs-api.version}</version>
+                <version>${javax.ws.rs-api.vespa.version}</version>
             </dependency>
 
             <!-- jaxb start -->
@@ -117,19 +117,19 @@
                 <!-- TODO Vespa 9: stop exporting/providing and move to parent? -->
                 <groupId>javax.xml.bind</groupId>
                 <artifactId>jaxb-api</artifactId>
-                <version>${jaxb.version}</version>
+                <version>${jaxb.vespa.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.version}</version>
+                <version>${jaxb.vespa.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.version}</version>
+                <version>${jaxb.vespa.version}</version>
             </dependency>
             <dependency>
                 <!-- Needed by jaxb-api, and possibly guice -->
@@ -143,27 +143,27 @@
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>jcl-over-slf4j</artifactId>
-                <version>${slf4j.version}</version>
+                <version>${slf4j.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>log4j-over-slf4j</artifactId>
-                <version>${slf4j.version}</version>
+                <version>${slf4j.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-api</artifactId>
-                <version>${slf4j.version}</version>
+                <version>${slf4j.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-jdk14</artifactId>
-                <version>${slf4j.version}</version>
+                <version>${slf4j.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>xml-apis</groupId>
                 <artifactId>xml-apis</artifactId>
-                <version>${xml-apis.version}</version>
+                <version>${xml-apis.vespa.version}</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
@@ -176,7 +176,7 @@
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>versions-maven-plugin</artifactId>
-                        <version>${versions-maven-plugin.version}</version>
+                        <version>${versions-maven-plugin.vespa.version}</version>
                         <executions>
                             <execution>
                                 <phase>verify</phase>
@@ -202,7 +202,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
-                        <version>${maven.gpg.plugin.version}</version>
+                        <version>${maven.gpg.plugin.vespa.version}</version>
                         <executions>
                             <execution>
                                 <id>sign-artifacts</id>
@@ -222,7 +222,7 @@
                     <plugin>
                         <groupId>org.sonatype.plugins</groupId>
                         <artifactId>nexus-staging-maven-plugin</artifactId>
-                        <version>${nexus.staging.maven.plugin.version}</version>
+                        <version>${nexus.staging.maven.plugin.vespa.version}</version>
                         <extensions>true</extensions>
                         <configuration>
                             <serverId>ossrh</serverId>