From: jsimomaa <jani.simomaa@gmail.com>
Date: Thu, 16 Apr 2020 23:04:28 +0000 (+0300)
Subject: Do not require bundles in jersey but make package imports optional
X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=36dd2a29553f86a274f84b9cb36bb66d8e4dd10b

Do not require bundles in jersey but make package imports optional

gitlab #486

Change-Id: I2ed718fe7fdd94152677db2aae688a1cb46d9247
---

diff --git a/releng/org.simantics.sdk.build.p2.site/pom.xml b/releng/org.simantics.sdk.build.p2.site/pom.xml
index 8528800c2..9534f71fb 100644
--- a/releng/org.simantics.sdk.build.p2.site/pom.xml
+++ b/releng/org.simantics.sdk.build.p2.site/pom.xml
@@ -28,7 +28,7 @@
         <jakarta.version.actual>2.1.6.b0005</jakarta.version.actual>
         <jersey.version>2.30.1</jersey.version>
         <!-- This can be removed once jersey version is bumped -->
-        <jersey.version.actual>2.30.1.b0007</jersey.version.actual>
+        <jersey.version.actual>2.30.1.b0008</jersey.version.actual>
         <jfreechart.version>1.5.0</jfreechart.version>
         <slf4j.version>1.7.30</slf4j.version>
         <slf4j.version.actual>1.7.30</slf4j.version.actual>
@@ -486,7 +486,7 @@
                                     <override>true</override>
                                     <instructions>
                                         <Bundle-Version>${jersey.version.actual}</Bundle-Version>
-                                        <Require-Bundle>
+                                        <!-- <Require-Bundle>
                                              javax.annotation,
                                              javax.inject,
                                              javax.servlet-api,
@@ -494,8 +494,8 @@
                                              jakarta.ws.rs-api,
                                              jakarta.xml.bind-api,
                                              jakarta.activation-api
-                                        </Require-Bundle>
-                                        <Import-Package>!javax.*,*;resolution:=optional</Import-Package>
+                                        </Require-Bundle> -->
+                                        <Import-Package>*;resolution:=optional</Import-Package>
                                         <Export-Package>
                                             org.glassfish.jersey.*;version="${jersey.version}"
                                         </Export-Package>
@@ -507,7 +507,7 @@
                                     <override>true</override>
                                     <instructions>
                                         <Bundle-Version>${jersey.version.actual}</Bundle-Version>
-                                        <Require-Bundle>
+                                        <!-- <Require-Bundle>
                                              javax.annotation,
                                              javax.inject,
                                              javax.servlet-api,
@@ -515,8 +515,8 @@
                                              jakarta.ws.rs-api,
                                              jakarta.xml.bind-api,
                                              jakarta.activation-api
-                                        </Require-Bundle>
-                                        <Import-Package>!javax.*,*;resolution:=optional</Import-Package>
+                                        </Require-Bundle> -->
+                                        <Import-Package>*;resolution:=optional</Import-Package>
                                     </instructions>
                                 </artifact>
                                 <artifact>
@@ -525,7 +525,7 @@
                                     <override>true</override>
                                     <instructions>
                                         <Bundle-Version>${jersey.version.actual}</Bundle-Version>
-                                        <Require-Bundle>
+                                        <!-- <Require-Bundle>
                                              javax.annotation,
                                              javax.inject,
                                              javax.servlet-api,
@@ -533,8 +533,8 @@
                                              jakarta.ws.rs-api,
                                              jakarta.xml.bind-api,
                                              jakarta.activation-api
-                                        </Require-Bundle>
-                                        <Import-Package>!javax.*,*;resolution:=optional</Import-Package>
+                                        </Require-Bundle> -->
+                                        <Import-Package>*;resolution:=optional</Import-Package>
                                     </instructions>
                                 </artifact>
                                 
@@ -557,13 +557,13 @@
                                     <override>true</override>
                                     <instructions>
                                         <Bundle-Version>${jersey.version.actual}</Bundle-Version>
-                                        <Require-Bundle>
+                                        <!-- <Require-Bundle>
                                              jakarta.ws.rs-api,
                                              jakarta.activation-api,
                                              javax.servlet-api,
                                              org.glassfish.jersey.core.jersey-server
-                                        </Require-Bundle>
-                                        <Import-Package>!javax.*,*;resolution:=optional</Import-Package>
+                                        </Require-Bundle> -->
+                                        <Import-Package>*;resolution:=optional</Import-Package>
                                     </instructions>
                                 </artifact>
                                 <artifact>
@@ -575,7 +575,7 @@
                                     </excludes>
                                     <instructions>
                                         <Bundle-Version>${jersey.version.actual}</Bundle-Version>
-                                        <Require-Bundle>
+                                        <!-- <Require-Bundle>
                                              javax.annotation,
                                              javax.inject,
                                              javax.servlet-api,
@@ -583,8 +583,8 @@
                                              jakarta.ws.rs-api,
                                              jakarta.xml.bind-api,
                                              jakarta.activation-api
-                                        </Require-Bundle>
-                                        <Import-Package>!javax.*,*;resolution:=optional</Import-Package>
+                                        </Require-Bundle> -->
+                                        <Import-Package>*;resolution:=optional</Import-Package>
                                     </instructions>
                                 </artifact>
                                 <artifact>
@@ -593,7 +593,7 @@
                                     <override>true</override>
                                     <instructions>
                                         <Bundle-Version>${jersey.version.actual}</Bundle-Version>
-                                        <Require-Bundle>
+                                        <!-- <Require-Bundle>
                                              javax.annotation,
                                              javax.inject,
                                              javax.servlet-api,
@@ -601,8 +601,8 @@
                                              jakarta.ws.rs-api,
                                              jakarta.xml.bind-api,
                                              jakarta.activation-api
-                                        </Require-Bundle>
-                                        <Import-Package>!javax.*,*;resolution:=optional</Import-Package>
+                                        </Require-Bundle> -->
+                                        <Import-Package>*;resolution:=optional</Import-Package>
                                     </instructions>
                                 </artifact>
                                 <artifact>
@@ -611,7 +611,7 @@
                                     <override>true</override>
                                     <instructions>
                                         <Bundle-Version>${jersey.version.actual}</Bundle-Version>
-                                        <Require-Bundle>
+                                        <!-- <Require-Bundle>
                                              javax.annotation,
                                              javax.inject,
                                              javax.servlet-api,
@@ -619,8 +619,8 @@
                                              jakarta.ws.rs-api,
                                              jakarta.xml.bind-api,
                                              jakarta.activation-api
-                                        </Require-Bundle>
-                                        <Import-Package>!javax.*,*;resolution:=optional</Import-Package>
+                                        </Require-Bundle> -->
+                                        <Import-Package>*;resolution:=optional</Import-Package>
                                     </instructions>
                                 </artifact>
                                 <artifact>