From: Jani Simomaa <jani.simomaa@semantum.fi>
Date: Fri, 28 Feb 2020 08:02:37 +0000 (+0000)
Subject: Merge "Tons of dependency fixes and updates"
X-Git-Tag: v1.43.0~72
X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=122414d21a2fa527831127d6fd36deab08072889;hp=15a0f229f7340ed92e9157049483ed71f54677f9

Merge "Tons of dependency fixes and updates"
---

diff --git a/releng/org.simantics.sdk.build.p2.site/pom.xml b/releng/org.simantics.sdk.build.p2.site/pom.xml
index fcf6f6d7b..54628d58a 100644
--- a/releng/org.simantics.sdk.build.p2.site/pom.xml
+++ b/releng/org.simantics.sdk.build.p2.site/pom.xml
@@ -11,17 +11,23 @@
     <properties>
         <itext.version.actual>2.1.7.b1</itext.version.actual>
         <antlr.version>3.5.2</antlr.version>
-        <commons-codec.version>1.10</commons-codec.version>
+        <commons-codec.version>1.14</commons-codec.version>
         <lucene.version>4.9.0</lucene.version>
         <lucene.version.actual>4.9.0.b0003</lucene.version.actual>
         <lucene.prefix>org.apache.lucene4</lucene.prefix>
-        <jaxen.version>1.1.6</jaxen.version>
+        <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>
         <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.b0005</jakarta.version.actual>
         <jersey.version>2.30.1</jersey.version>
-        <jfreechart.version>1.0.19</jfreechart.version>
+        <!-- This can be removed once jersey version is bumped -->
+        <jersey.version.actual>2.30.1.b0005</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>
         <grpc.version>1.27.2</grpc.version>
@@ -33,8 +39,8 @@
         <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.1</commons-collections.version>
-        <commons-compress.version>1.18</commons-compress.version>
+        <commons-collections.version>4.4</commons-collections.version>
+        <commons-compress.version>1.20</commons-compress.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>
@@ -44,25 +50,25 @@
         <xmpbox.version>2.0.19</xmpbox.version>
         <log4j.version>1.2.17</log4j.version>
         <ucanaccess.version>3.0.7</ucanaccess.version>
-        <fastutil.version>7.2.1</fastutil.version>
+        <fastutil.version>8.3.1</fastutil.version>
         <trove4j.version>3.0.3</trove4j.version>
-        <freemarker.version>2.3.23</freemarker.version>
+        <freemarker.version>2.3.29</freemarker.version>
         <itext.version>2.1.7</itext.version>
-        <rhino.version>1.7.7.1</rhino.version>
+        <rhino.version>1.7.12</rhino.version>
         <jna41.version>4.1.0</jna41.version>
-        <jna.version>4.3.0</jna.version>
+        <jna.version>4.5.2</jna.version>
         <logback-classic.version>1.2.3</logback-classic.version>
         <koloboke-compile.version>0.5.1</koloboke-compile.version>
         <koloboke-impl-common-jdk8.version>1.0.0</koloboke-impl-common-jdk8.version>
-        <kryo.version>4.0.0</kryo.version>
+        <kryo.version>4.0.2</kryo.version>
         <org.apache.aries.spifly.dynamic.bundle.version>1.2.3</org.apache.aries.spifly.dynamic.bundle.version>
         <decompiler-procyon.version>4.3.0.Final</decompiler-procyon.version>
-        <jsoup.version>1.11.3</jsoup.version>
-        <snakeyaml.version>1.23</snakeyaml.version>
+        <jsoup.version>1.12.2</jsoup.version>
+        <snakeyaml.version>1.25</snakeyaml.version>
         <jetty945.version>9.4.24.v20191120</jetty945.version>
         <netty.version>4.1.45.Final</netty.version>
         <jcip-annotations.version>1.0</jcip-annotations.version>
-        <pgjdbc-ng.version>0.7.1</pgjdbc-ng.version>
+        <pgjdbc-ng.version>0.8.3</pgjdbc-ng.version>
     </properties>
 
     <repositories>
@@ -85,7 +91,7 @@
             <plugin>
                 <groupId>org.reficio</groupId>
                 <artifactId>p2-maven-plugin</artifactId>
-                <version>1.3.0</version>
+                <version>1.2.0</version>
                 <executions>
                     <execution>
                         <id>default-cli</id>
@@ -367,24 +373,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>
@@ -478,28 +466,138 @@
                                      <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;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>
+                                <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>
+                                        <Export-Package>
+                                            org.glassfish.jersey.*;version="${jersey.version}"
+                                        </Export-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>