aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2023-08-29 14:05:55 +0200
committerHenning Baldersheim <balder@yahoo-inc.com>2023-08-29 14:05:55 +0200
commit93d8df281c0f9dd29e8fd03e2a58d55b4fab9579 (patch)
treed468809a9ee92700dddbadd8d72b5e727a478a47
parent25adbdafef9b9348ec03b7babef59512c304d3bb (diff)
Exclude jakarta.activation
-rw-r--r--vespa-athenz/pom.xml4
-rw-r--r--vespa-dependencies-enforcer/allowed-maven-dependencies.txt1
2 files changed, 4 insertions, 1 deletions
diff --git a/vespa-athenz/pom.xml b/vespa-athenz/pom.xml
index 66b369f00fe..2a500f32f72 100644
--- a/vespa-athenz/pom.xml
+++ b/vespa-athenz/pom.xml
@@ -158,6 +158,10 @@
<artifactId>jakarta.activation-api</artifactId>
</exclusion>
<exclusion>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>jakarta.activation</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
</exclusion>
diff --git a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
index 2e53c97ea09..4d2f52369ec 100644
--- a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
+++ b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
@@ -42,7 +42,6 @@ com.google.protobuf:protobuf-java:3.24.2
com.ibm.icu:icu4j:73.2
com.intellij:annotations:9.0.4
com.microsoft.onnxruntime:onnxruntime:1.15.1
-com.sun.activation:jakarta.activation:1.2.2
com.sun.activation:javax.activation:1.2.0
com.sun.istack:istack-commons-runtime:3.0.12
com.sun.xml.bind:jaxb-core:2.3.0