From 2f003976ab7ba24857dfac03f11edda56843fa88 Mon Sep 17 00:00:00 2001
From: jsimomaa <jani.simomaa@gmail.com>
Date: Wed, 24 May 2017 21:24:56 +0300
Subject: [PATCH] Adding Jersey HTTP Client to target platform

#7243

Change-Id: I004c550f611b2dec92c9a680e62d023ea1095ea3
---
 .../org.simantics.sdk.build.p2.site/pom.xml   | 30 ++++++++--
 ...imantics.sdk.build.targetdefinition.target | 57 ++++++++++++++++---
 .../simantics.target                          | 52 ++++++++++++++---
 3 files changed, 116 insertions(+), 23 deletions(-)

diff --git a/releng/org.simantics.sdk.build.p2.site/pom.xml b/releng/org.simantics.sdk.build.p2.site/pom.xml
index 50989e45f..295988bb7 100644
--- a/releng/org.simantics.sdk.build.p2.site/pom.xml
+++ b/releng/org.simantics.sdk.build.p2.site/pom.xml
@@ -323,19 +323,27 @@
                                     <source>true</source>
                                 </artifact>
                                 <artifact>
-                                    <id>com.fasterxml.jackson.core:jackson-core:2.8.5</id>
+                                    <id>com.fasterxml.jackson.core:jackson-core:2.8.8</id>
                                     <source>true</source>
                                 </artifact>
                                 <artifact>
-                                    <id>com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.8.5</id>
+                                    <id>com.fasterxml.jackson.core:jackson-databind:2.8.8</id>
                                     <source>true</source>
                                 </artifact>
                                 <artifact>
-                                    <id>com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.8.5</id>
+                                    <id>com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.8.8</id>
                                     <source>true</source>
                                 </artifact>
                                 <artifact>
-                                    <id>org.slf4j:slf4j-api:1.7.20</id>
+                                    <id>com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.8.8</id>
+                                    <source>true</source>
+                                </artifact>
+                                <artifact>
+                                    <id>com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.8.8</id>
+                                    <source>true</source>
+                                </artifact>
+                                <artifact>
+                                    <id>org.slf4j:slf4j-api:1.7.25</id>
                                     <source>true</source>
                                     <override>true</override>
                                     <instructions>
@@ -344,7 +352,7 @@
                                     </instructions>
                                 </artifact>
                                 <artifact>
-                                    <id>ch.qos.logback:logback-classic:1.1.7</id>
+                                    <id>ch.qos.logback:logback-classic:1.2.3</id>
                                     <source>true</source>
                                     <override>true</override>
                                 </artifact>
@@ -360,6 +368,18 @@
                                     <id>com.esotericsoftware:kryo:4.0.0</id>
                                     <source>true</source>
                                 </artifact>
+                                <artifact>
+                                    <id>org.glassfish.jersey.core:jersey-client:2.25.1</id>
+                                    <source>true</source>
+                                </artifact>
+                                <artifact>
+                                    <id>org.glassfish.jersey.media:jersey-media-multipart:2.25.1</id>
+                                    <source>true</source>
+                                </artifact>
+                                <artifact>
+                                    <id>org.glassfish.jersey.media:jersey-media-json-jackson:2.25.1</id>
+                                    <source>true</source>
+                                </artifact>
                             </artifacts>
                         </configuration>
                     </execution>
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 db7cb6e76..9c37f1e9f 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,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Eclipse Mars.2" sequenceNumber="228">
+<?pde version="3.8"?><target name="Eclipse Mars.2" sequenceNumber="229">
 <locations>
 <location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="org.objectweb.asm.xml.source" version="5.0.1.v201404251740"/>
@@ -109,14 +109,20 @@
 <unit id="com.esotericsoftware.reflectasm.source" version="1.11.3"/>
 <unit id="com.fasterxml.jackson.core.jackson-annotations" version="2.8.0"/>
 <unit id="com.fasterxml.jackson.core.jackson-annotations.source" version="2.8.0"/>
-<unit id="com.fasterxml.jackson.core.jackson-core" version="2.8.5"/>
-<unit id="com.fasterxml.jackson.core.jackson-core.source" version="2.8.5"/>
-<unit id="com.fasterxml.jackson.core.jackson-databind" version="2.8.5"/>
-<unit id="com.fasterxml.jackson.core.jackson-databind.source" version="2.8.5"/>
-<unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-csv" version="2.8.5"/>
-<unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-csv.source" version="2.8.5"/>
-<unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-xml" version="2.8.5"/>
-<unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-xml.source" version="2.8.5"/>
+<unit id="com.fasterxml.jackson.core.jackson-core" version="2.8.8"/>
+<unit id="com.fasterxml.jackson.core.jackson-core.source" version="2.8.8"/>
+<unit id="com.fasterxml.jackson.core.jackson-databind" version="2.8.8"/>
+<unit id="com.fasterxml.jackson.core.jackson-databind.source" version="2.8.8"/>
+<unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-csv" version="2.8.8"/>
+<unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-csv.source" version="2.8.8"/>
+<unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-xml" version="2.8.8"/>
+<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.8"/>
+<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base.source" version="2.8.8"/>
+<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" version="2.8.8"/>
+<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider.source" version="2.8.8"/>
 <unit id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations" version="2.8.5"/>
 <unit id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations.source" version="2.8.5"/>
 <unit id="com.fasterxml.woodstox.woodstox-core" version="5.0.3"/>
@@ -145,6 +151,11 @@
 <unit id="gnu.trove3.source" version="3.0.3"/>
 <unit id="it.unimi.dsi.fastutil" version="7.0.13"/>
 <unit id="it.unimi.dsi.fastutil.source" version="7.0.13"/>
+<unit id="javax.annoation.javax.annotation-api" version="1.2"/>
+<unit id="javax.annoation.javax.annotation-api.source" version="1.2"/>
+<unit id="javax.ws.rs.javax.ws.rs-api" version="2.0.1"/>
+<unit id="javax.ws.rs.javax.ws.rs-api.source" version="2.0.1"/>
+<unit id="javax.annoation.javax-annotation-api.source" version="1.5.12"/>
 <unit id="jakarta-regexp" version="1.4.0"/>
 <unit id="net.jcip.annotations" version="1.0.0"/>
 <unit id="net.jcip.annotations.source" version="1.0.0"/>
@@ -191,14 +202,42 @@
 <unit id="org.eclipse.collections.eclipse-collections-api.source" version="7.1.0"/>
 <unit id="org.eclipse.collections.eclipse-collections" version="7.1.0"/>
 <unit id="org.eclipse.collections.eclipse-collections.source" version="7.1.0"/>
+<unit id="org.glassfish.hk2.hk2-api" version="2.5.0-b32"/>
+<unit id="org.glassfish.hk2.hk2-api.source" version="2.5.0-b32"/>
+<unit id="org.glassfish.hk2.hk2-locator" version="2.5.0-b32"/>
+<unit id="org.glassfish.hk2.hk2-locator.source" version="2.5.0-b32"/>
+<unit id="org.glassfish.hk2.hk2-utils" version="2.5.0-b32"/>
+<unit id="org.glassfish.hk2.hk2-utils.source" version="2.5.0-b32"/>
+<unit id="org.glassfish.hk2.osgi-resource-locator" version="1.0.1"/>
+<unit id="org.glassfish.hk2.osgi-resource-locator" version="1.0.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.hk2.external.javax.inject" version="2.5.0-b32"/>
+<unit id="org.glassfish.hk2.external.javax.inject.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.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-multipart" version="2.25.1"/>
+<unit id="org.glassfish.jersey.media.jersey-media-multipart.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.hsqldb.hsqldb" version="2.3.1"/>
 <unit id="org.hsqldb.hsqldb.source" version="2.3.1"/>
+<unit id="org.javassist.javassist" version="3.20.0-GA"/>
+<unit id="org.javassist.javassist.source" version="3.20.0-GA"/>
 <unit id="org.jdom2" version="2.0.6.b0001"/>
 <unit id="org.jdom2.source" version="2.0.6.b0001"/>
 <unit id="org.jfree.jchart" version="1.0.19"/>
 <unit id="org.jfree.jchart.source" version="1.0.19"/>
 <unit id="org.jfree.jcommon" version="1.0.23"/>
 <unit id="org.jfree.jcommon.source" version="1.0.23"/>
+<unit id="org.jvnet.mimepull.mimepull" version="1.9.6"/>
+<unit id="org.jvnet.mimepull.mimepull.source" version="1.9.6"/>
 <unit id="org.mozilla.rhino" version="1.7.7.1"/>
 <unit id="org.mozilla.rhino.source" version="1.7.7.1"/>
 <unit id="org.objenesis" version="2.2.0"/>
diff --git a/releng/org.simantics.sdk.build.targetdefinition/simantics.target b/releng/org.simantics.sdk.build.targetdefinition/simantics.target
index 455222dea..080e704d4 100644
--- a/releng/org.simantics.sdk.build.targetdefinition/simantics.target
+++ b/releng/org.simantics.sdk.build.targetdefinition/simantics.target
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="Simantics 1.29.0" sequenceNumber="18">
+<target name="Simantics 1.29.0" sequenceNumber="19">
 <locations>
 <location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="org.simantics.sdk.feature.group" version="1.29.0"/>
@@ -115,14 +115,20 @@
 <unit id="com.esotericsoftware.reflectasm.source" version="1.11.3"/>
 <unit id="com.fasterxml.jackson.core.jackson-annotations" version="2.8.0"/>
 <unit id="com.fasterxml.jackson.core.jackson-annotations.source" version="2.8.0"/>
-<unit id="com.fasterxml.jackson.core.jackson-core" version="2.8.5"/>
-<unit id="com.fasterxml.jackson.core.jackson-core.source" version="2.8.5"/>
-<unit id="com.fasterxml.jackson.core.jackson-databind" version="2.8.5"/>
-<unit id="com.fasterxml.jackson.core.jackson-databind.source" version="2.8.5"/>
-<unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-csv" version="2.8.5"/>
-<unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-csv.source" version="2.8.5"/>
-<unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-xml" version="2.8.5"/>
-<unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-xml.source" version="2.8.5"/>
+<unit id="com.fasterxml.jackson.core.jackson-core" version="2.8.8"/>
+<unit id="com.fasterxml.jackson.core.jackson-core.source" version="2.8.8"/>
+<unit id="com.fasterxml.jackson.core.jackson-databind" version="2.8.8"/>
+<unit id="com.fasterxml.jackson.core.jackson-databind.source" version="2.8.8"/>
+<unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-csv" version="2.8.8"/>
+<unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-csv.source" version="2.8.8"/>
+<unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-xml" version="2.8.8"/>
+<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.8"/>
+<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base.source" version="2.8.8"/>
+<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" version="2.8.8"/>
+<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider.source" version="2.8.8"/>
 <unit id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations" version="2.8.5"/>
 <unit id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations.source" version="2.8.5"/>
 <unit id="com.fasterxml.woodstox.woodstox-core" version="5.0.3"/>
@@ -197,14 +203,42 @@
 <unit id="org.eclipse.collections.eclipse-collections-api.source" version="7.1.0"/>
 <unit id="org.eclipse.collections.eclipse-collections" version="7.1.0"/>
 <unit id="org.eclipse.collections.eclipse-collections.source" version="7.1.0"/>
+<unit id="org.glassfish.hk2.hk2-api" version="2.5.0-b32"/>
+<unit id="org.glassfish.hk2.hk2-api.source" version="2.5.0-b32"/>
+<unit id="org.glassfish.hk2.hk2-locator" version="2.5.0-b32"/>
+<unit id="org.glassfish.hk2.hk2-locator.source" version="2.5.0-b32"/>
+<unit id="org.glassfish.hk2.hk2-utils" version="2.5.0-b32"/>
+<unit id="org.glassfish.hk2.hk2-utils.source" version="2.5.0-b32"/>
+<unit id="org.glassfish.hk2.osgi-resource-locator" version="1.0.1"/>
+<unit id="org.glassfish.hk2.osgi-resource-locator" version="1.0.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.hk2.external.javax.inject" version="2.5.0-b32"/>
+<unit id="org.glassfish.hk2.external.javax.inject.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.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-multipart" version="2.25.1"/>
+<unit id="org.glassfish.jersey.media.jersey-media-multipart.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.hsqldb.hsqldb" version="2.3.1"/>
 <unit id="org.hsqldb.hsqldb.source" version="2.3.1"/>
+<unit id="org.javassist.javassist" version="3.20.0-GA"/>
+<unit id="org.javassist.javassist.source" version="3.20.0-GA"/>
 <unit id="org.jdom2" version="2.0.6.b0001"/>
 <unit id="org.jdom2.source" version="2.0.6.b0001"/>
 <unit id="org.jfree.jchart" version="1.0.19"/>
 <unit id="org.jfree.jchart.source" version="1.0.19"/>
 <unit id="org.jfree.jcommon" version="1.0.23"/>
 <unit id="org.jfree.jcommon.source" version="1.0.23"/>
+<unit id="org.jvnet.mimepull.mimepull" version="1.9.6"/>
+<unit id="org.jvnet.mimepull.mimepull.source" version="1.9.6"/>
 <unit id="org.mozilla.rhino" version="1.7.7.1"/>
 <unit id="org.mozilla.rhino.source" version="1.7.7.1"/>
 <unit id="org.objenesis" version="2.2.0"/>
-- 
2.43.2