From: jsimomaa <jani.simomaa@gmail.com>
Date: Fri, 28 Feb 2020 07:00:45 +0000 (+0200)
Subject: Update rest of external components & explicitly export javax.ws.rs*
X-Git-Tag: v1.43.0~74
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=b7f7aca355507107a5ef574aadf4debddbbf6b9b;p=simantics%2Fplatform.git

Update rest of external components & explicitly export javax.ws.rs*

gitlab #486

Change-Id: I858750bb69a0ebade617c72f29ee76330394954e
---

diff --git a/releng/org.simantics.sdk.build.p2.site/pom.xml b/releng/org.simantics.sdk.build.p2.site/pom.xml
index 0bd96df8f..05777cd04 100644
--- a/releng/org.simantics.sdk.build.p2.site/pom.xml
+++ b/releng/org.simantics.sdk.build.p2.site/pom.xml
@@ -23,10 +23,10 @@
         <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.b0003</jakarta.version.actual>
+        <jakarta.version.actual>2.1.6.b0004</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.b0003</jersey.version.actual>
+        <jersey.version.actual>2.30.1.b0004</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>
@@ -373,24 +373,6 @@
                                     <id>org.mozilla:rhino:${rhino.version}</id>
                                     <source>true</source>
                                 </artifact>
-                                <!-- org.eclipse.epp.mpc.core.win32 plug-in requires 4.1.0 -->
-                                <artifact>
-                                    <id>net.java.dev.jna:jna:${jna41.version}</id>
-                                    <source>true</source>
-                                </artifact>
-                                 <!-- org.eclipse.epp.mpc.core.win32 plug-in requires 4.1.0 -->
-                                <artifact>
-                                    <id>net.java.dev.jna:jna-platform:${jna41.version}</id>
-                                    <source>true</source>
-                                </artifact>
-                                <artifact>
-                                    <id>net.java.dev.jna:jna:${jna.version}</id>
-                                    <source>true</source>
-                                </artifact>
-                                <artifact>
-                                    <id>net.java.dev.jna:jna-platform:${jna.version}</id>
-                                    <source>true</source>
-                                </artifact>
                                 <artifact>
                                     <id>javax.servlet:javax.servlet-api:${javax.version}</id>
                                     <source>true</source>
@@ -495,9 +477,12 @@
                                         </Require-Bundle>
                                         <Import-Package>!javax.*,*;resolution:=optional</Import-Package>
                                         <Export-Package>
-                                            javax.ws.rs,
-                                            javax.ws.rs.core,
-                                            javax.ws.rs.ext
+                                            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>