aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Marius Venstad <jonmv@users.noreply.github.com>2021-05-07 16:06:17 +0200
committerGitHub <noreply@github.com>2021-05-07 16:06:17 +0200
commit3bfc801c8ab14e9a96d69cdbd46b2083bf134549 (patch)
treec3bed641ce8629a4085ed38bddc573ee477c731f
parent66da407bb26a9a09ffb2142eb82e4eef27ff0698 (diff)
Revert "Do not deploy or install jakarta jars."
-rw-r--r--container-disc/pom.xml2
-rw-r--r--dist/vespa.spec2
2 files changed, 4 insertions, 0 deletions
diff --git a/container-disc/pom.xml b/container-disc/pom.xml
index ae2e460094b..f87148fabaa 100644
--- a/container-disc/pom.xml
+++ b/container-disc/pom.xml
@@ -220,6 +220,8 @@
jackson-jaxrs-base-${jackson2.version}.jar,
jackson-jaxrs-json-provider-${jackson2.version}.jar,
jackson-module-jaxb-annotations-${jackson2.version}.jar,
+ jakarta.activation-api-1.2.1.jar,
+ jakarta.xml.bind-api-2.3.2.jar,
javassist-${javassist.version}.jar,
javax.ws.rs-api-${javax.ws.rs-api.version}.jar,
jersey-client-${jersey2.version}.jar,
diff --git a/dist/vespa.spec b/dist/vespa.spec
index 9a4f8763cd0..c9c81cf870a 100644
--- a/dist/vespa.spec
+++ b/dist/vespa.spec
@@ -721,6 +721,8 @@ fi
%{_prefix}/lib/jars/hk2-*.jar
%{_prefix}/lib/jars/hosted-zone-api-jar-with-dependencies.jar
%{_prefix}/lib/jars/jackson-*.jar
+%{_prefix}/lib/jars/jakarta.activation-api-*.jar
+%{_prefix}/lib/jars/jakarta.xml.bind-api-*.jar
%{_prefix}/lib/jars/javassist-*.jar
%{_prefix}/lib/jars/javax.*.jar
%{_prefix}/lib/jars/jdisc-cloud-aws-jar-with-dependencies.jar