X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=releng%2Forg.simantics.sdk.build.p2.site%2Fpom.xml;h=9534f71fb89e04793f90ad84a5a2d9b8ee18efef;hb=0cb9829cf7fbee31bbc952c6313b01e195e8d010;hp=0bd96df8f10ad0c90ec088e1c90f6da1b9e3dfa9;hpb=400d56f8cd18bbd76ebdae693162a8f3573fa098;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 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 @@
2.10.2.b0001
3.1.0
2.1.6
+ 1.2.1
+ 1.2.1.b0001
- 2.1.6.b0003
+ 2.1.6.b0005
2.30.1
- 2.30.1.b0003
+ 2.30.1.b0008
1.5.0
1.7.30
1.7.30
@@ -34,7 +36,6 @@
1.27.2
3.11.4
1.11
- 10.2.0
2.8.1
1.5.0
2.4.0
@@ -329,22 +330,6 @@
it.unimi.dsi:fastutil:${fastutil.version}
-
- org.eclipse.collections:eclipse-collections-api:${eclipse.collections.version}
- true
-
-
- org.eclipse.collections.*
-
-
-
- org.eclipse.collections:eclipse-collections:${eclipse.collections.version}
-
-
- org.eclipse.collections.eclipse-collections-api;bundle-version="${eclipse.collections.version}"
- !org.eclipse.*,!sun.misc.*,*;resolution:=optional
-
-
net.sf.trove4j:trove4j:${trove4j.version}
@@ -373,24 +358,6 @@
org.mozilla:rhino:${rhino.version}
-
-
- net.java.dev.jna:jna:${jna41.version}
-
-
-
-
- net.java.dev.jna:jna-platform:${jna41.version}
-
-
-
- net.java.dev.jna:jna:${jna.version}
-
-
-
- net.java.dev.jna:jna-platform:${jna.version}
-
-
javax.servlet:javax.servlet-api:${javax.version}
@@ -484,6 +451,15 @@
org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:${org.apache.aries.spifly.dynamic.bundle.version}
+
+ jakarta.activation:jakarta.activation-api:${jakarta.activation-api.version}
+
+ true
+
+ ${jakarta.activation-api.version.actual}
+ *;resolution:=optional
+
+
jakarta.ws.rs:jakarta.ws.rs-api:${jakarta.version}
@@ -495,9 +471,12 @@
!javax.*,*;resolution:=optional
- 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}"
@@ -507,14 +486,19 @@
true
${jersey.version.actual}
-
+
+ *;resolution:=optional
+
+ org.glassfish.jersey.*;version="${jersey.version}"
+
@@ -523,14 +507,16 @@
true
${jersey.version.actual}
-
+
+ *;resolution:=optional
@@ -539,14 +525,16 @@
true
${jersey.version.actual}
-
+
+ *;resolution:=optional
@@ -569,11 +557,13 @@
true
${jersey.version.actual}
-
+
+ *;resolution:=optional
@@ -585,14 +575,16 @@
${jersey.version.actual}
-
+
+ *;resolution:=optional
@@ -601,14 +593,34 @@
true
${jersey.version.actual}
-
+
+ *;resolution:=optional
+
+
+
+ org.glassfish.jersey.inject:jersey-hk2:${jersey.version}
+
+ true
+
+ ${jersey.version.actual}
+
+ *;resolution:=optional