From 06e2031b5a2882d27617e95ba346837f1a24f6e6 Mon Sep 17 00:00:00 2001
From: jsimomaa <jani.simomaa@gmail.com>
Date: Thu, 16 Apr 2020 23:47:46 +0300
Subject: [PATCH] Jersey bundles require jakarta.activation-api to work

gitlab #486

Change-Id: I889cce9c365f9f3b158fdc230aa66a213b6e39a4
---
 .../org.simantics.sdk.build.p2.site/pom.xml   | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/releng/org.simantics.sdk.build.p2.site/pom.xml b/releng/org.simantics.sdk.build.p2.site/pom.xml
index 96acab029..1b94b1134 100644
--- a/releng/org.simantics.sdk.build.p2.site/pom.xml
+++ b/releng/org.simantics.sdk.build.p2.site/pom.xml
@@ -481,7 +481,8 @@
                                              javax.servlet-api,
                                              jakarta.validation.jakarta.validation-api,
                                              jakarta.ws.rs-api,
-                                             jakarta.xml.bind-api
+                                             jakarta.xml.bind-api,
+                                             jakarta.activation-api
                                         </Require-Bundle>
                                         <Import-Package>!javax.*,*;resolution:=optional</Import-Package>
                                         <Export-Package>
@@ -501,7 +502,8 @@
                                              javax.servlet-api,
                                              jakarta.validation.jakarta.validation-api,
                                              jakarta.ws.rs-api,
-                                             jakarta.xml.bind-api
+                                             jakarta.xml.bind-api,
+                                             jakarta.activation-api
                                         </Require-Bundle>
                                         <Import-Package>!javax.*,*;resolution:=optional</Import-Package>
                                     </instructions>
@@ -518,7 +520,8 @@
                                              javax.servlet-api,
                                              jakarta.validation.jakarta.validation-api,
                                              jakarta.ws.rs-api,
-                                             jakarta.xml.bind-api
+                                             jakarta.xml.bind-api,
+                                             jakarta.activation-api
                                         </Require-Bundle>
                                         <Import-Package>!javax.*,*;resolution:=optional</Import-Package>
                                     </instructions>
@@ -545,6 +548,7 @@
                                         <Bundle-Version>${jersey.version.actual}</Bundle-Version>
                                         <Require-Bundle>
                                              jakarta.ws.rs-api,
+                                             jakarta.activation-api,
                                              javax.servlet-api,
                                              org.glassfish.jersey.core.jersey-server
                                         </Require-Bundle>
@@ -566,7 +570,8 @@
                                              javax.servlet-api,
                                              jakarta.validation.jakarta.validation-api,
                                              jakarta.ws.rs-api,
-                                             jakarta.xml.bind-api
+                                             jakarta.xml.bind-api,
+                                             jakarta.activation-api
                                         </Require-Bundle>
                                         <Import-Package>!javax.*,*;resolution:=optional</Import-Package>
                                     </instructions>
@@ -583,7 +588,8 @@
                                              javax.servlet-api,
                                              jakarta.validation.jakarta.validation-api,
                                              jakarta.ws.rs-api,
-                                             jakarta.xml.bind-api
+                                             jakarta.xml.bind-api,
+                                             jakarta.activation-api
                                         </Require-Bundle>
                                         <Import-Package>!javax.*,*;resolution:=optional</Import-Package>
                                     </instructions>
@@ -600,7 +606,8 @@
                                              javax.servlet-api,
                                              jakarta.validation.jakarta.validation-api,
                                              jakarta.ws.rs-api,
-                                             jakarta.xml.bind-api
+                                             jakarta.xml.bind-api,
+                                             jakarta.activation-api
                                         </Require-Bundle>
                                         <Import-Package>!javax.*,*;resolution:=optional</Import-Package>
                                     </instructions>
-- 
2.43.2