X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=releng%2Forg.simantics.sdk.build.p2.site%2Fpom.xml;h=9534f71fb89e04793f90ad84a5a2d9b8ee18efef;hp=0bd96df8f10ad0c90ec088e1c90f6da1b9e3dfa9;hb=36dd2a29553f86a274f84b9cb36bb66d8e4dd10b;hpb=400d56f8cd18bbd76ebdae693162a8f3573fa098

diff --git a/releng/org.simantics.sdk.build.p2.site/pom.xml b/releng/org.simantics.sdk.build.p2.site/pom.xml
index 0bd96df8f..9534f71fb 100644
--- a/releng/org.simantics.sdk.build.p2.site/pom.xml
+++ b/releng/org.simantics.sdk.build.p2.site/pom.xml
@@ -22,11 +22,13 @@
         <jackson.version.actual>2.10.2.b0001</jackson.version.actual>
         <javax.version>3.1.0</javax.version>
         <jakarta.version>2.1.6</jakarta.version>
+        <jakarta.activation-api.version>1.2.1</jakarta.activation-api.version>
+        <jakarta.activation-api.version.actual>1.2.1.b0001</jakarta.activation-api.version.actual>
         <!-- 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.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.b0003</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>
@@ -34,7 +36,6 @@
         <grpc.version.actual>1.27.2</grpc.version.actual>
         <protobuf.version>3.11.4</protobuf.version>
         <zeroturnaround.version>1.11</zeroturnaround.version>
-        <eclipse.collections.version>10.2.0</eclipse.collections.version>
         <caffeine.version>2.8.1</caffeine.version>
         <influxdb.client.version>1.5.0</influxdb.client.version>
         <supercsv.version>2.4.0</supercsv.version>
@@ -329,22 +330,6 @@
                                     <id>it.unimi.dsi:fastutil:${fastutil.version}</id>
                                     <source>true</source>
                                 </artifact>
-                                <artifact>
-                                    <id>org.eclipse.collections:eclipse-collections-api:${eclipse.collections.version}</id>
-                                    <override>true</override>
-                                    <source>true</source>
-                                    <instructions>
-                                        <Export-Package>org.eclipse.collections.*</Export-Package>
-                                    </instructions>
-                                </artifact>
-                                <artifact>
-                                    <id>org.eclipse.collections:eclipse-collections:${eclipse.collections.version}</id>
-                                    <source>true</source>
-                                    <instructions>
-                                        <Require-Bundle>org.eclipse.collections.eclipse-collections-api;bundle-version="${eclipse.collections.version}"</Require-Bundle>
-                                        <Import-Package>!org.eclipse.*,!sun.misc.*,*;resolution:=optional</Import-Package>
-                                    </instructions>
-                                </artifact>
                                 <artifact>
                                     <id>net.sf.trove4j:trove4j:${trove4j.version}</id>
                                     <source>true</source>
@@ -373,24 +358,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>
@@ -484,6 +451,15 @@
                                      <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.activation:jakarta.activation-api:${jakarta.activation-api.version}</id>
+                                    <source>true</source>
+                                    <override>true</override>
+                                    <instructions>
+                                        <Bundle-Version>${jakarta.activation-api.version.actual}</Bundle-Version>
+                                        <Import-Package>*;resolution:=optional</Import-Package>
+                                    </instructions>
+                                </artifact>
                                 <artifact>
                                     <id>jakarta.ws.rs:jakarta.ws.rs-api:${jakarta.version}</id>
                                     <source>true</source>
@@ -495,9 +471,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>
@@ -507,14 +486,19 @@
                                     <override>true</override>
                                     <instructions>
                                         <Bundle-Version>${jersey.version.actual}</Bundle-Version>
-                                        <Require-Bundle>
+                                        <!-- <Require-Bundle>
                                              javax.annotation,
                                              javax.inject,
+                                             javax.servlet-api,
                                              jakarta.validation.jakarta.validation-api,
                                              jakarta.ws.rs-api,
-                                             jakarta.xml.bind-api
-                                        </Require-Bundle>
-                                        <Import-Package>!javax.*,*;resolution:=optional</Import-Package>
+                                             jakarta.xml.bind-api,
+                                             jakarta.activation-api
+                                        </Require-Bundle> -->
+                                        <Import-Package>*;resolution:=optional</Import-Package>
+                                        <Export-Package>
+                                            org.glassfish.jersey.*;version="${jersey.version}"
+                                        </Export-Package>
                                     </instructions>
                                 </artifact>
                                 <artifact>
@@ -523,14 +507,16 @@
                                     <override>true</override>
                                     <instructions>
                                         <Bundle-Version>${jersey.version.actual}</Bundle-Version>
-                                        <Require-Bundle>
+                                        <!-- <Require-Bundle>
                                              javax.annotation,
                                              javax.inject,
+                                             javax.servlet-api,
                                              jakarta.validation.jakarta.validation-api,
                                              jakarta.ws.rs-api,
-                                             jakarta.xml.bind-api
-                                        </Require-Bundle>
-                                        <Import-Package>!javax.*,*;resolution:=optional</Import-Package>
+                                             jakarta.xml.bind-api,
+                                             jakarta.activation-api
+                                        </Require-Bundle> -->
+                                        <Import-Package>*;resolution:=optional</Import-Package>
                                     </instructions>
                                 </artifact>
                                 <artifact>
@@ -539,14 +525,16 @@
                                     <override>true</override>
                                     <instructions>
                                         <Bundle-Version>${jersey.version.actual}</Bundle-Version>
-                                        <Require-Bundle>
+                                        <!-- <Require-Bundle>
                                              javax.annotation,
                                              javax.inject,
+                                             javax.servlet-api,
                                              jakarta.validation.jakarta.validation-api,
                                              jakarta.ws.rs-api,
-                                             jakarta.xml.bind-api
-                                        </Require-Bundle>
-                                        <Import-Package>!javax.*,*;resolution:=optional</Import-Package>
+                                             jakarta.xml.bind-api,
+                                             jakarta.activation-api
+                                        </Require-Bundle> -->
+                                        <Import-Package>*;resolution:=optional</Import-Package>
                                     </instructions>
                                 </artifact>
                                 
@@ -569,11 +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>
@@ -585,14 +575,16 @@
                                     </excludes>
                                     <instructions>
                                         <Bundle-Version>${jersey.version.actual}</Bundle-Version>
-                                        <Require-Bundle>
+                                        <!-- <Require-Bundle>
                                              javax.annotation,
                                              javax.inject,
+                                             javax.servlet-api,
                                              jakarta.validation.jakarta.validation-api,
                                              jakarta.ws.rs-api,
-                                             jakarta.xml.bind-api
-                                        </Require-Bundle>
-                                        <Import-Package>!javax.*,*;resolution:=optional</Import-Package>
+                                             jakarta.xml.bind-api,
+                                             jakarta.activation-api
+                                        </Require-Bundle> -->
+                                        <Import-Package>*;resolution:=optional</Import-Package>
                                     </instructions>
                                 </artifact>
                                 <artifact>
@@ -601,14 +593,34 @@
                                     <override>true</override>
                                     <instructions>
                                         <Bundle-Version>${jersey.version.actual}</Bundle-Version>
-                                        <Require-Bundle>
+                                        <!-- <Require-Bundle>
                                              javax.annotation,
                                              javax.inject,
+                                             javax.servlet-api,
                                              jakarta.validation.jakarta.validation-api,
                                              jakarta.ws.rs-api,
-                                             jakarta.xml.bind-api
-                                        </Require-Bundle>
-                                        <Import-Package>!javax.*,*;resolution:=optional</Import-Package>
+                                             jakarta.xml.bind-api,
+                                             jakarta.activation-api
+                                        </Require-Bundle> -->
+                                        <Import-Package>*;resolution:=optional</Import-Package>
+                                    </instructions>
+                                </artifact>
+                                <artifact>
+                                    <id>org.glassfish.jersey.inject:jersey-hk2:${jersey.version}</id>
+                                    <source>true</source>
+                                    <override>true</override>
+                                    <instructions>
+                                        <Bundle-Version>${jersey.version.actual}</Bundle-Version>
+                                        <!-- <Require-Bundle>
+                                             javax.annotation,
+                                             javax.inject,
+                                             javax.servlet-api,
+                                             jakarta.validation.jakarta.validation-api,
+                                             jakarta.ws.rs-api,
+                                             jakarta.xml.bind-api,
+                                             jakarta.activation-api
+                                        </Require-Bundle> -->
+                                        <Import-Package>*;resolution:=optional</Import-Package>
                                     </instructions>
                                 </artifact>
                                 <artifact>