X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=releng%2Forg.simantics.sdk.build.p2.site%2Fpom.xml;h=4d84e674f80ed65fb8998e65b8db9df61862791a;hb=ccb253462b54a0e036f0906ec8ac11a9021a968c;hp=05777cd04f156d7715a27f7b76ae0f89beacdc63;hpb=b7f7aca355507107a5ef574aadf4debddbbf6b9b;p=simantics%2Fplatform.git

diff --git a/releng/org.simantics.sdk.build.p2.site/pom.xml b/releng/org.simantics.sdk.build.p2.site/pom.xml
index 05777cd04..4d84e674f 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.b0004</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.b0004</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,13 +36,13 @@
         <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>
         <ini4j.version>0.5.4</ini4j.version>
         <commons-collections.version>4.4</commons-collections.version>
         <commons-compress.version>1.20</commons-compress.version>
+        <commons-csv.version>1.6</commons-csv.version>
         <commons-lang.version>2.6</commons-lang.version>
         <commons-logging.version>1.2</commons-logging.version>
         <commons-io.version>1.4</commons-io.version>
@@ -269,6 +271,10 @@
                                         <Bundle-SymbolicName>org.apache.commons.compress</Bundle-SymbolicName>
                                     </instructions>
                                 </artifact>
+                                <artifact>
+                                    <id>org.apache.commons:commons-csv:${commons-csv.version}</id>
+                                    <source>true</source>
+                                </artifact>
                                 <artifact>
                                     <id>commons-lang:commons-lang:${commons-lang.version}</id>
                                     <source>true</source>
@@ -329,22 +335,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>
@@ -466,6 +456,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>
@@ -492,14 +491,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>
@@ -508,14 +512,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>
@@ -524,14 +530,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>
                                 
@@ -554,11 +562,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>
@@ -570,14 +580,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>
@@ -586,14 +598,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>