Revert jersey and jackson back to versions that work with JDK8

gitlab #486

Change-Id: Id282d9cbffa68bce9b2a436150aadc0c5c11eac1

diff --git a/bundles/org.simantics.auditlogging/META-INF/MANIFEST.MF b/bundles/org.simantics.auditlogging/META-INF/MANIFEST.MF
index 427b274c44ff0e53a9e1c508dd9ed448984394f0..0650cddabc5e464f847913e6d5cc7fb21a7c6c68 100644 (file)
--- a/bundles/org.simantics.auditlogging/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.auditlogging/META-INF/MANIFEST.MF
@@ -5,19 +5,19 @@ Bundle-SymbolicName: org.simantics.auditlogging
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.simantics.audit.Activator
 Require-Bundle: org.eclipse.core.runtime,
- com.fasterxml.jackson.core.jackson-databind,
- com.fasterxml.jackson.core.jackson-core,
+ com.fasterxml.jackson.core.jackson-databind;bundle-version="[2.8.11,2.9.0)",
+ com.fasterxml.jackson.core.jackson-core;bundle-version="[2.8.11,2.9.0)",
  org.slf4j.api,
  javax.servlet-api,
  javax.ws.rs-api,
  org.eclipse.jetty.server;bundle-version="9.4.24",
  org.eclipse.jetty.servlet;bundle-version="9.4.24",
  org.eclipse.jetty.util;bundle-version="9.4.24",
- org.glassfish.jersey.core.jersey-server,
- org.glassfish.jersey.media.jersey-media-json-jackson,
- org.glassfish.jersey.containers.jersey-container-servlet-core,
- org.glassfish.jersey.core.jersey-client,
- org.glassfish.jersey.core.jersey-common
+ org.glassfish.jersey.core.jersey-server;bundle-version="[2.25.1,2.26.0)",
+ org.glassfish.jersey.media.jersey-media-json-jackson;bundle-version="[2.25.1,2.26.0)",
+ org.glassfish.jersey.containers.jersey-container-servlet-core;bundle-version="[2.25.1,2.26.0)",
+ org.glassfish.jersey.core.jersey-client;bundle-version="[2.25.1,2.26.0)",
+ org.glassfish.jersey.core.jersey-common;bundle-version="[2.25.1,2.26.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Export-Package: org.simantics.audit.server

diff --git a/bundles/org.simantics.charts/META-INF/MANIFEST.MF b/bundles/org.simantics.charts/META-INF/MANIFEST.MF
index b0c49505b5fdcd655f8f0a1545467fc1bab48ce2..7692223616c9526973c1c648a4ae0119d8cb74da 100644 (file)
--- a/bundles/org.simantics.charts/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.charts/META-INF/MANIFEST.MF
@@ -47,7 +47,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.e4.ui.bindings;bundle-version="0.11.0",
  org.eclipse.e4.core.di.annotations,
  org.eclipse.e4.core.services,
- com.fasterxml.jackson.core.jackson-core;bundle-version="2.8.2",
+ com.fasterxml.jackson.core.jackson-core;bundle-version="[2.8.11,2.9.0)",
  org.slf4j.api
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy

diff --git a/bundles/org.simantics.debug.graphical/META-INF/MANIFEST.MF b/bundles/org.simantics.debug.graphical/META-INF/MANIFEST.MF
index 69628991132c7f27bf30d16c8dd0501cf1853311..559b013505a5101c33a7d2a5ecaf9b43c46a1dc8 100644 (file)
--- a/bundles/org.simantics.debug.graphical/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.debug.graphical/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Require-Bundle: org.simantics.db;bundle-version="1.1.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
  org.eclipse.ui;bundle-version="3.6.0",
  org.simantics.ui;bundle-version="1.0.0",
- com.fasterxml.jackson.core.jackson-core;bundle-version="2.8.8",
+ com.fasterxml.jackson.core.jackson-core;bundle-version="[2.8.11,2.9.0)",
  org.slf4j.api,
- com.fasterxml.jackson.core.jackson-databind;bundle-version="2.8.8"
+ com.fasterxml.jackson.core.jackson-databind;bundle-version="[2.8.11,2.9.0)"
 Automatic-Module-Name: org.simantics.debug.graphical

diff --git a/bundles/org.simantics.history.rest/META-INF/MANIFEST.MF b/bundles/org.simantics.history.rest/META-INF/MANIFEST.MF
index 6ee40d1c191497a40ae62eabc10059a3a66b849c..a992c5e73d7a4fde473b0b43b104a31b4ead300a 100644 (file)
--- a/bundles/org.simantics.history.rest/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.history.rest/META-INF/MANIFEST.MF
@@ -8,24 +8,24 @@ Automatic-Module-Name: org.simantics.history.rest
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.simantics.history;bundle-version="1.0.0",
  org.eclipse.core.runtime;bundle-version="3.13.0",
- org.glassfish.jersey.core.jersey-server,
+ org.glassfish.jersey.core.jersey-server;bundle-version="[2.25.1,2.26.0)",
  javax.ws.rs-api,
  org.simantics.scl.compiler,
  org.simantics.scl.osgi,
  org.eclipse.jetty.servlet,
- org.glassfish.jersey.containers.jersey-container-servlet-core,
+ org.glassfish.jersey.containers.jersey-container-servlet-core;bundle-version="[2.25.1,2.26.0)",
  javax.servlet-api,
  org.eclipse.jetty.server;bundle-version="9.4.24",
  org.eclipse.jetty.util;bundle-version="9.4.24",
  org.eclipse.jetty.io;bundle-version="9.4.24",
  org.eclipse.jetty.servlets;bundle-version="9.4.24",
- com.fasterxml.jackson.core.jackson-core;bundle-version="2.8.8",
- com.fasterxml.jackson.core.jackson-annotations;bundle-version="2.8.0",
- com.fasterxml.jackson.core.jackson-databind;bundle-version="2.8.8",
- org.glassfish.jersey.media.jersey-media-json-jackson;bundle-version="2.25.1",
+ com.fasterxml.jackson.core.jackson-core;bundle-version="[2.8.11,2.9.0)",
+ com.fasterxml.jackson.core.jackson-annotations;bundle-version="[2.8.11,2.9.0)",
+ com.fasterxml.jackson.core.jackson-databind;bundle-version="[2.8.11,2.9.0)",
+ org.glassfish.jersey.media.jersey-media-json-jackson;bundle-version="[2.25.1,2.26.0)",
  org.slf4j.api,
- org.glassfish.jersey.core.jersey-client,
- org.glassfish.jersey.core.jersey-common;bundle-version="2.25.1",
+ org.glassfish.jersey.core.jersey-client;bundle-version="[2.25.1,2.26.0)",
+ org.glassfish.jersey.core.jersey-common;bundle-version="[2.25.1,2.26.0)",
  org.simantics.scl.runtime,
  gnu.trove3;bundle-version="3.0.3",
  org.simantics.charts;bundle-version="0.0.1",

diff --git a/bundles/org.simantics.scl.data/META-INF/MANIFEST.MF b/bundles/org.simantics.scl.data/META-INF/MANIFEST.MF
index eb6ba41c5c4bf0fde149c03079f3ba8b4450ec25..ea90658a3439d13edd3cc44885a601627cba8c83 100644 (file)
--- a/bundles/org.simantics.scl.data/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.scl.data/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Require-Bundle: org.simantics.scl.runtime;bundle-version="0.4.0",
  org.simantics.scl.osgi;bundle-version="1.0.4",
  org.jdom2;bundle-version="2.0.6",
  org.junit;bundle-version="4.12.0";resolution:=optional,
- com.fasterxml.jackson.core.jackson-core;bundle-version="2.8.2",
- com.fasterxml.jackson.core.jackson-databind
+ com.fasterxml.jackson.core.jackson-core;bundle-version="[2.8.11,2.9.0)",
+ com.fasterxml.jackson.core.jackson-databind;bundle-version="[2.8.11,2.9.0)"
 Bundle-ClassPath: .
 Automatic-Module-Name: org.simantics.scl.data

diff --git a/bundles/org.simantics.scl.rest/META-INF/MANIFEST.MF b/bundles/org.simantics.scl.rest/META-INF/MANIFEST.MF
index dd0d78bf300b9cb8c74b2650e1e88262d19de1b1..55f5c53f444b334926e4211b1ae591c462178e3b 100644 (file)
--- a/bundles/org.simantics.scl.rest/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.scl.rest/META-INF/MANIFEST.MF
@@ -4,27 +4,34 @@ Bundle-Name: Simantics SCL REST-Server
 Bundle-SymbolicName: org.simantics.scl.rest
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.simantics.scl.rest.Activator
-Require-Bundle: org.glassfish.jersey.core.jersey-server,
+Require-Bundle: org.glassfish.jersey.core.jersey-server;bundle-version="[2.25.1,2.26.0)",
  org.simantics.scl.compiler,
  org.simantics.scl.osgi,
- org.glassfish.jersey.containers.jersey-container-servlet-core,
+ org.glassfish.jersey.containers.jersey-container-servlet-core;bundle-version="[2.25.1,2.26.0)",
  javax.servlet-api,
  org.eclipse.jetty.servlet;bundle-version="9.4.24",
  org.eclipse.jetty.server;bundle-version="9.4.24",
  org.eclipse.jetty.util;bundle-version="9.4.24",
  org.eclipse.jetty.io;bundle-version="9.4.24",
- com.fasterxml.jackson.core.jackson-core;bundle-version="2.8.8",
- com.fasterxml.jackson.core.jackson-annotations;bundle-version="2.8.0",
- com.fasterxml.jackson.core.jackson-databind;bundle-version="2.8.8",
- org.glassfish.jersey.media.jersey-media-json-jackson;bundle-version="2.25.1",
- org.glassfish.jersey.media.jersey-media-multipart;bundle-version="2.25.1",
+ com.fasterxml.jackson.core.jackson-core;bundle-version="[2.8.11,2.9.0)",
+ com.fasterxml.jackson.core.jackson-annotations;bundle-version="[2.8.11,2.9.0)",
+ com.fasterxml.jackson.core.jackson-databind;bundle-version="[2.8.11,2.9.0)",
+ org.glassfish.jersey.media.jersey-media-json-jackson;bundle-version="[2.25.1,2.26.0)",
+ org.glassfish.jersey.media.jersey-media-multipart;bundle-version="[2.25.1,2.26.0)",
  org.slf4j.api,
  org.jvnet.mimepull;bundle-version="1.9.6",
- org.glassfish.jersey.core.jersey-client,
- org.glassfish.jersey.core.jersey-common;bundle-version="2.25.1",
+ org.glassfish.jersey.core.jersey-client;bundle-version="[2.25.1,2.26.0)",
+ org.glassfish.jersey.core.jersey-common;bundle-version="[2.25.1,2.26.0)",
  org.simantics.scl.runtime,
  org.eclipse.osgi;bundle-version="3.15.100",
- javax.ws.rs-api
+ javax.ws.rs-api,
+ org.glassfish.hk2.external.aopalliance-repackaged;bundle-version="2.5.0",
+ org.glassfish.jersey.bundles.repackaged.jersey-guava;bundle-version="[2.25.1,2.26.0)",
+ org.glassfish.hk2.api;bundle-version="2.5.0",
+ org.glassfish.hk2.locator;bundle-version="2.5.0",
+ org.glassfish.hk2.osgi-resource-locator;bundle-version="1.0.1",
+ org.glassfish.hk2.utils;bundle-version="2.5.0",
+ javassist;bundle-version="3.22.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.simantics.scl.rest

diff --git a/features/org.simantics.scl.rest.feature/feature.xml b/features/org.simantics.scl.rest.feature/feature.xml
index 888c5713ec86fee427356ca7a41b5c8b3d9c20a4..9de8b5c1c774484e425196814ae60854275f46b3 100644 (file)
--- a/features/org.simantics.scl.rest.feature/feature.xml
+++ b/features/org.simantics.scl.rest.feature/feature.xml
@@ -284,4 +284,46 @@ This Agreement is governed by the laws of the State of New York and the intellec
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.glassfish.hk2.external.aopalliance-repackaged"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.glassfish.jersey.bundles.repackaged.jersey-guava"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.glassfish.hk2.api"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.glassfish.hk2.locator"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.glassfish.hk2.utils"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="javassist"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>

diff --git a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.target b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.target
index 87d4910629e7101ddc92b006917ac7b4cd3e80bc..29bc30d77c54f6f799c3a146d92ddc3be3b9c6dd 100644 (file)
--- a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.target
+++ b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="Eclipse 2019-12 (4.14)" sequenceNumber="1587368699">
+<target name="Eclipse 2019-12 (4.14)" sequenceNumber="1587382623">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
@@ -260,6 +260,8 @@
       <unit id="it.unimi.dsi.fastutil" version="8.3.1"/>
       <unit id="it.unimi.dsi.fastutil.source" version="8.3.1"/>
       <unit id="jakarta-regexp" version="1.4.0"/>
+      <unit id="javassist" version="3.20.0.GA"/>
+      <unit id="javassist.source" version="3.20.0.GA"/>
       <unit id="javax.servlet-api" version="3.1.0"/>
       <unit id="javax.servlet-api.source" version="3.1.0"/>
       <unit id="javax.ws.rs-api" version="2.0.1"/>

diff --git a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.tpd b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.tpd
index c7d3e1d31efee124db78275d20ab908b5872118e..a83f45e9e89150128d840ae0d6315cb405b3e92e 100644 (file)
--- a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.tpd
+++ b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.tpd
@@ -261,6 +261,8 @@ location "http://www.simantics.org/download/release/1.43.0/external-components/m
        it.unimi.dsi.fastutil
        it.unimi.dsi.fastutil.source
        jakarta-regexp
+       javassist
+       javassist.source
        javax.servlet-api
        javax.servlet-api.source
        javax.ws.rs-api

diff --git a/releng/org.simantics.sdk.build.targetdefinition/simantics.target b/releng/org.simantics.sdk.build.targetdefinition/simantics.target
index 027166a4b58a8d7e9e666775d466e57686b277ba..cdb08f7a1fb093a3ba84d3c3b8e597208be7c1c1 100644 (file)
--- a/releng/org.simantics.sdk.build.targetdefinition/simantics.target
+++ b/releng/org.simantics.sdk.build.targetdefinition/simantics.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="Simantics 1.43.0" sequenceNumber="1587368710">
+<target name="Simantics 1.43.0" sequenceNumber="1587382625">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
@@ -260,6 +260,8 @@
       <unit id="it.unimi.dsi.fastutil" version="8.3.1"/>
       <unit id="it.unimi.dsi.fastutil.source" version="8.3.1"/>
       <unit id="jakarta-regexp" version="1.4.0"/>
+      <unit id="javassist" version="3.20.0.GA"/>
+      <unit id="javassist.source" version="3.20.0.GA"/>
       <unit id="javax.servlet-api" version="3.1.0"/>
       <unit id="javax.servlet-api.source" version="3.1.0"/>
       <unit id="javax.ws.rs-api" version="2.0.1"/>