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=3e03472d882951c34dff976bbf68e0fe27abfc6c;hp=0bd96df8f10ad0c90ec088e1c90f6da1b9e3dfa9;hb=096f05bdfb24438de8f96cc02dd0c60123ab108b;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..3e03472d8 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 @@
3.1.0
2.1.6
- 2.1.6.b0003
+ 2.1.6.b0005
2.30.1
- 2.30.1.b0003
+ 2.30.1.b0007
1.5.0
1.7.30
1.7.30
@@ -34,7 +34,6 @@
1.27.2
3.11.4
1.11
- 10.2.0
2.8.1
1.5.0
2.4.0
@@ -329,22 +328,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 +356,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}
@@ -495,9 +460,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}"
@@ -510,11 +478,16 @@
javax.annotation,
javax.inject,
+ javax.servlet-api,
jakarta.validation.jakarta.validation-api,
jakarta.ws.rs-api,
- jakarta.xml.bind-api
+ jakarta.xml.bind-api,
+ jakarta.activation-api
!javax.*,*;resolution:=optional
+
+ org.glassfish.jersey.*;version="${jersey.version}"
+
@@ -526,9 +499,11 @@
javax.annotation,
javax.inject,
+ javax.servlet-api,
jakarta.validation.jakarta.validation-api,
jakarta.ws.rs-api,
- jakarta.xml.bind-api
+ jakarta.xml.bind-api,
+ jakarta.activation-api
!javax.*,*;resolution:=optional
@@ -542,9 +517,11 @@
javax.annotation,
javax.inject,
+ javax.servlet-api,
jakarta.validation.jakarta.validation-api,
jakarta.ws.rs-api,
- jakarta.xml.bind-api
+ jakarta.xml.bind-api,
+ jakarta.activation-api
!javax.*,*;resolution:=optional
@@ -571,6 +548,8 @@
${jersey.version.actual}
jakarta.ws.rs-api,
+ jakarta.activation-api,
+ javax.servlet-api,
org.glassfish.jersey.core.jersey-server
!javax.*,*;resolution:=optional
@@ -588,9 +567,11 @@
javax.annotation,
javax.inject,
+ javax.servlet-api,
jakarta.validation.jakarta.validation-api,
jakarta.ws.rs-api,
- jakarta.xml.bind-api
+ jakarta.xml.bind-api,
+ jakarta.activation-api
!javax.*,*;resolution:=optional
@@ -604,9 +585,29 @@
javax.annotation,
javax.inject,
+ javax.servlet-api,
jakarta.validation.jakarta.validation-api,
jakarta.ws.rs-api,
- jakarta.xml.bind-api
+ jakarta.xml.bind-api,
+ jakarta.activation-api
+
+ !javax.*,*;resolution:=optional
+
+
+
+ org.glassfish.jersey.inject:jersey-hk2:${jersey.version}
+
+ true
+
+ ${jersey.version.actual}
+
+ javax.annotation,
+ javax.inject,
+ javax.servlet-api,
+ jakarta.validation.jakarta.validation-api,
+ jakarta.ws.rs-api,
+ jakarta.xml.bind-api,
+ jakarta.activation-api
!javax.*,*;resolution:=optional