Use explicit version tag to control javax-activation and javax-activation-api

3 files changed, 5 insertions, 3 deletions

diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml
index bd1cbf8fcf6..8eaa961922d 100644
--- a/container-dependency-versions/pom.xml
+++ b/container-dependency-versions/pom.xml
@@ -124,7 +124,7 @@
                 <!-- TODO Vespa 9: stop exporting/providing and move to parent? -->
                 <groupId>com.sun.activation</groupId>
                 <artifactId>javax.activation</artifactId>
-                <version>1.2.0</version>
+                <version>${sun.javax.activation.vespa.version}</version>
             </dependency>
             <!-- jaxb end -->
 
diff --git a/dependency-versions/pom.xml b/dependency-versions/pom.xml
index 9ce3fdc134d..383e7d78ea6 100644
--- a/dependency-versions/pom.xml
+++ b/dependency-versions/pom.xml
@@ -40,6 +40,7 @@
         <jackson2.vespa.version>2.16.2</jackson2.vespa.version>
         <jackson-databind.vespa.version>${jackson2.vespa.version}</jackson-databind.vespa.version>
         <jakarta.inject.vespa.version>2.0.1</jakarta.inject.vespa.version>
+        <javax.activation-api.vespa.version>1.2.0</javax.activation-api.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.1.1</javax.ws.rs-api.vespa.version>
@@ -47,6 +48,7 @@
         <jaxb-core.vespa.version>2.3.0.1</jaxb-core.vespa.version>
         <jaxb-impl.vespa.version>2.3.0</jaxb-impl.vespa.version>
         <slf4j.vespa.version>1.7.36</slf4j.vespa.version>
+        <sun.javax.activation.vespa.version>1.2.0</sun.javax.activation.vespa.version>
 
         <!-- END Dependencies available from the Jdisc container -->
 
diff --git a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
index fd7baf675b6..1ad000b6830 100644
--- a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
+++ b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
@@ -31,7 +31,7 @@ com.google.protobuf:protobuf-java:${protobuf.vespa.version}
 com.ibm.icu:icu4j:${icu4j.vespa.version}
 com.microsoft.onnxruntime:onnxruntime:${onnxruntime.vespa.version}
 de.kherud:llama:${kherud.llama.vespa.version}
-com.sun.activation:javax.activation:1.2.0
+com.sun.activation:javax.activation:${sun.javax.activation.vespa.version}
 com.sun.istack:istack-commons-runtime:4.1.2
 com.sun.xml.bind:jaxb-core:${jaxb-core.vespa.version}
 com.sun.xml.bind:jaxb-impl:${jaxb-impl.vespa.version}
@@ -74,7 +74,7 @@ io.prometheus:simpleclient_tracer_common:${prometheus.client.vespa.version}
 io.prometheus:simpleclient_tracer_otel:${prometheus.client.vespa.version}
 io.prometheus:simpleclient_tracer_otel_agent:${prometheus.client.vespa.version}
 jakarta.inject:jakarta.inject-api:${jakarta.inject.vespa.version}
-javax.activation:javax.activation-api:1.2.0
+javax.activation:javax.activation-api:${javax.activation-api.vespa.version}
 javax.annotation:javax.annotation-api:${javax.annotation.vespa.version}
 javax.inject:javax.inject:${javax.inject.vespa.version}
 javax.servlet:javax.servlet-api:${javax.servlet-api.vespa.version}