From: jsimomaa <jani.simomaa@gmail.com>
Date: Wed, 23 Aug 2017 10:07:52 +0000 (+0300)
Subject: Missing jersey-client to target & osgi-resource-locator version 2.5-0b32
X-Git-Tag: v1.31.0~229
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F75%2F875%2F3;p=simantics%2Fplatform.git

Missing jersey-client to target & osgi-resource-locator version 2.5-0b32

refs #7447

Change-Id: I75e4412872fb429e51f5c9d81d64b0c1edb2f27a
---

diff --git a/releng/org.simantics.sdk.build.p2.site/pom.xml b/releng/org.simantics.sdk.build.p2.site/pom.xml
index 7455691ff..8b445806f 100644
--- a/releng/org.simantics.sdk.build.p2.site/pom.xml
+++ b/releng/org.simantics.sdk.build.p2.site/pom.xml
@@ -27,7 +27,7 @@
             <name>project-specific-deps</name>
             <url>file:///${basedir}/repo</url>
         </repository>
-        -->
+        --> 
     </repositories>
 
     <build>
@@ -326,6 +326,11 @@
                                     <id>net.java.dev.jna:jna-platform:4.3.0</id>
                                     <source>true</source>
                                 </artifact>
+                                <!-- We do not want 1.0.1 version of this !  -->
+                                <artifact>
+                                    <id>org.glassfish.hk2:osgi-resource-locator:2.5.0-b32</id>
+                                    <source>true</source>
+                                </artifact>
                                 <artifact>
                                     <id>javax.servlet:javax.servlet-api:${javax.version}</id>
                                     <source>true</source>
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 71a6fbad4..0ac03709d 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
@@ -254,12 +254,14 @@
       <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="1.0.1"/>
-      <unit id="org.glassfish.hk2.osgi-resource-locator.source" version="1.0.1"/>
+      <unit id="org.glassfish.hk2.osgi-resource-locator" version="2.5.0.b32"/>
+      <unit id="org.glassfish.hk2.osgi-resource-locator.source" version="2.5.0.b32"/>
       <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"/>
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 a8db375bc..efc9898d1 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
@@ -259,6 +259,8 @@ location "http://www.simantics.org/download/master/external-components/maven" {
 	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
 	org.glassfish.jersey.core.jersey-common.source
 	org.glassfish.jersey.core.jersey-server
diff --git a/releng/org.simantics.sdk.build.targetdefinition/simantics.target b/releng/org.simantics.sdk.build.targetdefinition/simantics.target
index dcd5ea4aa..1ff5d52c3 100644
--- a/releng/org.simantics.sdk.build.targetdefinition/simantics.target
+++ b/releng/org.simantics.sdk.build.targetdefinition/simantics.target
@@ -254,8 +254,8 @@
       <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="1.0.1"/>
-      <unit id="org.glassfish.hk2.osgi-resource-locator.source" version="1.0.1"/>
+      <unit id="org.glassfish.hk2.osgi-resource-locator" version="2.5.0.b32"/>
+      <unit id="org.glassfish.hk2.osgi-resource-locator.source" version="2.5.0.b32"/>
       <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"/>