From: jsimomaa <jani.simomaa@gmail.com>
Date: Thu, 23 Apr 2020 12:32:19 +0000 (+0300)
Subject: Update target platforms with non-overriden jersey dependencies
X-Git-Tag: v1.43.0~35
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=ffc32a9e2dda6170269dd1149db275f8039981ff;p=simantics%2Fplatform.git

Update target platforms with non-overriden jersey dependencies

gitlab #486

Change-Id: Ia2b56ef42c3c78430adeffb1e1e1ecf603abdaaa
---

diff --git a/bundles/org.simantics.scl.rest/META-INF/MANIFEST.MF b/bundles/org.simantics.scl.rest/META-INF/MANIFEST.MF
index 55f5c53f4..c816d74a6 100644
--- a/bundles/org.simantics.scl.rest/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.scl.rest/META-INF/MANIFEST.MF
@@ -31,7 +31,7 @@ Require-Bundle: org.glassfish.jersey.core.jersey-server;bundle-version="[2.25.1,
  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"
+ javassist;bundle-version="3.20.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.simantics.scl.rest
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 29bc30d77..b55b9a359 100644
--- 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="1587382623">
+<target name="Eclipse 2019-12 (4.14)" sequenceNumber="1587642124">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
@@ -331,20 +331,20 @@
       <unit id="org.glassfish.jersey.bundles.repackaged.jersey-guava.source" version="2.25.1"/>
       <unit id="org.glassfish.hk2.external.aopalliance-repackaged" version="2.5.0.b32"/>
       <unit id="org.glassfish.hk2.external.aopalliance-repackaged.source" version="2.5.0.b32"/>
-      <unit id="org.glassfish.jersey.core.jersey-client" version="2.25.1.b0006"/>
-      <unit id="org.glassfish.jersey.core.jersey-client.source" version="2.25.1.b0006"/>
-      <unit id="org.glassfish.jersey.core.jersey-common" version="2.25.1.b0006"/>
-      <unit id="org.glassfish.jersey.core.jersey-common.source" version="2.25.1.b0006"/>
-      <unit id="org.glassfish.jersey.core.jersey-server" version="2.25.1.b0006"/>
-      <unit id="org.glassfish.jersey.core.jersey-server.source" version="2.25.1.b0006"/>
-      <unit id="org.glassfish.jersey.ext.jersey-entity-filtering" version="2.25.1.b0006"/>
-      <unit id="org.glassfish.jersey.ext.jersey-entity-filtering.source" version="2.25.1.b0006"/>
-      <unit id="org.glassfish.jersey.media.jersey-media-json-jackson" version="2.25.1.b0006"/>
-      <unit id="org.glassfish.jersey.media.jersey-media-json-jackson.source" version="2.25.1.b0006"/>
+      <unit id="org.glassfish.jersey.core.jersey-client" version="2.25.1"/>
+      <unit id="org.glassfish.jersey.core.jersey-client.source" version="2.25.1"/>
+      <unit id="org.glassfish.jersey.core.jersey-common" version="2.25.1"/>
+      <unit id="org.glassfish.jersey.core.jersey-common.source" version="2.25.1"/>
+      <unit id="org.glassfish.jersey.core.jersey-server" version="2.25.1"/>
+      <unit id="org.glassfish.jersey.core.jersey-server.source" version="2.25.1"/>
+      <unit id="org.glassfish.jersey.ext.jersey-entity-filtering" version="2.25.1"/>
+      <unit id="org.glassfish.jersey.ext.jersey-entity-filtering.source" version="2.25.1"/>
+      <unit id="org.glassfish.jersey.media.jersey-media-json-jackson" version="2.25.1"/>
+      <unit id="org.glassfish.jersey.media.jersey-media-json-jackson.source" version="2.25.1"/>
       <unit id="org.glassfish.jersey.media.jersey-media-multipart" version="2.25.1"/>
       <unit id="org.glassfish.jersey.media.jersey-media-multipart.source" version="2.25.1"/>
-      <unit id="org.glassfish.jersey.containers.jersey-container-servlet-core" version="2.25.1.b0006"/>
-      <unit id="org.glassfish.jersey.containers.jersey-container-servlet-core.source" version="2.25.1.b0006"/>
+      <unit id="org.glassfish.jersey.containers.jersey-container-servlet-core" version="2.25.1"/>
+      <unit id="org.glassfish.jersey.containers.jersey-container-servlet-core.source" version="2.25.1"/>
       <unit id="org.hsqldb.hsqldb" version="2.3.1"/>
       <unit id="org.hsqldb.hsqldb.source" version="2.3.1"/>
       <unit id="org.ini4j" version="0.5.4"/>
diff --git a/releng/org.simantics.sdk.build.targetdefinition/simantics.target b/releng/org.simantics.sdk.build.targetdefinition/simantics.target
index cdb08f7a1..d9e4c6f89 100644
--- 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="1587382625">
+<target name="Simantics 1.43.0" sequenceNumber="1587642143">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
@@ -331,20 +331,20 @@
       <unit id="org.glassfish.jersey.bundles.repackaged.jersey-guava.source" version="2.25.1"/>
       <unit id="org.glassfish.hk2.external.aopalliance-repackaged" version="2.5.0.b32"/>
       <unit id="org.glassfish.hk2.external.aopalliance-repackaged.source" version="2.5.0.b32"/>
-      <unit id="org.glassfish.jersey.core.jersey-client" version="2.25.1.b0006"/>
-      <unit id="org.glassfish.jersey.core.jersey-client.source" version="2.25.1.b0006"/>
-      <unit id="org.glassfish.jersey.core.jersey-common" version="2.25.1.b0006"/>
-      <unit id="org.glassfish.jersey.core.jersey-common.source" version="2.25.1.b0006"/>
-      <unit id="org.glassfish.jersey.core.jersey-server" version="2.25.1.b0006"/>
-      <unit id="org.glassfish.jersey.core.jersey-server.source" version="2.25.1.b0006"/>
-      <unit id="org.glassfish.jersey.ext.jersey-entity-filtering" version="2.25.1.b0006"/>
-      <unit id="org.glassfish.jersey.ext.jersey-entity-filtering.source" version="2.25.1.b0006"/>
-      <unit id="org.glassfish.jersey.media.jersey-media-json-jackson" version="2.25.1.b0006"/>
-      <unit id="org.glassfish.jersey.media.jersey-media-json-jackson.source" version="2.25.1.b0006"/>
+      <unit id="org.glassfish.jersey.core.jersey-client" version="2.25.1"/>
+      <unit id="org.glassfish.jersey.core.jersey-client.source" version="2.25.1"/>
+      <unit id="org.glassfish.jersey.core.jersey-common" version="2.25.1"/>
+      <unit id="org.glassfish.jersey.core.jersey-common.source" version="2.25.1"/>
+      <unit id="org.glassfish.jersey.core.jersey-server" version="2.25.1"/>
+      <unit id="org.glassfish.jersey.core.jersey-server.source" version="2.25.1"/>
+      <unit id="org.glassfish.jersey.ext.jersey-entity-filtering" version="2.25.1"/>
+      <unit id="org.glassfish.jersey.ext.jersey-entity-filtering.source" version="2.25.1"/>
+      <unit id="org.glassfish.jersey.media.jersey-media-json-jackson" version="2.25.1"/>
+      <unit id="org.glassfish.jersey.media.jersey-media-json-jackson.source" version="2.25.1"/>
       <unit id="org.glassfish.jersey.media.jersey-media-multipart" version="2.25.1"/>
       <unit id="org.glassfish.jersey.media.jersey-media-multipart.source" version="2.25.1"/>
-      <unit id="org.glassfish.jersey.containers.jersey-container-servlet-core" version="2.25.1.b0006"/>
-      <unit id="org.glassfish.jersey.containers.jersey-container-servlet-core.source" version="2.25.1.b0006"/>
+      <unit id="org.glassfish.jersey.containers.jersey-container-servlet-core" version="2.25.1"/>
+      <unit id="org.glassfish.jersey.containers.jersey-container-servlet-core.source" version="2.25.1"/>
       <unit id="org.hsqldb.hsqldb" version="2.3.1"/>
       <unit id="org.hsqldb.hsqldb.source" version="2.3.1"/>
       <unit id="org.ini4j" version="0.5.4"/>