X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=releng%2Forg.simantics.sdk.build.p2.site%2Fpom.xml;h=adc9960e57be1462abe635db6f6e746db0c1db6e;hb=refs%2Fchanges%2F80%2F4480%2F1;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..adc9960e5 100644
--- a/releng/org.simantics.sdk.build.p2.site/pom.xml
+++ b/releng/org.simantics.sdk.build.p2.site/pom.xml
@@ -18,15 +18,10 @@
         <jaxen.version>1.2.0</jaxen.version>
         <jdom.version>2.0.6</jdom.version>
         <jdom.version.actual>2.0.6.b0001</jdom.version.actual>
-        <jackson.version>2.10.2</jackson.version>
-        <jackson.version.actual>2.10.2.b0001</jackson.version.actual>
+        <jackson.version>2.8.11</jackson.version>
+        <jackson.version.actual>2.8.11</jackson.version.actual>
         <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>
-        <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>2.25.1</jersey.version>
         <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 +29,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>
@@ -86,12 +80,12 @@
             <plugin>
                 <groupId>org.eclipse.tycho.extras</groupId>
                 <artifactId>tycho-p2-extras-plugin</artifactId>
-                <version>1.0.0</version>
+                <version>1.7.0</version>
             </plugin>
             <plugin>
                 <groupId>org.reficio</groupId>
                 <artifactId>p2-maven-plugin</artifactId>
-                <version>1.2.0</version>
+                <version>1.3.0</version>
                 <executions>
                     <execution>
                         <id>default-cli</id>
@@ -329,22 +323,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 +351,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,132 +444,28 @@
                                      <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.ws.rs:jakarta.ws.rs-api:${jakarta.version}</id>
-                                    <source>true</source>
-                                    <override>true</override>
-                                    <instructions>
-                                        <Bundle-Version>${jakarta.version.actual}</Bundle-Version>
-                                        <Require-Bundle>
-                                             jakarta.xml.bind-api
-                                        </Require-Bundle>
-                                        <Import-Package>!javax.*,*;resolution:=optional</Import-Package>
-                                        <Export-Package>
-                                            javax.ws.rs,
-                                            javax.ws.rs.core,
-                                            javax.ws.rs.ext
-                                        </Export-Package>
-                                    </instructions>
-                                </artifact>
-                                <artifact>
-                                    <id>org.glassfish.jersey.core:jersey-common:${jersey.version}</id>
-                                    <source>true</source>
-                                    <override>true</override>
-                                    <instructions>
-                                        <Bundle-Version>${jersey.version.actual}</Bundle-Version>
-                                        <Require-Bundle>
-                                             javax.annotation,
-                                             javax.inject,
-                                             jakarta.validation.jakarta.validation-api,
-                                             jakarta.ws.rs-api,
-                                             jakarta.xml.bind-api
-                                        </Require-Bundle>
-                                        <Import-Package>!javax.*,*;resolution:=optional</Import-Package>
-                                    </instructions>
-                                </artifact>
                                 <artifact>
                                     <id>org.glassfish.jersey.core:jersey-server:${jersey.version}</id>
                                     <source>true</source>
-                                    <override>true</override>
-                                    <instructions>
-                                        <Bundle-Version>${jersey.version.actual}</Bundle-Version>
-                                        <Require-Bundle>
-                                             javax.annotation,
-                                             javax.inject,
-                                             jakarta.validation.jakarta.validation-api,
-                                             jakarta.ws.rs-api,
-                                             jakarta.xml.bind-api
-                                        </Require-Bundle>
-                                        <Import-Package>!javax.*,*;resolution:=optional</Import-Package>
-                                    </instructions>
                                 </artifact>
                                 <artifact>
                                     <id>org.glassfish.jersey.core:jersey-client:${jersey.version}</id>
                                     <source>true</source>
-                                    <override>true</override>
-                                    <instructions>
-                                        <Bundle-Version>${jersey.version.actual}</Bundle-Version>
-                                        <Require-Bundle>
-                                             javax.annotation,
-                                             javax.inject,
-                                             jakarta.validation.jakarta.validation-api,
-                                             jakarta.ws.rs-api,
-                                             jakarta.xml.bind-api
-                                        </Require-Bundle>
-                                        <Import-Package>!javax.*,*;resolution:=optional</Import-Package>
-                                    </instructions>
                                 </artifact>
-                                
                                 <artifact>
                                     <id>org.glassfish.jersey.media:jersey-media-multipart:${jersey.version}</id>
                                     <source>true</source>
-                                    <!-- For some reason p2-maven-plugin does not work with the below plugin and only generates sources for that -->
-                                    <!-- <override>true</override>
-                                    <instructions>
-                                        <Bundle-Version>${jersey.version.actual}</Bundle-Version>
-                                        <Require-Bundle>
-                                             jakarta.ws.rs-api,
-                                        </Require-Bundle>
-                                        <Import-Package>!javax.*,*;resolution:=optional</Import-Package>
-                                    </instructions> -->
-                                </artifact>
-                                <artifact>
-                                    <id>org.glassfish.jersey.ext:jersey-entity-filtering:${jersey.version}</id>
-                                    <source>true</source>
-                                    <override>true</override>
-                                    <instructions>
-                                        <Bundle-Version>${jersey.version.actual}</Bundle-Version>
-                                        <Require-Bundle>
-                                             jakarta.ws.rs-api,
-                                             org.glassfish.jersey.core.jersey-server
-                                        </Require-Bundle>
-                                        <Import-Package>!javax.*,*;resolution:=optional</Import-Package>
-                                    </instructions>
                                 </artifact>
                                 <artifact>
                                     <id>org.glassfish.jersey.media:jersey-media-json-jackson:${jersey.version}</id>
                                     <source>true</source>
-                                    <override>true</override>
                                     <excludes>
                                         <exclude>com.fasterxml.jackson.*</exclude>
                                     </excludes>
-                                    <instructions>
-                                        <Bundle-Version>${jersey.version.actual}</Bundle-Version>
-                                        <Require-Bundle>
-                                             javax.annotation,
-                                             javax.inject,
-                                             jakarta.validation.jakarta.validation-api,
-                                             jakarta.ws.rs-api,
-                                             jakarta.xml.bind-api
-                                        </Require-Bundle>
-                                        <Import-Package>!javax.*,*;resolution:=optional</Import-Package>
-                                    </instructions>
                                 </artifact>
                                 <artifact>
                                     <id>org.glassfish.jersey.containers:jersey-container-servlet-core:${jersey.version}</id>
                                     <source>true</source>
-                                    <override>true</override>
-                                    <instructions>
-                                        <Bundle-Version>${jersey.version.actual}</Bundle-Version>
-                                        <Require-Bundle>
-                                             javax.annotation,
-                                             javax.inject,
-                                             jakarta.validation.jakarta.validation-api,
-                                             jakarta.ws.rs-api,
-                                             jakarta.xml.bind-api
-                                        </Require-Bundle>
-                                        <Import-Package>!javax.*,*;resolution:=optional</Import-Package>
-                                    </instructions>
                                 </artifact>
                                 <artifact>
                                     <id>org.jboss.windup.decompiler:decompiler-procyon:${decompiler-procyon.version}</id>