From 0475e2249457b728c884f14ff1bb221ec8c22e3b Mon Sep 17 00:00:00 2001
From: jsimomaa <jani.simomaa@gmail.com>
Date: Mon, 20 Apr 2020 09:50:31 +0300
Subject: [PATCH] Revert jersey 2.25.1 and jackson 2.8.11 back for
 javax.xml.bind

* Also remove jakarta from target platform until we use JDK11

gitlab #486

Change-Id: I4e2d342f5429884df79c256d1153f1275c04f1e2
---
 .../org.simantics.sdk.build.p2.site/pom.xml   | 91 ++-----------------
 1 file changed, 10 insertions(+), 81 deletions(-)

diff --git a/releng/org.simantics.sdk.build.p2.site/pom.xml b/releng/org.simantics.sdk.build.p2.site/pom.xml
index 9c3e9fae3..c5f83c3fd 100644
--- a/releng/org.simantics.sdk.build.p2.site/pom.xml
+++ b/releng/org.simantics.sdk.build.p2.site/pom.xml
@@ -18,15 +18,12 @@
         <jaxen.version>1.2.0</jaxen.version>
         <jdom.version>2.0.6</jdom.version>
         <jdom.version.actual>2.0.6.b0001</jdom.version.actual>
-        <jackson.version>2.10.2</jackson.version>
-        <jackson.version.actual>2.10.2.b0001</jackson.version.actual>
+        <jackson.version>2.8.11</jackson.version>
+        <jackson.version.actual>2.8.11</jackson.version.actual>
         <javax.version>3.1.0</javax.version>
-        <jakarta.version>2.1.6</jakarta.version>
-        <!-- This can be removed once jakarta version is bumped -->
-        <jakarta.version.actual>2.1.6.b0005</jakarta.version.actual>
-        <jersey.version>2.30.1</jersey.version>
+        <jersey.version>2.25.1</jersey.version>
         <!-- This can be removed once jersey version is bumped -->
-        <jersey.version.actual>2.30.1.b0005</jersey.version.actual>
+        <jersey.version.actual>2.25.1.b0006</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>
@@ -449,40 +446,13 @@
                                      <id>org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:${org.apache.aries.spifly.dynamic.bundle.version}</id>
                                      <source>true</source>
                                  </artifact>
-                                <artifact>
-                                    <id>jakarta.ws.rs:jakarta.ws.rs-api:${jakarta.version}</id>
-                                    <source>true</source>
-                                    <override>true</override>
-                                    <instructions>
-                                        <Bundle-Version>${jakarta.version.actual}</Bundle-Version>
-                                        <Require-Bundle>
-                                             jakarta.xml.bind-api
-                                        </Require-Bundle>
-                                        <Import-Package>!javax.*,*;resolution:=optional</Import-Package>
-                                        <Export-Package>
-                                            javax.ws.rs;version="${jakarta.version}",
-                                            javax.ws.rs.core;version="${jakarta.version}",
-                                            javax.ws.rs.ext;version="${jakarta.version}",
-                                            javax.ws.rs.client;version="${jakarta.version}",
-                                            javax.ws.rs.container;version="${jakarta.version}",
-                                            javax.ws.rs.sse;version="${jakarta.version}"
-                                        </Export-Package>
-                                    </instructions>
-                                </artifact>
                                 <artifact>
                                     <id>org.glassfish.jersey.core:jersey-common:${jersey.version}</id>
                                     <source>true</source>
                                     <override>true</override>
                                     <instructions>
                                         <Bundle-Version>${jersey.version.actual}</Bundle-Version>
-                                        <Require-Bundle>
-                                             javax.annotation,
-                                             javax.inject,
-                                             jakarta.validation.jakarta.validation-api,
-                                             jakarta.ws.rs-api,
-                                             jakarta.xml.bind-api
-                                        </Require-Bundle>
-                                        <Import-Package>!javax.*,*;resolution:=optional</Import-Package>
+                                        <Import-Package>*;resolution:=optional</Import-Package>
                                         <Export-Package>
                                             org.glassfish.jersey.*;version="${jersey.version}"
                                         </Export-Package>
@@ -494,14 +464,7 @@
                                     <override>true</override>
                                     <instructions>
                                         <Bundle-Version>${jersey.version.actual}</Bundle-Version>
-                                        <Require-Bundle>
-                                             javax.annotation,
-                                             javax.inject,
-                                             jakarta.validation.jakarta.validation-api,
-                                             jakarta.ws.rs-api,
-                                             jakarta.xml.bind-api
-                                        </Require-Bundle>
-                                        <Import-Package>!javax.*,*;resolution:=optional</Import-Package>
+                                        <Import-Package>*;resolution:=optional</Import-Package>
                                     </instructions>
                                 </artifact>
                                 <artifact>
@@ -510,29 +473,13 @@
                                     <override>true</override>
                                     <instructions>
                                         <Bundle-Version>${jersey.version.actual}</Bundle-Version>
-                                        <Require-Bundle>
-                                             javax.annotation,
-                                             javax.inject,
-                                             jakarta.validation.jakarta.validation-api,
-                                             jakarta.ws.rs-api,
-                                             jakarta.xml.bind-api
-                                        </Require-Bundle>
-                                        <Import-Package>!javax.*,*;resolution:=optional</Import-Package>
+                                        <Import-Package>*;resolution:=optional</Import-Package>
                                     </instructions>
                                 </artifact>
                                 
                                 <artifact>
                                     <id>org.glassfish.jersey.media:jersey-media-multipart:${jersey.version}</id>
                                     <source>true</source>
-                                    <!-- For some reason p2-maven-plugin does not work with the below plugin and only generates sources for that -->
-                                    <!-- <override>true</override>
-                                    <instructions>
-                                        <Bundle-Version>${jersey.version.actual}</Bundle-Version>
-                                        <Require-Bundle>
-                                             jakarta.ws.rs-api,
-                                        </Require-Bundle>
-                                        <Import-Package>!javax.*,*;resolution:=optional</Import-Package>
-                                    </instructions> -->
                                 </artifact>
                                 <artifact>
                                     <id>org.glassfish.jersey.ext:jersey-entity-filtering:${jersey.version}</id>
@@ -540,11 +487,7 @@
                                     <override>true</override>
                                     <instructions>
                                         <Bundle-Version>${jersey.version.actual}</Bundle-Version>
-                                        <Require-Bundle>
-                                             jakarta.ws.rs-api,
-                                             org.glassfish.jersey.core.jersey-server
-                                        </Require-Bundle>
-                                        <Import-Package>!javax.*,*;resolution:=optional</Import-Package>
+                                        <Import-Package>*;resolution:=optional</Import-Package>
                                     </instructions>
                                 </artifact>
                                 <artifact>
@@ -556,14 +499,7 @@
                                     </excludes>
                                     <instructions>
                                         <Bundle-Version>${jersey.version.actual}</Bundle-Version>
-                                        <Require-Bundle>
-                                             javax.annotation,
-                                             javax.inject,
-                                             jakarta.validation.jakarta.validation-api,
-                                             jakarta.ws.rs-api,
-                                             jakarta.xml.bind-api
-                                        </Require-Bundle>
-                                        <Import-Package>!javax.*,*;resolution:=optional</Import-Package>
+                                        <Import-Package>*;resolution:=optional</Import-Package>
                                     </instructions>
                                 </artifact>
                                 <artifact>
@@ -572,14 +508,7 @@
                                     <override>true</override>
                                     <instructions>
                                         <Bundle-Version>${jersey.version.actual}</Bundle-Version>
-                                        <Require-Bundle>
-                                             javax.annotation,
-                                             javax.inject,
-                                             jakarta.validation.jakarta.validation-api,
-                                             jakarta.ws.rs-api,
-                                             jakarta.xml.bind-api
-                                        </Require-Bundle>
-                                        <Import-Package>!javax.*,*;resolution:=optional</Import-Package>
+                                        <Import-Package>*;resolution:=optional</Import-Package>
                                     </instructions>
                                 </artifact>
                                 <artifact>
-- 
2.47.1