Adding HK2 for Jersey injection

Update target platform

refs #7447

Change-Id: Ibf0bb2191457115e23128cf5a205779ed758ea34

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 af1ee318e7c0d22782cf07c46c14750ff136f339..c454c17ccaa50d93f0305d5f60ea4b7109261191 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/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Eclipse Oxygen" sequenceNumber="1503489430">
+<target name="Eclipse Oxygen" sequenceNumber="1503580550">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
@@ -187,6 +187,8 @@
       <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.22.0.CR2"/>
+      <unit id="javassist.source" version="3.22.0.CR2"/>
       <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"/>
@@ -242,10 +244,20 @@
       <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.b42"/>
+      <unit id="org.glassfish.hk2.api.source" version="2.5.0.b42"/>
+      <unit id="org.glassfish.hk2.locator" version="2.5.0.b42"/>
+      <unit id="org.glassfish.hk2.locator.source" version="2.5.0.b42"/>
       <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.utils" version="2.5.0.b42"/>
+      <unit id="org.glassfish.hk2.utils.source" version="2.5.0.b42"/>
+      <unit id="org.glassfish.hk2.external.aopalliance-repackaged" version="2.5.0.b42"/>
+      <unit id="org.glassfish.hk2.external.aopalliance-repackaged.source" version="2.5.0.b42"/>
       <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.inject.jersey-hk2" version="2.26.0.b09"/>
+      <unit id="org.glassfish.jersey.inject.jersey-hk2.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"/>

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 671f47214efe907dad0b5dea9436e56bcefcc6af..821e4792a7e67788b168c3779058b529ca76eebf 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
@@ -186,6 +186,8 @@ 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
@@ -241,10 +243,20 @@ 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.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.hk2.external.aopalliance-repackaged
+       org.glassfish.hk2.external.aopalliance-repackaged.source
        org.glassfish.jersey.core.jersey-client
        org.glassfish.jersey.core.jersey-client.source
+       org.glassfish.jersey.inject.jersey-hk2
+       org.glassfish.jersey.inject.jersey-hk2.source
        org.glassfish.jersey.core.jersey-common
        org.glassfish.jersey.core.jersey-common.source
        org.glassfish.jersey.core.jersey-server