From 120bf8224daecdfda1ee99a549cd8972996098bd Mon Sep 17 00:00:00 2001
From: jsimomaa <jani.simomaa@gmail.com>
Date: Wed, 23 Aug 2017 14:58:00 +0300
Subject: [PATCH] Change jersey from 2.25.1 to 2.26 to resolve resource-locator
 problems

Update target platform definitions

refs #7447

Change-Id: I9b5d485a9640f944ed0cbd78644edb7b96308f86
---
 ...imantics.sdk.build.targetdefinition.target | 54 +++++++------------
 ...g.simantics.sdk.build.targetdefinition.tpd | 16 ------
 2 files changed, 19 insertions(+), 51 deletions(-)

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 9a8841129..af1ee318e 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/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Eclipse Oxygen" sequenceNumber="1502721012">
+<target name="Eclipse Oxygen" sequenceNumber="1503489430">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
@@ -160,10 +160,6 @@
       <unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-xml.source" version="2.8.8"/>
       <unit id="com.fasterxml.jackson.datatype.jackson-datatype-jsr310" version="2.8.8"/>
       <unit id="com.fasterxml.jackson.datatype.jackson-datatype-jsr310.source" version="2.8.8"/>
-      <unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base" version="2.8.4"/>
-      <unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base.source" version="2.8.4"/>
-      <unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" version="2.8.4"/>
-      <unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider.source" version="2.8.4"/>
       <unit id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations" version="2.8.8"/>
       <unit id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations.source" version="2.8.8"/>
       <unit id="com.fasterxml.woodstox.woodstox-core" version="5.0.3"/>
@@ -191,14 +187,12 @@
       <unit id="it.unimi.dsi.fastutil" version="7.2.1"/>
       <unit id="it.unimi.dsi.fastutil.source" version="7.2.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.validation.api" version="1.1.0.Final"/>
       <unit id="javax.validation.api.source" version="1.1.0.Final"/>
-      <unit id="javax.ws.rs-api" version="2.0.1"/>
-      <unit id="javax.ws.rs-api.source" version="2.0.1"/>
+      <unit id="javax.ws.rs-api" version="2.0.99.b01"/>
+      <unit id="javax.ws.rs-api.source" version="2.0.99.b01"/>
       <unit id="net.jcip.annotations" version="1.0.0"/>
       <unit id="net.jcip.annotations.source" version="1.0.0"/>
       <unit id="net.ucanaccess" version="3.0.7"/>
@@ -248,32 +242,22 @@
       <unit id="org.bouncycastle.bctsp-jdk14.source" version="1.38.0"/>
       <unit id="org.eclipse.collections.eclipse-collections" version="8.1.0"/>
       <unit id="org.eclipse.collections.eclipse-collections.source" version="8.1.0"/>
-      <unit id="org.glassfish.hk2.api" version="2.5.0.b32"/>
-      <unit id="org.glassfish.hk2.api.source" version="2.5.0.b32"/>
-      <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.hk2.locator" version="2.5.0.b32"/>
-      <unit id="org.glassfish.hk2.locator.source" version="2.5.0.b32"/>
-      <unit id="org.glassfish.hk2.osgi-resource-locator" version="2.5.0"/>
-      <unit id="org.glassfish.hk2.osgi-resource-locator.source" version="2.5.0"/>
-      <unit id="org.glassfish.hk2.utils" version="2.5.0.b32"/>
-      <unit id="org.glassfish.hk2.utils.source" version="2.5.0.b32"/>
-      <unit id="org.glassfish.jersey.bundles.repackaged.jersey-guava" version="2.25.1"/>
-      <unit id="org.glassfish.jersey.bundles.repackaged.jersey-guava.source" version="2.25.1"/>
-      <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"/>
-      <unit id="org.glassfish.jersey.containers.jersey-container-servlet-core.source" version="2.25.1"/>
+      <unit id="org.glassfish.hk2.osgi-resource-locator" version="1.0.1"/>
+      <unit id="org.glassfish.hk2.osgi-resource-locator.source" version="1.0.1"/>
+      <unit id="org.glassfish.jersey.core.jersey-client" version="2.26.0.b09"/>
+      <unit id="org.glassfish.jersey.core.jersey-client.source" version="2.26.0.b09"/>
+      <unit id="org.glassfish.jersey.core.jersey-common" version="2.26.0.b09"/>
+      <unit id="org.glassfish.jersey.core.jersey-common.source" version="2.26.0.b09"/>
+      <unit id="org.glassfish.jersey.core.jersey-server" version="2.26.0.b09"/>
+      <unit id="org.glassfish.jersey.core.jersey-server.source" version="2.26.0.b09"/>
+      <unit id="org.glassfish.jersey.ext.jersey-entity-filtering" version="2.26.0.b09"/>
+      <unit id="org.glassfish.jersey.ext.jersey-entity-filtering.source" version="2.26.0.b09"/>
+      <unit id="org.glassfish.jersey.media.jersey-media-json-jackson" version="2.26.0.b09"/>
+      <unit id="org.glassfish.jersey.media.jersey-media-json-jackson.source" version="2.26.0.b09"/>
+      <unit id="org.glassfish.jersey.media.jersey-media-multipart" version="2.26.0.b09"/>
+      <unit id="org.glassfish.jersey.media.jersey-media-multipart.source" version="2.26.0.b09"/>
+      <unit id="org.glassfish.jersey.containers.jersey-container-servlet-core" version="2.26.0.b09"/>
+      <unit id="org.glassfish.jersey.containers.jersey-container-servlet-core.source" version="2.26.0.b09"/>
       <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/org.simantics.sdk.build.targetdefinition.tpd b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.tpd
index efc9898d1..671f47214 100644
--- 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
@@ -159,10 +159,6 @@ location "http://www.simantics.org/download/master/external-components/maven" {
 	com.fasterxml.jackson.dataformat.jackson-dataformat-xml.source
 	com.fasterxml.jackson.datatype.jackson-datatype-jsr310
 	com.fasterxml.jackson.datatype.jackson-datatype-jsr310.source
-	com.fasterxml.jackson.jaxrs.jackson-jaxrs-base
-	com.fasterxml.jackson.jaxrs.jackson-jaxrs-base.source
-	com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider
-	com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider.source
 	com.fasterxml.jackson.module.jackson-module-jaxb-annotations
 	com.fasterxml.jackson.module.jackson-module-jaxb-annotations.source
 	com.fasterxml.woodstox.woodstox-core
@@ -190,8 +186,6 @@ location "http://www.simantics.org/download/master/external-components/maven" {
 	it.unimi.dsi.fastutil
 	it.unimi.dsi.fastutil.source
 	jakarta-regexp
-	javassist
-	javassist.source
 	javax.servlet-api
 	javax.servlet-api.source
 	javax.validation.api
@@ -247,18 +241,8 @@ location "http://www.simantics.org/download/master/external-components/maven" {
 	org.bouncycastle.bctsp-jdk14.source
 	org.eclipse.collections.eclipse-collections
 	org.eclipse.collections.eclipse-collections.source
-	org.glassfish.hk2.api
-	org.glassfish.hk2.api.source
-	org.glassfish.hk2.external.aopalliance-repackaged
-	org.glassfish.hk2.external.aopalliance-repackaged.source
-	org.glassfish.hk2.locator
-	org.glassfish.hk2.locator.source
 	org.glassfish.hk2.osgi-resource-locator
 	org.glassfish.hk2.osgi-resource-locator.source
-	org.glassfish.hk2.utils
-	org.glassfish.hk2.utils.source
-	org.glassfish.jersey.bundles.repackaged.jersey-guava
-	org.glassfish.jersey.bundles.repackaged.jersey-guava.source
 	org.glassfish.jersey.core.jersey-client
 	org.glassfish.jersey.core.jersey-client.source
 	org.glassfish.jersey.core.jersey-common
-- 
2.47.1