From 08a4ea6f90c5ba95a0a232c991ddfddeb37c537c Mon Sep 17 00:00:00 2001
From: gjoranv <gv@yahooinc.com>
Date: Wed, 19 Jul 2023 13:07:49 +0200
Subject: Use 'vespa.version' suffix for all global version properties.

---
 application-model/pom.xml                       |   2 +-
 bundle-plugin/pom.xml                           |   2 +-
 cloud-tenant-base-dependencies-enforcer/pom.xml | 162 +++++++++---------
 clustercontroller-core/pom.xml                  |   2 +-
 config-model/pom.xml                            |   2 +-
 configserver/pom.xml                            |   2 +-
 container-dependencies-enforcer/pom.xml         |  98 +++++------
 container-dependency-versions/pom.xml           |  48 +++---
 container-dev/pom.xml                           |   2 +-
 container-disc/pom.xml                          |  18 +-
 container-search/pom.xml                        |   2 +-
 container-spifly/pom.xml                        |   8 +-
 container/pom.xml                               |   2 +-
 dependency-versions/pom.xml                     | 140 +++++++--------
 fat-model-dependencies/pom.xml                  |   2 +-
 hosted-tenant-base/pom.xml                      |  36 ++--
 orchestrator-restapi/pom.xml                    |   2 +-
 orchestrator/pom.xml                            |   2 +-
 parent/pom.xml                                  | 216 ++++++++++++------------
 service-monitor/pom.xml                         |   2 +-
 vespa-athenz/pom.xml                            |   2 +-
 zookeeper-command-line-client/pom.xml           |   2 +-
 22 files changed, 377 insertions(+), 377 deletions(-)

diff --git a/application-model/pom.xml b/application-model/pom.xml
index 9f5cd9c23c1..e1bac1f2b85 100644
--- a/application-model/pom.xml
+++ b/application-model/pom.xml
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
-            <version>${jackson2.version}</version>
+            <version>${jackson2.vespa.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/bundle-plugin/pom.xml b/bundle-plugin/pom.xml
index d1119327f0e..6b106ee19b5 100644
--- a/bundle-plugin/pom.xml
+++ b/bundle-plugin/pom.xml
@@ -63,7 +63,7 @@
         <dependency>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-shade-plugin</artifactId>
-            <version>${maven-shade-plugin.version}</version>
+            <version>${maven-shade-plugin.vespa.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml
index 42eef0ad3de..5a0ceb98322 100644
--- a/cloud-tenant-base-dependencies-enforcer/pom.xml
+++ b/cloud-tenant-base-dependencies-enforcer/pom.xml
@@ -17,40 +17,40 @@
     <packaging>pom</packaging>
 
     <properties>
-        <junit5.platform.version>1.8.1</junit5.platform.version>
+        <junit5.platform.vespa.version>1.8.1</junit5.platform.vespa.version>
 
         <!-- MUST BE KEPT IN SYNC WITH parent/pom.xml -->
-        <athenz.version>1.11.34</athenz.version>
+        <athenz.vespa.version>1.11.34</athenz.vespa.version>
 
-        <bouncycastle.version>1.74</bouncycastle.version>
-        <commons-codec.version>1.15</commons-codec.version>
-        <felix.version>7.0.5</felix.version>
-        <httpclient5.version>5.2.1</httpclient5.version>
-        <httpcore5.version>5.2.2</httpcore5.version>
-        <httpclient.version>4.5.14</httpclient.version>
-        <httpcore.version>4.4.16</httpcore.version>
-        <junit5.version>5.8.1</junit5.version>  <!-- TODO: in parent this is named 'junit.version' -->
-        <onnxruntime.version>1.13.1</onnxruntime.version>
-        <openai-gpt3.version>0.12.0</openai-gpt3.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.version>1.0</aopalliance.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>
-        <jetty.version>11.0.15</jetty.version>
-        <org.lz4.version>1.8.0</org.lz4.version>
-        <org.json.version>20230227</org.json.version> <!-- TODO: Remove on Vespa 9 -->
-        <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>
+        <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>
@@ -78,33 +78,33 @@
                                 <enforceDependencies implementation="com.yahoo.vespa.maven.plugin.enforcer.EnforceDependencies">
                                     <allowed>
                                         <!-- MUST BE KEPT IN SYNC WITH container-dependencies-enforcer pom -->
-                                        <include>aopalliance:aopalliance:${aopalliance.version}:provided</include>
-                                        <include>com.fasterxml.jackson.core:jackson-annotations:${jackson2.version}:provided</include>
-                                        <include>com.fasterxml.jackson.core:jackson-core:${jackson2.version}:provided</include>
-                                        <include>com.fasterxml.jackson.core:jackson-databind:${jackson-databind.version}:provided</include>
-                                        <include>com.fasterxml.jackson.datatype:jackson-datatype-jdk8:${jackson2.version}:provided</include>
-                                        <include>com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${jackson2.version}:provided</include>
+                                        <include>aopalliance:aopalliance:${aopalliance.vespa.version}:provided</include>
+                                        <include>com.fasterxml.jackson.core:jackson-annotations:${jackson2.vespa.version}:provided</include>
+                                        <include>com.fasterxml.jackson.core:jackson-core:${jackson2.vespa.version}:provided</include>
+                                        <include>com.fasterxml.jackson.core:jackson-databind:${jackson-databind.vespa.version}:provided</include>
+                                        <include>com.fasterxml.jackson.datatype:jackson-datatype-jdk8:${jackson2.vespa.version}:provided</include>
+                                        <include>com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${jackson2.vespa.version}:provided</include>
 
                                         <!-- Guava with its internal dependencies -->
-                                        <include>com.google.guava:guava:${guava.version}:provided</include>
+                                        <include>com.google.guava:guava:${guava.vespa.version}:provided</include>
                                         <include>com.google.errorprone:error_prone_annotations:2.18.0:provided</include>
                                         <include>com.google.guava:failureaccess:1.0.1:provided</include>
                                         <include>com.google.j2objc:j2objc-annotations:2.8:provided</include>
 
-                                        <include>com.google.inject:guice:jar:no_aop:${guice.version}:provided</include>
+                                        <include>com.google.inject:guice:jar:no_aop:${guice.vespa.version}:provided</include>
                                         <include>com.sun.activation:javax.activation:1.2.0:provided</include>
-                                        <include>com.sun.xml.bind:jaxb-core:${jaxb.version}:provided</include>
-                                        <include>com.sun.xml.bind:jaxb-impl:${jaxb.version}:provided</include>
+                                        <include>com.sun.xml.bind:jaxb-core:${jaxb.vespa.version}:provided</include>
+                                        <include>com.sun.xml.bind:jaxb-impl:${jaxb.vespa.version}:provided</include>
                                         <include>commons-logging:commons-logging:1.2:provided</include>
-                                        <include>javax.inject:javax.inject:${javax.inject.version}:provided</include>
-                                        <include>javax.servlet:javax.servlet-api:${javax.servlet-api.version}:provided</include>
-                                        <include>javax.ws.rs:javax.ws.rs-api:${javax.ws.rs-api.version}:provided</include>
-                                        <include>javax.xml.bind:jaxb-api:${jaxb.version}:provided</include>
-                                        <include>org.slf4j:jcl-over-slf4j:${slf4j.version}:provided</include>
-                                        <include>org.slf4j:log4j-over-slf4j:${slf4j.version}:provided</include>
-                                        <include>org.slf4j:slf4j-api:${slf4j.version}:provided</include>
-                                        <include>org.slf4j:slf4j-jdk14:${slf4j.version}:provided</include>
-                                        <include>xml-apis:xml-apis:${xml-apis.version}:provided</include>
+                                        <include>javax.inject:javax.inject:${javax.inject.vespa.version}:provided</include>
+                                        <include>javax.servlet:javax.servlet-api:${javax.servlet-api.vespa.version}:provided</include>
+                                        <include>javax.ws.rs:javax.ws.rs-api:${javax.ws.rs-api.vespa.version}:provided</include>
+                                        <include>javax.xml.bind:jaxb-api:${jaxb.vespa.version}:provided</include>
+                                        <include>org.slf4j:jcl-over-slf4j:${slf4j.vespa.version}:provided</include>
+                                        <include>org.slf4j:log4j-over-slf4j:${slf4j.vespa.version}:provided</include>
+                                        <include>org.slf4j:slf4j-api:${slf4j.vespa.version}:provided</include>
+                                        <include>org.slf4j:slf4j-jdk14:${slf4j.vespa.version}:provided</include>
+                                        <include>xml-apis:xml-apis:${xml-apis.vespa.version}:provided</include>
 
                                         <!-- Vespa provided dependencies -->
                                         <include>com.yahoo.vespa:annotations:*:provided</include>
@@ -178,9 +178,9 @@
                                         <include>com.google.code.findbugs:jsr305:3.0.2:test</include>
                                         <include>com.google.protobuf:protobuf-java:3.21.7:test</include>
                                         <include>com.ibm.icu:icu4j:70.1:test</include>
-                                        <include>com.microsoft.onnxruntime:onnxruntime:jar:${onnxruntime.version}:test</include>
+                                        <include>com.microsoft.onnxruntime:onnxruntime:jar:${onnxruntime.vespa.version}:test</include>
                                         <include>com.thaiopensource:jing:20091111:test</include>
-                                        <include>commons-codec:commons-codec:${commons-codec.version}:test</include>
+                                        <include>commons-codec:commons-codec:${commons-codec.vespa.version}:test</include>
                                         <include>io.airlift:airline:0.9:test</include>
                                         <include>io.prometheus:simpleclient:0.6.0:test</include>
                                         <include>io.prometheus:simpleclient_common:0.6.0:test</include>
@@ -191,47 +191,47 @@
                                         <include>org.antlr:antlr4-runtime:4.11.1:test</include>
                                         <include>org.apache.commons:commons-exec:1.3:test</include>
                                         <include>org.apache.commons:commons-math3:3.6.1:test</include>
-                                        <include>org.apache.felix:org.apache.felix.framework:${felix.version}: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.version}:test</include>
-                                        <include>org.apache.httpcomponents.core5:httpcore5:${httpcore5.version}:test</include>
-                                        <include>org.apache.httpcomponents.core5:httpcore5-h2:${httpcore5.version}:test</include>
-                                        <include>org.apache.httpcomponents:httpclient:${httpclient.version}:test</include>
-                                        <include>org.apache.httpcomponents:httpcore:${httpcore.version}:test</include>
-                                        <include>org.apache.httpcomponents:httpmime:${httpclient.version}: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.opennlp:opennlp-tools:1.9.3:test</include>
                                         <include>org.apiguardian:apiguardian-api:1.1.2:test</include>
-                                        <include>org.bouncycastle:bcpkix-jdk18on:${bouncycastle.version}:test</include>
-                                        <include>org.bouncycastle:bcprov-jdk18on:${bouncycastle.version}:test</include>
-                                        <include>org.bouncycastle:bcutil-jdk18on:${bouncycastle.version}:test</include>
-                                        <include>org.eclipse.jetty.http2:http2-client:${jetty.version}:test</include>
-                                        <include>org.eclipse.jetty.http2:http2-common:${jetty.version}:test</include>
-                                        <include>org.eclipse.jetty.http2:http2-hpack:${jetty.version}:test</include>
-                                        <include>org.eclipse.jetty.http2:http2-http-client-transport:${jetty.version}:test</include>
-                                        <include>org.eclipse.jetty.http2:http2-server:${jetty.version}:test</include>
+                                        <include>org.bouncycastle:bcpkix-jdk18on:${bouncycastle.vespa.version}:test</include>
+                                        <include>org.bouncycastle:bcprov-jdk18on:${bouncycastle.vespa.version}:test</include>
+                                        <include>org.bouncycastle:bcutil-jdk18on:${bouncycastle.vespa.version}:test</include>
+                                        <include>org.eclipse.jetty.http2:http2-client:${jetty.vespa.version}:test</include>
+                                        <include>org.eclipse.jetty.http2:http2-common:${jetty.vespa.version}:test</include>
+                                        <include>org.eclipse.jetty.http2:http2-hpack:${jetty.vespa.version}:test</include>
+                                        <include>org.eclipse.jetty.http2:http2-http-client-transport:${jetty.vespa.version}:test</include>
+                                        <include>org.eclipse.jetty.http2:http2-server:${jetty.vespa.version}:test</include>
                                         <include>org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2:test</include>
-                                        <include>org.eclipse.jetty:jetty-alpn-client:${jetty.version}:test</include>
-                                        <include>org.eclipse.jetty:jetty-alpn-java-client:${jetty.version}:test</include>
-                                        <include>org.eclipse.jetty:jetty-alpn-java-server:${jetty.version}:test</include>
-                                        <include>org.eclipse.jetty:jetty-alpn-server:${jetty.version}:test</include>
-                                        <include>org.eclipse.jetty:jetty-client:${jetty.version}:test</include>
-                                        <include>org.eclipse.jetty:jetty-http:${jetty.version}:test</include>
-                                        <include>org.eclipse.jetty:jetty-io:${jetty.version}:test</include>
-                                        <include>org.eclipse.jetty:jetty-jmx:${jetty.version}:test</include>
-                                        <include>org.eclipse.jetty:jetty-security:${jetty.version}:test</include>
-                                        <include>org.eclipse.jetty:jetty-server:${jetty.version}:test</include>
-                                        <include>org.eclipse.jetty:jetty-servlet:${jetty.version}:test</include>
-                                        <include>org.eclipse.jetty:jetty-util:${jetty.version}:test</include>
+                                        <include>org.eclipse.jetty:jetty-alpn-client:${jetty.vespa.version}:test</include>
+                                        <include>org.eclipse.jetty:jetty-alpn-java-client:${jetty.vespa.version}:test</include>
+                                        <include>org.eclipse.jetty:jetty-alpn-java-server:${jetty.vespa.version}:test</include>
+                                        <include>org.eclipse.jetty:jetty-alpn-server:${jetty.vespa.version}:test</include>
+                                        <include>org.eclipse.jetty:jetty-client:${jetty.vespa.version}:test</include>
+                                        <include>org.eclipse.jetty:jetty-http:${jetty.vespa.version}:test</include>
+                                        <include>org.eclipse.jetty:jetty-io:${jetty.vespa.version}:test</include>
+                                        <include>org.eclipse.jetty:jetty-jmx:${jetty.vespa.version}:test</include>
+                                        <include>org.eclipse.jetty:jetty-security:${jetty.vespa.version}:test</include>
+                                        <include>org.eclipse.jetty:jetty-server:${jetty.vespa.version}:test</include>
+                                        <include>org.eclipse.jetty:jetty-servlet:${jetty.vespa.version}:test</include>
+                                        <include>org.eclipse.jetty:jetty-util:${jetty.vespa.version}:test</include>
 
                                         <include>org.hamcrest:hamcrest-core:1.3:test</include>
                                         <include>org.hdrhistogram:HdrHistogram:2.1.12:test</include>
-                                        <include>org.json:json:${org.json.version}:test</include>
-                                        <include>org.junit.jupiter:junit-jupiter-api:${junit5.version}:test</include>
-                                        <include>org.junit.jupiter:junit-jupiter-engine:${junit5.version}:test</include>
-                                        <include>org.junit.platform:junit-platform-commons:${junit5.platform.version}:test</include>
-                                        <include>org.junit.platform:junit-platform-engine:${junit5.platform.version}:test</include>
-                                        <include>org.junit.vintage:junit-vintage-engine:${junit5.version}:test</include>
-                                        <include>org.lz4:lz4-java:${org.lz4.version}: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.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>
                                         <include>org.osgi:org.osgi.core:4.1.0:test</include>
diff --git a/clustercontroller-core/pom.xml b/clustercontroller-core/pom.xml
index 61176c178c6..6fc29fc811c 100644
--- a/clustercontroller-core/pom.xml
+++ b/clustercontroller-core/pom.xml
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-junit-jupiter</artifactId>
-            <version>${mockito.version}</version>
+            <version>${mockito.vespa.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/config-model/pom.xml b/config-model/pom.xml
index afb5a7f49c0..bfaa82a186f 100644
--- a/config-model/pom.xml
+++ b/config-model/pom.xml
@@ -59,7 +59,7 @@
     <dependency>
       <groupId>com.google.protobuf</groupId>
       <artifactId>protobuf-java</artifactId>
-      <version>${protobuf.version}</version>
+      <version>${protobuf.vespa.version}</version>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
diff --git a/configserver/pom.xml b/configserver/pom.xml
index 5b130969ae4..2ee7adb7ef8 100644
--- a/configserver/pom.xml
+++ b/configserver/pom.xml
@@ -20,7 +20,7 @@
     <dependency>
       <groupId>com.fasterxml.jackson.jaxrs</groupId>
       <artifactId>jackson-jaxrs-json-provider</artifactId>
-      <version>${jackson2.version}</version>
+      <version>${jackson2.vespa.version}</version>
       <exclusions>
         <exclusion>
           <!-- Conflicts with javax.activation:javax.activation-api:1.2.0, which is "exported" via jdisc_core. -->
diff --git a/container-dependencies-enforcer/pom.xml b/container-dependencies-enforcer/pom.xml
index 38988ddeabc..6c30c3a4b5c 100644
--- a/container-dependencies-enforcer/pom.xml
+++ b/container-dependencies-enforcer/pom.xml
@@ -60,33 +60,33 @@
                             <rules>
                                 <enforceDependencies implementation="com.yahoo.vespa.maven.plugin.enforcer.EnforceDependencies">
                                     <allowed>
-                                        <include>aopalliance:aopalliance:${aopalliance.version}:provided</include>
-                                        <include>com.fasterxml.jackson.core:jackson-annotations:${jackson2.version}:provided</include>
-                                        <include>com.fasterxml.jackson.core:jackson-core:${jackson2.version}:provided</include>
-                                        <include>com.fasterxml.jackson.core:jackson-databind:${jackson-databind.version}:provided</include>
-                                        <include>com.fasterxml.jackson.datatype:jackson-datatype-jdk8:${jackson2.version}:provided</include>
-                                        <include>com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${jackson2.version}:provided</include>
+                                        <include>aopalliance:aopalliance:${aopalliance.vespa.version}:provided</include>
+                                        <include>com.fasterxml.jackson.core:jackson-annotations:${jackson2.vespa.version}:provided</include>
+                                        <include>com.fasterxml.jackson.core:jackson-core:${jackson2.vespa.version}:provided</include>
+                                        <include>com.fasterxml.jackson.core:jackson-databind:${jackson-databind.vespa.version}:provided</include>
+                                        <include>com.fasterxml.jackson.datatype:jackson-datatype-jdk8:${jackson2.vespa.version}:provided</include>
+                                        <include>com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${jackson2.vespa.version}:provided</include>
 
                                         <!-- Guava with its internal dependencies -->
-                                        <include>com.google.guava:guava:${guava.version}:provided</include>
+                                        <include>com.google.guava:guava:${guava.vespa.version}:provided</include>
                                         <include>com.google.errorprone:error_prone_annotations:2.18.0:provided</include>
                                         <include>com.google.guava:failureaccess:1.0.1:provided</include>
                                         <include>com.google.j2objc:j2objc-annotations:2.8:provided</include>
 
-                                        <include>com.google.inject:guice:jar:no_aop:${guice.version}:provided</include>
+                                        <include>com.google.inject:guice:jar:no_aop:${guice.vespa.version}:provided</include>
                                         <include>com.sun.activation:javax.activation:1.2.0:provided</include>
-                                        <include>com.sun.xml.bind:jaxb-core:${jaxb.version}:provided</include>
-                                        <include>com.sun.xml.bind:jaxb-impl:${jaxb.version}:provided</include>
+                                        <include>com.sun.xml.bind:jaxb-core:${jaxb.vespa.version}:provided</include>
+                                        <include>com.sun.xml.bind:jaxb-impl:${jaxb.vespa.version}:provided</include>
                                         <include>commons-logging:commons-logging:1.2:provided</include>
-                                        <include>javax.inject:javax.inject:${javax.inject.version}:provided</include>
-                                        <include>javax.servlet:javax.servlet-api:${javax.servlet-api.version}:provided</include>
-                                        <include>javax.ws.rs:javax.ws.rs-api:${javax.ws.rs-api.version}:provided</include>
-                                        <include>javax.xml.bind:jaxb-api:${jaxb.version}:provided</include>
-                                        <include>org.slf4j:jcl-over-slf4j:${slf4j.version}:provided</include>
-                                        <include>org.slf4j:log4j-over-slf4j:${slf4j.version}:provided</include>
-                                        <include>org.slf4j:slf4j-api:${slf4j.version}:provided</include>
-                                        <include>org.slf4j:slf4j-jdk14:${slf4j.version}:provided</include>
-                                        <include>xml-apis:xml-apis:${xml-apis.version}:provided</include>
+                                        <include>javax.inject:javax.inject:${javax.inject.vespa.version}:provided</include>
+                                        <include>javax.servlet:javax.servlet-api:${javax.servlet-api.vespa.version}:provided</include>
+                                        <include>javax.ws.rs:javax.ws.rs-api:${javax.ws.rs-api.vespa.version}:provided</include>
+                                        <include>javax.xml.bind:jaxb-api:${jaxb.vespa.version}:provided</include>
+                                        <include>org.slf4j:jcl-over-slf4j:${slf4j.vespa.version}:provided</include>
+                                        <include>org.slf4j:log4j-over-slf4j:${slf4j.vespa.version}:provided</include>
+                                        <include>org.slf4j:slf4j-api:${slf4j.vespa.version}:provided</include>
+                                        <include>org.slf4j:slf4j-jdk14:${slf4j.vespa.version}:provided</include>
+                                        <include>xml-apis:xml-apis:${xml-apis.vespa.version}:provided</include>
 
                                         <!-- Vespa provided dependencies -->
                                         <include>com.yahoo.vespa:annotations:*:provided</include>
@@ -152,11 +152,11 @@
 
                                         <!-- 3rd party test dependencies -->
                                         <include>com.google.code.findbugs:jsr305:3.0.2:test</include>
-                                        <include>com.google.protobuf:protobuf-java:${protobuf.version}:test</include>
+                                        <include>com.google.protobuf:protobuf-java:${protobuf.vespa.version}:test</include>
                                         <include>com.ibm.icu:icu4j:70.1:test</include>
-                                        <include>com.microsoft.onnxruntime:onnxruntime:${onnxruntime.version}:test</include>
+                                        <include>com.microsoft.onnxruntime:onnxruntime:${onnxruntime.vespa.version}:test</include>
                                         <include>com.thaiopensource:jing:20091111:test</include>
-                                        <include>commons-codec:commons-codec:${commons-codec.version}:test</include>
+                                        <include>commons-codec:commons-codec:${commons-codec.vespa.version}:test</include>
                                         <include>io.airlift:airline:0.9:test</include>
                                         <include>io.prometheus:simpleclient:0.6.0:test</include>
                                         <include>io.prometheus:simpleclient_common:0.6.0:test</include>
@@ -167,38 +167,38 @@
                                         <include>org.antlr:antlr4-runtime:4.11.1:test</include>
                                         <include>org.apache.commons:commons-exec:1.3:test</include>
                                         <include>org.apache.commons:commons-math3:3.6.1:test</include>
-                                        <include>org.apache.felix:org.apache.felix.framework:${felix.version}:test</include>
-                                        <include>org.apache.felix:org.apache.felix.framework:${felix.version}:test</include>
+                                        <include>org.apache.felix:org.apache.felix.framework:${felix.vespa.version}: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:${apache.httpclient5.version}:test</include>
-                                        <include>org.apache.httpcomponents.core5:httpcore5:${apache.httpcore5.version}:test</include>
-                                        <include>org.apache.httpcomponents.core5:httpcore5-h2:${apache.httpcore5.version}:test</include>
-                                        <include>org.apache.httpcomponents:httpclient:${apache.httpclient.version}:test</include>
-                                        <include>org.apache.httpcomponents:httpcore:${apache.httpcore.version}:test</include>
-                                        <include>org.apache.httpcomponents:httpmime:${apache.httpclient.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.bouncycastle:bcpkix-jdk18on:${bouncycastle.version}:test</include>
-                                        <include>org.bouncycastle:bcprov-jdk18on:${bouncycastle.version}:test</include>
-                                        <include>org.bouncycastle:bcutil-jdk18on:${bouncycastle.version}:test</include>
-                                        <include>org.eclipse.jetty.http2:http2-common:${jetty.version}:test</include>
-                                        <include>org.eclipse.jetty.http2:http2-hpack:${jetty.version}:test</include>
-                                        <include>org.eclipse.jetty.http2:http2-server:${jetty.version}:test</include>
+                                        <include>org.bouncycastle:bcpkix-jdk18on:${bouncycastle.vespa.version}:test</include>
+                                        <include>org.bouncycastle:bcprov-jdk18on:${bouncycastle.vespa.version}:test</include>
+                                        <include>org.bouncycastle:bcutil-jdk18on:${bouncycastle.vespa.version}:test</include>
+                                        <include>org.eclipse.jetty.http2:http2-common:${jetty.vespa.version}:test</include>
+                                        <include>org.eclipse.jetty.http2:http2-hpack:${jetty.vespa.version}:test</include>
+                                        <include>org.eclipse.jetty.http2:http2-server:${jetty.vespa.version}:test</include>
                                         <include>org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2:test</include>
-                                        <include>org.eclipse.jetty:jetty-alpn-client:${jetty.version}:test</include>
-                                        <include>org.eclipse.jetty:jetty-alpn-java-server:${jetty.version}:test</include>
-                                        <include>org.eclipse.jetty:jetty-alpn-server:${jetty.version}:test</include>
-                                        <include>org.eclipse.jetty:jetty-client:${jetty.version}:test</include>
-                                        <include>org.eclipse.jetty:jetty-http:${jetty.version}:test</include>
-                                        <include>org.eclipse.jetty:jetty-io:${jetty.version}:test</include>
-                                        <include>org.eclipse.jetty:jetty-jmx:${jetty.version}:test</include>
-                                        <include>org.eclipse.jetty:jetty-security:${jetty.version}:test</include>
-                                        <include>org.eclipse.jetty:jetty-server:${jetty.version}:test</include>
-                                        <include>org.eclipse.jetty:jetty-servlet:${jetty.version}:test</include>
-                                        <include>org.eclipse.jetty:jetty-util:${jetty.version}:test</include>
+                                        <include>org.eclipse.jetty:jetty-alpn-client:${jetty.vespa.version}:test</include>
+                                        <include>org.eclipse.jetty:jetty-alpn-java-server:${jetty.vespa.version}:test</include>
+                                        <include>org.eclipse.jetty:jetty-alpn-server:${jetty.vespa.version}:test</include>
+                                        <include>org.eclipse.jetty:jetty-client:${jetty.vespa.version}:test</include>
+                                        <include>org.eclipse.jetty:jetty-http:${jetty.vespa.version}:test</include>
+                                        <include>org.eclipse.jetty:jetty-io:${jetty.vespa.version}:test</include>
+                                        <include>org.eclipse.jetty:jetty-jmx:${jetty.vespa.version}:test</include>
+                                        <include>org.eclipse.jetty:jetty-security:${jetty.vespa.version}:test</include>
+                                        <include>org.eclipse.jetty:jetty-server:${jetty.vespa.version}:test</include>
+                                        <include>org.eclipse.jetty:jetty-servlet:${jetty.vespa.version}:test</include>
+                                        <include>org.eclipse.jetty:jetty-util:${jetty.vespa.version}:test</include>
                                         <include>org.hamcrest:hamcrest-core:1.3:test</include>
                                         <include>org.hdrhistogram:HdrHistogram:2.1.12:test</include>
-                                        <include>org.json:json:${org.json.version}:test</include> <!-- TODO: Remove on Vespa 9 -->
-                                        <include>org.lz4:lz4-java:${org.lz4.version}:test</include>
+                                        <include>org.json:json:${org.json.vespa.version}:test</include> <!-- TODO: Remove on Vespa 9 -->
+                                        <include>org.lz4:lz4-java:${org.lz4.vespa.version}:test</include>
                                         <include>org.osgi:org.osgi.compendium:4.1.0:test</include>
                                         <include>org.osgi:org.osgi.core:4.1.0:test</include>
                                         <include>xerces:xercesImpl:2.12.2:test</include>
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>
diff --git a/container-dev/pom.xml b/container-dev/pom.xml
index ef6ce1529ee..0120a6c82fe 100644
--- a/container-dev/pom.xml
+++ b/container-dev/pom.xml
@@ -292,7 +292,7 @@
             <manifest>
               <addClasspath>true</addClasspath>
               <classpathLayoutType>custom</classpathLayoutType>
-              <customClasspathLayout>$${artifact.groupId}:$${artifact.artifactId}:$${artifact.version}</customClasspathLayout>
+              <customClasspathLayout>$${artifact.groupId}:$${artifact.artifactId}:$${artifact.vespa.version}</customClasspathLayout>
             </manifest>
           </archive>
         </configuration>
diff --git a/container-disc/pom.xml b/container-disc/pom.xml
index 16ce99220f1..4ec141d2758 100644
--- a/container-disc/pom.xml
+++ b/container-disc/pom.xml
@@ -196,19 +196,19 @@
                 hosted-zone-api-jar-with-dependencies.jar,
                 container-apache-http-client-bundle-jar-with-dependencies.jar,
                 security-utils.jar,
-                bcprov-jdk18on-${bouncycastle.version}.jar, <!-- Used by security-utils -->
-                bcpkix-jdk18on-${bouncycastle.version}.jar, <!-- Used by security-utils -->
-                bcutil-jdk18on-${bouncycastle.version}.jar, <!-- Used by security-utils -->
+                bcprov-jdk18on-${bouncycastle.vespa.version}.jar, <!-- Used by security-utils -->
+                bcpkix-jdk18on-${bouncycastle.vespa.version}.jar, <!-- Used by security-utils -->
+                bcutil-jdk18on-${bouncycastle.vespa.version}.jar, <!-- Used by security-utils -->
                 <!-- END Bundles needed to retrieve config, or used by container-disc -->
 
-                jackson-annotations-${jackson2.version}.jar,
-                jackson-core-${jackson2.version}.jar,
-                jackson-databind-${jackson-databind.version}.jar,
-                jackson-datatype-jdk8-${jackson2.version}.jar,
-                jackson-datatype-jsr310-${jackson2.version}.jar,
+                jackson-annotations-${jackson2.vespa.version}.jar,
+                jackson-core-${jackson2.vespa.version}.jar,
+                jackson-databind-${jackson-databind.vespa.version}.jar,
+                jackson-datatype-jdk8-${jackson2.vespa.version}.jar,
+                jackson-datatype-jsr310-${jackson2.vespa.version}.jar,
 
                 <!-- Only one instance of javax.ws.rs.client.ClientBuilder can be loaded by the JVM -->
-                javax.ws.rs-api-${javax.ws.rs-api.version}.jar
+                javax.ws.rs-api-${javax.ws.rs-api.vespa.version}.jar
             </discPreInstallBundle>
 
             <!-- Enable Spifly ServiceLoader weaving. Required for Jetty ALPN/HTTP2 -->
diff --git a/container-search/pom.xml b/container-search/pom.xml
index 5d3b88157aa..cea05826ce0 100644
--- a/container-search/pom.xml
+++ b/container-search/pom.xml
@@ -214,7 +214,7 @@
       <plugin> <!-- For the YQL query language -->
         <groupId>org.antlr</groupId>
         <artifactId>antlr4-maven-plugin</artifactId>
-        <version>${antlr4.version}</version>
+        <version>${antlr4.vespa.version}</version>
         <executions>
           <execution>
             <configuration>
diff --git a/container-spifly/pom.xml b/container-spifly/pom.xml
index 09a58a6fc34..74b58f3c852 100644
--- a/container-spifly/pom.xml
+++ b/container-spifly/pom.xml
@@ -72,11 +72,11 @@
                                     <manifestEntries>
                                         <Bundle-Name>container-spifly</Bundle-Name>
                                         <Bundle-SymbolicName>container-spifly</Bundle-SymbolicName>
-                                        <Bundle-Version>${spifly.version}</Bundle-Version>
+                                        <Bundle-Version>${spifly.vespa.version}</Bundle-Version>
                                         <Export-Package>
-                                            ${relocation-pkg-prefix}.spifly;version="${spifly.version}",
-                                            ${relocation-pkg-prefix}.spifly.dynamic;version="${spifly.version}",
-                                            ${relocation-pkg-prefix}.spifly.weaver;version="${spifly.version}"
+                                            ${relocation-pkg-prefix}.spifly;version="${spifly.vespa.version}",
+                                            ${relocation-pkg-prefix}.spifly.dynamic;version="${spifly.vespa.version}",
+                                            ${relocation-pkg-prefix}.spifly.weaver;version="${spifly.vespa.version}"
                                         </Export-Package>
                                         <Import-Package>
                                             org.osgi.framework;version="[1.7,2)",
diff --git a/container/pom.xml b/container/pom.xml
index f86f1fc3625..b4d446ae356 100644
--- a/container/pom.xml
+++ b/container/pom.xml
@@ -56,7 +56,7 @@
             <manifest>
               <addClasspath>true</addClasspath>
               <classpathLayoutType>custom</classpathLayoutType>
-              <customClasspathLayout>$${artifact.groupId}:$${artifact.artifactId}:$${artifact.version}</customClasspathLayout>
+              <customClasspathLayout>$${artifact.groupId}:$${artifact.artifactId}:$${artifact.vespa.version}</customClasspathLayout>
             </manifest>
           </archive>
         </configuration>
diff --git a/dependency-versions/pom.xml b/dependency-versions/pom.xml
index f7e197f37d3..fd168a88bda 100644
--- a/dependency-versions/pom.xml
+++ b/dependency-versions/pom.xml
@@ -30,33 +30,33 @@
     <properties>
         
         <!-- Dependencies available from the Jdisc container, see container-dependency-versions/pom.xml -->
-        <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>
-        <xml-apis.version>1.4.01</xml-apis.version>
+        <aopalliance.vespa.version>1.0</aopalliance.vespa.version>
+        <error-prone-annotations.vespa.version>2.18.0</error-prone-annotations.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>
+        <slf4j.vespa.version>1.7.32</slf4j.vespa.version>
+        <xml-apis.vespa.version>1.4.01</xml-apis.vespa.version>
 
 
         <!-- Dependencies used internally in Vespa, not visible for users -->
-        <airline.version>0.9</airline.version>
-        <antlr.version>3.5.3</antlr.version>
-        <antlr4.version>4.11.1</antlr4.version>
-        <apache.httpclient.version>4.5.14</apache.httpclient.version>
-        <apache.httpcore.version>4.4.16</apache.httpcore.version>
-        <apache.httpclient5.version>5.2.1</apache.httpclient5.version> <!-- WARNING: sync cloud-tenant-base-dependencies-enforcer/pom.xml -->
-        <apache.httpcore5.version>5.2.2</apache.httpcore5.version> <!-- WARNING: sync cloud-tenant-base-dependencies-enforcer/pom.xml -->
-        <asm.version>9.3</asm.version>
+        <airline.vespa.version>0.9</airline.vespa.version>
+        <antlr.vespa.version>3.5.3</antlr.vespa.version>
+        <antlr4.vespa.version>4.11.1</antlr4.vespa.version>
+        <apache.httpclient.vespa.version>4.5.14</apache.httpclient.vespa.version>
+        <apache.httpcore.vespa.version>4.4.16</apache.httpcore.vespa.version>
+        <apache.httpclient5.vespa.version>5.2.1</apache.httpclient5.vespa.version> <!-- WARNING: sync cloud-tenant-base-dependencies-enforcer/pom.xml -->
+        <apache.httpcore5.vespa.version>5.2.2</apache.httpcore5.vespa.version> <!-- WARNING: sync cloud-tenant-base-dependencies-enforcer/pom.xml -->
+        <asm.vespa.version>9.3</asm.vespa.version>
 
         <!-- Athenz dependencies. Make sure these dependencies match those in Vespa's internal repositories -->
-        <athenz.version>1.11.34</athenz.version> <!-- WARNING: sync cloud-tenant-base-dependencies-enforcer/pom.xml -->
-        <aws-sdk.version>1.12.460</aws-sdk.version>
+        <athenz.vespa.version>1.11.34</athenz.vespa.version> <!-- WARNING: sync cloud-tenant-base-dependencies-enforcer/pom.xml -->
+        <aws-sdk.vespa.version>1.12.460</aws-sdk.vespa.version>
         <!-- Athenz END -->
 
         <!-- WARNING: If you change curator version, you also need to update
@@ -65,57 +65,57 @@
                  find zkfacade/src/main/java/org/apache/curator -name package-info.java | \
                      xargs perl -pi -e 's/major = [0-9]+, minor = [0-9]+, micro = [0-9]+/major = 5, minor = 3, micro = 0/g'
         -->
-        <bouncycastle.version>1.74</bouncycastle.version>
-        <curator.version>5.4.0</curator.version>
-        <commons-codec.version>1.15</commons-codec.version>
-        <commons-io.version>2.11.0</commons-io.version>
-        <commons.math3.version>3.6.1</commons.math3.version>
-        <eclipse-collections.version>11.0.0</eclipse-collections.version>
-        <felix.version>7.0.5</felix.version>
-        <felix.log.version>1.0.1</felix.log.version>
-        <findbugs.version>3.0.2</findbugs.version> <!-- Should be kept in sync with guava -->
-        <hdrhistogram.version>2.1.12</hdrhistogram.version>
-        <jetty.version>11.0.15</jetty.version>
-        <jetty-servlet-api.version>5.0.2</jetty-servlet-api.version>
-        <jjwt.version>0.11.5</jjwt.version>
-        <jna.version>5.11.0</jna.version>
-        <junit.version>5.8.1</junit.version>
-        <maven-archiver.version>3.6.0</maven-archiver.version>
-        <maven-wagon.version>2.10</maven-wagon.version>
-        <mockito.version>4.0.0</mockito.version>
-        <netty.version>4.1.94.Final</netty.version>
-        <netty-tcnative.version>2.0.61.Final</netty-tcnative.version>
-        <onnxruntime.version>1.13.1</onnxruntime.version> <!-- WARNING: sync cloud-tenant-base-dependencies-enforcer/pom.xml -->
-        <org.json.version>20230227</org.json.version>
-        <org.lz4.version>1.8.0</org.lz4.version>
-        <prometheus.client.version>0.6.0</prometheus.client.version>
-        <protobuf.version>3.21.7</protobuf.version>
-        <spifly.version>1.3.6</spifly.version>
-        <surefire.version>3.0.0-M9</surefire.version>
-        <wiremock.version>2.35.0</wiremock.version>
-        <zero-allocation-hashing.version>0.16</zero-allocation-hashing.version>
-        <zookeeper.client.version>3.8.0</zookeeper.client.version>
+        <bouncycastle.vespa.version>1.74</bouncycastle.vespa.version>
+        <curator.vespa.version>5.4.0</curator.vespa.version>
+        <commons-codec.vespa.version>1.15</commons-codec.vespa.version>
+        <commons-io.vespa.version>2.11.0</commons-io.vespa.version>
+        <commons.math3.vespa.version>3.6.1</commons.math3.vespa.version>
+        <eclipse-collections.vespa.version>11.0.0</eclipse-collections.vespa.version>
+        <felix.vespa.version>7.0.5</felix.vespa.version>
+        <felix.log.vespa.version>1.0.1</felix.log.vespa.version>
+        <findbugs.vespa.version>3.0.2</findbugs.vespa.version> <!-- Should be kept in sync with guava -->
+        <hdrhistogram.vespa.version>2.1.12</hdrhistogram.vespa.version>
+        <jetty.vespa.version>11.0.15</jetty.vespa.version>
+        <jetty-servlet-api.vespa.version>5.0.2</jetty-servlet-api.vespa.version>
+        <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>
+        <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>
+        <netty.vespa.version>4.1.94.Final</netty.vespa.version>
+        <netty-tcnative.vespa.version>2.0.61.Final</netty-tcnative.vespa.version>
+        <onnxruntime.vespa.version>1.13.1</onnxruntime.vespa.version> <!-- WARNING: sync cloud-tenant-base-dependencies-enforcer/pom.xml -->
+        <org.json.vespa.version>20230227</org.json.vespa.version>
+        <org.lz4.vespa.version>1.8.0</org.lz4.vespa.version>
+        <prometheus.client.vespa.version>0.6.0</prometheus.client.vespa.version>
+        <protobuf.vespa.version>3.21.7</protobuf.vespa.version>
+        <spifly.vespa.version>1.3.6</spifly.vespa.version>
+        <surefire.vespa.version>3.0.0-M9</surefire.vespa.version>
+        <wiremock.vespa.version>2.35.0</wiremock.vespa.version>
+        <zero-allocation-hashing.vespa.version>0.16</zero-allocation-hashing.vespa.version>
+        <zookeeper.client.vespa.version>3.8.0</zookeeper.client.vespa.version>
 
 
         <!-- Maven plugins -->
-        <maven-assembly-plugin.version>3.3.0</maven-assembly-plugin.version>
-        <maven-bundle-plugin.version>5.1.9</maven-bundle-plugin.version>
-        <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
-        <maven-core.version>3.8.7</maven-core.version>
-        <maven-dependency-plugin.version>3.6.0</maven-dependency-plugin.version> <!-- NOTE: When upgrading, also update explicit versions in tenant base poms! -->
-        <maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
-        <maven-enforcer-plugin.version>3.3.0</maven-enforcer-plugin.version>
-        <maven-failsafe-plugin.version>3.0.0-M6</maven-failsafe-plugin.version>
-        <maven-install-plugin.version>3.1.1</maven-install-plugin.version>
-        <maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
-        <maven-javadoc-plugin.version>3.3.1</maven-javadoc-plugin.version>
-        <maven-plugin-api.version>${maven-core.version}</maven-plugin-api.version>
-        <maven-plugin-tools.version>3.6.4</maven-plugin-tools.version>
-        <maven-resources-plugin.version>3.2.0</maven-resources-plugin.version>
-        <maven-shade-plugin.version>3.4.1</maven-shade-plugin.version>
-        <maven-site-plugin.version>3.9.1</maven-site-plugin.version>
-        <maven-source-plugin.version>3.2.1</maven-source-plugin.version>
-        <versions-maven-plugin.version>2.8.1</versions-maven-plugin.version>
+        <maven-assembly-plugin.vespa.version>3.3.0</maven-assembly-plugin.vespa.version>
+        <maven-bundle-plugin.vespa.version>5.1.9</maven-bundle-plugin.vespa.version>
+        <maven-compiler-plugin.vespa.version>3.10.1</maven-compiler-plugin.vespa.version>
+        <maven-core.vespa.version>3.8.7</maven-core.vespa.version>
+        <maven-dependency-plugin.vespa.version>3.6.0</maven-dependency-plugin.vespa.version> <!-- NOTE: When upgrading, also update explicit versions in tenant base poms! -->
+        <maven-deploy-plugin.vespa.version>2.8.2</maven-deploy-plugin.vespa.version>
+        <maven-enforcer-plugin.vespa.version>3.3.0</maven-enforcer-plugin.vespa.version>
+        <maven-failsafe-plugin.vespa.version>3.0.0-M6</maven-failsafe-plugin.vespa.version>
+        <maven-install-plugin.vespa.version>3.1.1</maven-install-plugin.vespa.version>
+        <maven-jar-plugin.vespa.version>3.2.0</maven-jar-plugin.vespa.version>
+        <maven-javadoc-plugin.vespa.version>3.3.1</maven-javadoc-plugin.vespa.version>
+        <maven-plugin-api.vespa.version>${maven-core.vespa.version}</maven-plugin-api.vespa.version>
+        <maven-plugin-tools.vespa.version>3.6.4</maven-plugin-tools.vespa.version>
+        <maven-resources-plugin.vespa.version>3.2.0</maven-resources-plugin.vespa.version>
+        <maven-shade-plugin.vespa.version>3.4.1</maven-shade-plugin.vespa.version>
+        <maven-site-plugin.vespa.version>3.9.1</maven-site-plugin.vespa.version>
+        <maven-source-plugin.vespa.version>3.2.1</maven-source-plugin.vespa.version>
+        <versions-maven-plugin.vespa.version>2.8.1</versions-maven-plugin.vespa.version>
     </properties>
 
 </project>
diff --git a/fat-model-dependencies/pom.xml b/fat-model-dependencies/pom.xml
index b2ee5c64b38..901e2db4c99 100644
--- a/fat-model-dependencies/pom.xml
+++ b/fat-model-dependencies/pom.xml
@@ -268,7 +268,7 @@
     <dependency>
       <groupId>com.google.protobuf</groupId>
       <artifactId>protobuf-java</artifactId>
-      <version>${protobuf.version}</version>
+      <version>${protobuf.vespa.version}</version>
     </dependency>
   </dependencies>
 </project>
diff --git a/hosted-tenant-base/pom.xml b/hosted-tenant-base/pom.xml
index f2d4c6ab012..8f6063bf44e 100644
--- a/hosted-tenant-base/pom.xml
+++ b/hosted-tenant-base/pom.xml
@@ -35,12 +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>
+        <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.version>5.8.1</vespa.junit.version>
+        <vespa.junit.vespa.version>5.8.1</vespa.junit.vespa.version>
         <test.categories>!integration</test.categories>
 
         <!-- To allow specialized base pom to include additional "test provided" dependencies -->
@@ -98,19 +98,19 @@
             <dependency>
                 <groupId>org.junit.jupiter</groupId>
                 <artifactId>junit-jupiter-engine</artifactId>
-                <version>${vespa.junit.version}</version>
+                <version>${vespa.junit.vespa.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>org.junit.jupiter</groupId>
                 <artifactId>junit-jupiter-api</artifactId>
-                <version>${vespa.junit.version}</version>
+                <version>${vespa.junit.vespa.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>org.junit.vintage</groupId>
                 <artifactId>junit-vintage-engine</artifactId>
-                <version>${vespa.junit.version}</version>
+                <version>${vespa.junit.vespa.version}</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
@@ -163,7 +163,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>
-                        <version>${maven-surefire-plugin.version}</version>
+                        <version>${maven-surefire-plugin.vespa.version}</version>
                         <configuration>
                             <groups>${test.categories}</groups>
                             <redirectTestOutputToFile>false</redirectTestOutputToFile>
@@ -186,7 +186,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-report-plugin</artifactId>
-                        <version>${maven-surefire-plugin.version}</version>
+                        <version>${maven-surefire-plugin.vespa.version}</version>
                         <configuration>
                             <reportsDirectory>${env.TEST_DIR}</reportsDirectory>
                         </configuration>
@@ -245,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:(,${vespa.junit.version}):jar:*</exclude>
-                                                <exclude>org.junit.jupiter:junit-jupiter-api:(${vespa.junit.version},):jar:*</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>
                                             </excludes>
                                         </bannedDependencies>
                                     </rules>
@@ -377,7 +377,7 @@
                 </property>
             </activation>
             <properties>
-                <vespaversion>${vespa.compile.version}</vespaversion>
+                <vespaversion>${vespa.compile.vespa.version}</vespaversion>
             </properties>
         </profile>
 
@@ -389,7 +389,7 @@
                 </property>
             </activation>
             <properties>
-                <vespaVersion>${vespa.runtime.version}</vespaVersion>
+                <vespaVersion>${vespa.runtime.vespa.version}</vespaVersion>
             </properties>
         </profile>
         <profile>
@@ -404,7 +404,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>
@@ -424,7 +424,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>
@@ -452,7 +452,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-dependency-plugin</artifactId>
-                    <version>${maven-dependency-plugin.version}</version>
+                    <version>${maven-dependency-plugin.vespa.version}</version>
                 </plugin>
             </plugins>
         </pluginManagement>
@@ -460,7 +460,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>${maven-compiler-plugin.version}</version>
+                <version>${maven-compiler-plugin.vespa.version}</version>
                 <configuration>
                     <release>${target_jdk_version}</release>
                     <showWarnings>true</showWarnings>
diff --git a/orchestrator-restapi/pom.xml b/orchestrator-restapi/pom.xml
index 3b86309f66a..56a58666ab5 100644
--- a/orchestrator-restapi/pom.xml
+++ b/orchestrator-restapi/pom.xml
@@ -25,7 +25,7 @@
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-annotations</artifactId>
-      <version>${jackson2.version}</version>
+      <version>${jackson2.vespa.version}</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
diff --git a/orchestrator/pom.xml b/orchestrator/pom.xml
index bd9c7ed977a..3ec98af3565 100644
--- a/orchestrator/pom.xml
+++ b/orchestrator/pom.xml
@@ -107,7 +107,7 @@
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-annotations</artifactId>
-      <version>${jackson2.version}</version>
+      <version>${jackson2.vespa.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/parent/pom.xml b/parent/pom.xml
index e61161dd88a..e51c9620c58 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -40,7 +40,7 @@
             <extension>
                 <groupId>org.apache.maven.wagon</groupId>
                 <artifactId>wagon-ssh-external</artifactId>
-                <version>${maven-wagon.version}</version>
+                <version>${maven-wagon.vespa.version}</version>
             </extension>
             <extension>
                 <groupId>org.apache.maven.archetype</groupId>
@@ -53,7 +53,7 @@
                 <plugin>
                     <groupId>org.antlr</groupId>
                     <artifactId>antlr3-maven-plugin</artifactId>
-                    <version>${antlr.version}</version>
+                    <version>${antlr.vespa.version}</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -63,17 +63,17 @@
                 <plugin>
                     <groupId>org.apache.felix</groupId>
                     <artifactId>maven-bundle-plugin</artifactId>
-                    <version>${maven-bundle-plugin.version}</version>
+                    <version>${maven-bundle-plugin.vespa.version}</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-assembly-plugin</artifactId>
-                    <version>${maven-assembly-plugin.version}</version>
+                    <version>${maven-assembly-plugin.vespa.version}</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>${maven-compiler-plugin.version}</version>
+                    <version>${maven-compiler-plugin.vespa.version}</version>
                     <configuration>
                         <release>17</release>
                         <showWarnings>true</showWarnings>
@@ -90,12 +90,12 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-dependency-plugin</artifactId>
-                    <version>${maven-dependency-plugin.version}</version>
+                    <version>${maven-dependency-plugin.vespa.version}</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-deploy-plugin</artifactId>
-                    <version>${maven-deploy-plugin.version}</version>
+                    <version>${maven-deploy-plugin.vespa.version}</version>
                     <configuration>
                         <retryFailedDeploymentCount>10</retryFailedDeploymentCount>
                     </configuration>
@@ -103,22 +103,22 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-enforcer-plugin</artifactId>
-                    <version>${maven-enforcer-plugin.version}</version>
+                    <version>${maven-enforcer-plugin.vespa.version}</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-failsafe-plugin</artifactId>
-                    <version>${maven-failsafe-plugin.version}</version>
+                    <version>${maven-failsafe-plugin.vespa.version}</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-install-plugin</artifactId>
-                    <version>${maven-install-plugin.version}</version>
+                    <version>${maven-install-plugin.vespa.version}</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-jar-plugin</artifactId>
-                    <version>${maven-jar-plugin.version}</version>
+                    <version>${maven-jar-plugin.vespa.version}</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -131,12 +131,12 @@
                         <!-- TODO: remove this setting when the plugin looks for element-list (JDK 10+) instead of package-list. -->
                         <detectOfflineLinks>false</detectOfflineLinks>
                     </configuration>
-                    <version>${maven-javadoc-plugin.version}</version>
+                    <version>${maven-javadoc-plugin.vespa.version}</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-plugin-plugin</artifactId>
-                    <version>${maven-plugin-tools.version}</version>
+                    <version>${maven-plugin-tools.vespa.version}</version>
                     <configuration>
                         <!-- see http://jira.codehaus.org/browse/MNG-5346 -->
                         <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
@@ -153,7 +153,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-resources-plugin</artifactId>
-                    <version>${maven-resources-plugin.version}</version>
+                    <version>${maven-resources-plugin.vespa.version}</version>
                     <configuration>
                         <escapeString>\</escapeString>
                     </configuration>
@@ -161,7 +161,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-shade-plugin</artifactId>
-                    <version>${maven-shade-plugin.version}</version>
+                    <version>${maven-shade-plugin.vespa.version}</version>
                     <configuration>
                         <filters>
                             <filter>
@@ -190,12 +190,12 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-site-plugin</artifactId>
-                    <version>${maven-site-plugin.version}</version>
+                    <version>${maven-site-plugin.vespa.version}</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-source-plugin</artifactId>
-                    <version>${maven-source-plugin.version}</version>
+                    <version>${maven-source-plugin.vespa.version}</version>
                     <configuration>
                         <includePom>true</includePom>
                     </configuration>
@@ -203,7 +203,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>${surefire.version}</version>
+                    <version>${surefire.vespa.version}</version>
                     <configuration>
                         <redirectTestOutputToFile>${test.hide}</redirectTestOutputToFile>
                         <systemPropertyVariables>
@@ -218,7 +218,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-report-plugin</artifactId>
-                    <version>${surefire.version}</version>
+                    <version>${surefire.vespa.version}</version>
                     <configuration>
                         <alwaysGenerateSurefireReport>false</alwaysGenerateSurefireReport>
                         <showSuccess>false</showSuccess>
@@ -273,7 +273,7 @@
                                 <goal>run</goal>
                             </goals>
                             <configuration>
-                                <protocVersion>${protobuf.version}</protocVersion>
+                                <protocVersion>${protobuf.vespa.version}</protocVersion>
                                 <addSources>main</addSources>
                                 <outputDirectory>${project.build.directory}/generated-sources/protobuf</outputDirectory>
                                 <inputDirectories>
@@ -448,17 +448,17 @@
             <dependency>
                 <groupId>com.amazonaws</groupId>
                 <artifactId>aws-java-sdk-core</artifactId>
-                <version>${aws-sdk.version}</version>
+                <version>${aws-sdk.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.amazonaws</groupId>
                 <artifactId>aws-java-sdk-ssm</artifactId>
-                <version>${aws-sdk.version}</version>
+                <version>${aws-sdk.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.amazonaws</groupId>
                 <artifactId>aws-java-sdk-sts</artifactId>
-                <version>${aws-sdk.version}</version>
+                <version>${aws-sdk.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.auth0</groupId>
@@ -468,7 +468,7 @@
             <dependency>
                 <groupId>com.fasterxml.jackson.dataformat</groupId>
                 <artifactId>jackson-dataformat-cbor</artifactId>
-                <version>${jackson2.version}</version>
+                <version>${jackson2.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.github.cverges.expect4j</groupId>
@@ -478,7 +478,7 @@
             <dependency>
                 <groupId>org.apache.zookeeper</groupId>
                 <artifactId>zookeeper</artifactId>
-                <version>${zookeeper.client.version}</version>
+                <version>${zookeeper.client.vespa.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.slf4j</groupId>
@@ -506,17 +506,17 @@
             <dependency>
                 <groupId>com.github.tomakehurst</groupId>
                 <artifactId>wiremock-jre8-standalone</artifactId>
-                <version>${wiremock.version}</version>
+                <version>${wiremock.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.google.code.findbugs</groupId>
                 <artifactId>jsr305</artifactId>
-                <version>${findbugs.version}</version>
+                <version>${findbugs.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.google.guava</groupId>
                 <artifactId>guava</artifactId>
-                <version>${guava.version}</version>
+                <version>${guava.vespa.version}</version>
                 <exclusions>
                     <exclusion>
                         <!-- Annotations with retention Runtime. Remove exclusion and provide from jdisc_core if needed. -->
@@ -543,7 +543,7 @@
             <dependency>
                 <groupId>com.google.guava</groupId>
                 <artifactId>guava-testlib</artifactId>
-                <version>${guava.version}</version>
+                <version>${guava.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.google.jimfs</groupId>
@@ -554,7 +554,7 @@
             <dependency>
                 <groupId>com.google.protobuf</groupId>
                 <artifactId>protobuf-java</artifactId>
-                <version>${protobuf.version}</version>
+                <version>${protobuf.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.ibm.icu</groupId>
@@ -569,12 +569,12 @@
             <dependency>
                 <groupId>com.microsoft.onnxruntime</groupId>
                 <artifactId>onnxruntime</artifactId>
-                <version>${onnxruntime.version}</version>
+                <version>${onnxruntime.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.yahoo.athenz</groupId>
                 <artifactId>athenz-cert-refresher</artifactId>
-                <version>${athenz.version}</version>
+                <version>${athenz.vespa.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.bouncycastle</groupId>
@@ -585,7 +585,7 @@
             <dependency>
                 <groupId>com.yahoo.athenz</groupId>
                 <artifactId>athenz-zms-java-client</artifactId>
-                <version>${athenz.version}</version>
+                <version>${athenz.vespa.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.bouncycastle</groupId>
@@ -596,12 +596,12 @@
             <dependency>
                 <groupId>com.yahoo.athenz</groupId>
                 <artifactId>athenz-zpe-java-client</artifactId>
-                <version>${athenz.version}</version>
+                <version>${athenz.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.yahoo.athenz</groupId>
                 <artifactId>athenz-zts-java-client</artifactId>
-                <version>${athenz.version}</version>
+                <version>${athenz.vespa.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.bouncycastle</groupId>
@@ -612,7 +612,7 @@
             <dependency>
                 <groupId>commons-io</groupId>
                 <artifactId>commons-io</artifactId>
-                <version>${commons-io.version}</version>
+                <version>${commons-io.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.commons</groupId>
@@ -622,17 +622,17 @@
             <dependency>
                 <groupId>io.jsonwebtoken</groupId>
                 <artifactId>jjwt-api</artifactId>
-                <version>${jjwt.version}</version>
+                <version>${jjwt.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.jsonwebtoken</groupId>
                 <artifactId>jjwt-impl</artifactId>
-                <version>${jjwt.version}</version>
+                <version>${jjwt.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.jsonwebtoken</groupId>
                 <artifactId>jjwt-jackson</artifactId>
-                <version>${jjwt.version}</version>
+                <version>${jjwt.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>joda-time</groupId>
@@ -642,12 +642,12 @@
             <dependency>
                 <groupId>net.openhft</groupId>
                 <artifactId>zero-allocation-hashing</artifactId>
-                <version>${zero-allocation-hashing.version}</version>
+                <version>${zero-allocation-hashing.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-math3</artifactId>
-                <version>${commons.math3.version}</version>
+                <version>${commons.math3.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>commons-cli</groupId>
@@ -657,37 +657,37 @@
             <dependency>
                 <groupId>commons-codec</groupId>
                 <artifactId>commons-codec</artifactId>
-                <version>${commons-codec.version}</version>
+                <version>${commons-codec.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.airlift</groupId>
                 <artifactId>airline</artifactId>
-                <version>${airline.version}</version>
+                <version>${airline.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.netty</groupId>
                 <artifactId>netty-handler</artifactId>
-                <version>${netty.version}</version>
+                <version>${netty.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.netty</groupId>
                 <artifactId>netty-transport-native-epoll</artifactId>
-                <version>${netty.version}</version>
+                <version>${netty.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.netty</groupId>
                 <artifactId>netty-tcnative</artifactId>
-                <version>${netty-tcnative.version}</version>
+                <version>${netty-tcnative.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.prometheus</groupId>
                 <artifactId>simpleclient</artifactId>
-                <version>${prometheus.client.version}</version>
+                <version>${prometheus.client.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.prometheus</groupId>
                 <artifactId>simpleclient_common</artifactId>
-                <version>${prometheus.client.version}</version>
+                <version>${prometheus.client.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>junit</groupId>
@@ -697,7 +697,7 @@
             <dependency>
                 <groupId>net.java.dev.jna</groupId>
                 <artifactId>jna</artifactId>
-                <version>${jna.version}</version>
+                <version>${jna.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>net.spy</groupId>
@@ -707,17 +707,17 @@
             <dependency>
                 <groupId>org.antlr</groupId>
                 <artifactId>antlr-runtime</artifactId>
-                <version>${antlr.version}</version>
+                <version>${antlr.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.antlr</groupId>
                 <artifactId>antlr4-runtime</artifactId>
-                <version>${antlr4.version}</version>
+                <version>${antlr4.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.aries.spifly</groupId>
                 <artifactId>org.apache.aries.spifly.dynamic.bundle</artifactId>
-                <version>${spifly.version}</version>
+                <version>${spifly.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.commons</groupId>
@@ -732,17 +732,17 @@
             <dependency>
                 <groupId>org.apache.curator</groupId>
                 <artifactId>curator-recipes</artifactId>
-                <version>${curator.version}</version>
+                <version>${curator.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.curator</groupId>
                 <artifactId>curator-test</artifactId>
-                <version>${curator.version}</version>
+                <version>${curator.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpclient</artifactId>
-                <version>${apache.httpclient.version}</version>
+                <version>${apache.httpclient.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.commons</groupId>
@@ -752,7 +752,7 @@
             <dependency>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>org.apache.felix.framework</artifactId>
-                <version>${felix.version}</version>
+                <version>${felix.vespa.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.codehaus.mojo</groupId>
@@ -763,67 +763,67 @@
             <dependency>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>org.apache.felix.log</artifactId>
-                <version>${felix.log.version}</version>
+                <version>${felix.log.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpcore</artifactId>
-                <version>${apache.httpcore.version}</version>
+                <version>${apache.httpcore.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.httpcomponents.client5</groupId>
                 <artifactId>httpclient5</artifactId>
-                <version>${apache.httpclient5.version}</version>
+                <version>${apache.httpclient5.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.httpcomponents.core5</groupId>
                 <artifactId>httpcore5</artifactId>
-                <version>${apache.httpcore5.version}</version>
+                <version>${apache.httpcore5.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.httpcomponents.core5</groupId>
                 <artifactId>httpcore5-h2</artifactId>
-                <version>${apache.httpcore5.version}</version>
+                <version>${apache.httpcore5.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpmime</artifactId>
-                <version>${apache.httpclient.version}</version>
+                <version>${apache.httpclient.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.maven</groupId>
                 <artifactId>maven-archiver</artifactId>
-                <version>${maven-archiver.version}</version>
+                <version>${maven-archiver.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.maven</groupId>
                 <artifactId>maven-artifact</artifactId>
-                <version>${maven-core.version}</version>
+                <version>${maven-core.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.maven</groupId>
                 <artifactId>maven-core</artifactId>
-                <version>${maven-core.version}</version>
+                <version>${maven-core.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.maven</groupId>
                 <artifactId>maven-model</artifactId>
-                <version>${maven-core.version}</version>
+                <version>${maven-core.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.maven</groupId>
                 <artifactId>maven-repository-metadata</artifactId>
-                <version>${maven-core.version}</version>
+                <version>${maven-core.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.maven</groupId>
                 <artifactId>maven-settings</artifactId>
-                <version>${maven-core.version}</version>
+                <version>${maven-core.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.maven</groupId>
                 <artifactId>maven-plugin-api</artifactId>
-                <version>${maven-plugin-api.version}</version>
+                <version>${maven-plugin-api.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.maven</groupId>
@@ -833,17 +833,17 @@
             <dependency>
                 <groupId>org.apache.maven.enforcer</groupId>
                 <artifactId>enforcer-api</artifactId>
-                <version>${maven-enforcer-plugin.version}</version>
+                <version>${maven-enforcer-plugin.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.maven.plugin-tools</groupId>
                 <artifactId>maven-plugin-annotations</artifactId>
-                <version>${maven-plugin-tools.version}</version>
+                <version>${maven-plugin-tools.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>${maven-jar-plugin.version}</version>
+                <version>${maven-jar-plugin.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.maven.shared</groupId>
@@ -853,23 +853,23 @@
             <dependency>
                 <groupId>org.apache.maven.surefire</groupId>
                 <artifactId>surefire-junit4</artifactId>
-                <version>${surefire.version}</version>
+                <version>${surefire.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.maven.surefire</groupId>
                 <artifactId>surefire-providers</artifactId>
-                <version>${surefire.version}</version>
+                <version>${surefire.vespa.version}</version>
                 <type>pom</type>
             </dependency>
             <dependency>
                 <groupId>org.apache.maven.wagon</groupId>
                 <artifactId>wagon-ssh-external</artifactId>
-                <version>${maven-wagon.version}</version>
+                <version>${maven-wagon.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.maven.wagon</groupId>
                 <artifactId>wagon-provider-api</artifactId>
-                <version>${maven-wagon.version}</version>
+                <version>${maven-wagon.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.opennlp</groupId>
@@ -894,17 +894,17 @@
             <dependency>
                 <groupId>org.bouncycastle</groupId>
                 <artifactId>bcpkix-jdk18on</artifactId>
-                <version>${bouncycastle.version}</version>
+                <version>${bouncycastle.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.bouncycastle</groupId>
                 <artifactId>bcprov-jdk18on</artifactId>
-                <version>${bouncycastle.version}</version>
+                <version>${bouncycastle.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.bouncycastle</groupId>
                 <artifactId>bcutil-jdk18on</artifactId>
-                <version>${bouncycastle.version}</version>
+                <version>${bouncycastle.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.cthul</groupId>
@@ -915,77 +915,77 @@
             <dependency>
                 <groupId>org.eclipse.collections</groupId>
                 <artifactId>eclipse-collections</artifactId>
-                <version>${eclipse-collections.version}</version>
+                <version>${eclipse-collections.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.eclipse.collections</groupId>
                 <artifactId>eclipse-collections-api</artifactId>
-                <version>${eclipse-collections.version}</version>
+                <version>${eclipse-collections.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.eclipse.jetty.http2</groupId>
                 <artifactId>http2-common</artifactId>
-                <version>${jetty.version}</version>
+                <version>${jetty.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.eclipse.jetty.http2</groupId>
                 <artifactId>http2-http-client-transport</artifactId>
-                <version>${jetty.version}</version>
+                <version>${jetty.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.eclipse.jetty.http2</groupId>
                 <artifactId>http2-server</artifactId>
-                <version>${jetty.version}</version>
+                <version>${jetty.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-alpn-java-server</artifactId>
-                <version>${jetty.version}</version>
+                <version>${jetty.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-alpn-server</artifactId>
-                <version>${jetty.version}</version>
+                <version>${jetty.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-client</artifactId>
-                <version>${jetty.version}</version>
+                <version>${jetty.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-http</artifactId>
-                <version>${jetty.version}</version>
+                <version>${jetty.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-io</artifactId>
-                <version>${jetty.version}</version>
+                <version>${jetty.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-jmx</artifactId>
-                <version>${jetty.version}</version>
+                <version>${jetty.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-server</artifactId>
-                <version>${jetty.version}</version>
+                <version>${jetty.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-servlet</artifactId>
-                <version>${jetty.version}</version>
+                <version>${jetty.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-util</artifactId>
-                <version>${jetty.version}</version>
+                <version>${jetty.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.eclipse.jetty.toolchain</groupId>
                 <artifactId>jetty-jakarta-servlet-api</artifactId>
-                <version>${jetty-servlet-api.version}</version>
+                <version>${jetty-servlet-api.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.glassfish.jaxb</groupId>
@@ -1013,32 +1013,32 @@
             <dependency>
                 <groupId>org.hdrhistogram</groupId>
                 <artifactId>HdrHistogram</artifactId>
-                <version>${hdrhistogram.version}</version>
+                <version>${hdrhistogram.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.junit.jupiter</groupId>
                 <artifactId>junit-jupiter</artifactId>
-                <version>${junit.version}</version>
+                <version>${junit.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.junit.jupiter</groupId>
                 <artifactId>junit-jupiter-api</artifactId>
-                <version>${junit.version}</version>
+                <version>${junit.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.junit.jupiter</groupId>
                 <artifactId>junit-jupiter-engine</artifactId>
-                <version>${junit.version}</version>
+                <version>${junit.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.junit.jupiter</groupId>
                 <artifactId>junit-jupiter-params</artifactId>
-                <version>${junit.version}</version>
+                <version>${junit.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.junit.vintage</groupId>
                 <artifactId>junit-vintage-engine</artifactId>
-                <version>${junit.version}</version>
+                <version>${junit.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.jvnet.mimepull</groupId>
@@ -1048,12 +1048,12 @@
             <dependency>
                 <groupId>org.lz4</groupId>
                 <artifactId>lz4-java</artifactId>
-                <version>${org.lz4.version}</version>
+                <version>${org.lz4.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.mockito</groupId>
                 <artifactId>mockito-core</artifactId>
-                <version>${mockito.version}</version>
+                <version>${mockito.vespa.version}</version>
                 <scope>test</scope> <!-- TODO: remove scope from parent pom -->
             </dependency>
             <dependency>
@@ -1068,27 +1068,27 @@
             <dependency>
                 <groupId>org.ow2.asm</groupId>
                 <artifactId>asm</artifactId>
-                <version>${asm.version}</version>
+                <version>${asm.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.ow2.asm</groupId>
                 <artifactId>asm-analysis</artifactId>
-                <version>${asm.version}</version>
+                <version>${asm.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.ow2.asm</groupId>
                 <artifactId>asm-commons</artifactId>
-                <version>${asm.version}</version>
+                <version>${asm.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.ow2.asm</groupId>
                 <artifactId>asm-tree</artifactId>
-                <version>${asm.version}</version>
+                <version>${asm.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.ow2.asm</groupId>
                 <artifactId>asm-util</artifactId>
-                <version>${asm.version}</version>
+                <version>${asm.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.twdata.maven</groupId>
@@ -1119,7 +1119,7 @@
             <dependency> <!-- TODO: Remove on Vespa 9 -->
                 <groupId>org.json</groupId>
                 <artifactId>json</artifactId>
-                <version>${org.json.version}</version>
+                <version>${org.json.vespa.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.google.errorprone</groupId>
diff --git a/service-monitor/pom.xml b/service-monitor/pom.xml
index 039e9dbf5fa..f119dcdae5f 100644
--- a/service-monitor/pom.xml
+++ b/service-monitor/pom.xml
@@ -93,7 +93,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
-            <version>${jackson2.version}</version>
+            <version>${jackson2.vespa.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/vespa-athenz/pom.xml b/vespa-athenz/pom.xml
index a6f83fb102f..7c3c982af84 100644
--- a/vespa-athenz/pom.xml
+++ b/vespa-athenz/pom.xml
@@ -141,7 +141,7 @@
         <dependency>
             <groupId>com.yahoo.athenz</groupId>
             <artifactId>athenz-auth-core</artifactId>
-            <version>${athenz.version}</version>
+            <version>${athenz.vespa.version}</version>
             <scope>compile</scope>
             <exclusions>
                 <exclusion>
diff --git a/zookeeper-command-line-client/pom.xml b/zookeeper-command-line-client/pom.xml
index 7bbbf33a62f..00545192491 100644
--- a/zookeeper-command-line-client/pom.xml
+++ b/zookeeper-command-line-client/pom.xml
@@ -41,7 +41,7 @@
       <!-- Bind to slf4j's SimpleLogger -->
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
-      <version>${slf4j.version}</version>
+      <version>${slf4j.vespa.version}</version>
     </dependency>
     <dependency>
       <!-- slf4j's replacement for log4j. See http://www.slf4j.org/legacy.html#log4j-over-slf4j -->
-- 
cgit v1.2.3