Adding HK2 for Jersey injection

Update target platform to include Aries for OSGI service loading

refs #7447

Change-Id: I702b2d2c34a596a849f2b535ff43d9cf58be4108

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 c454c17ccaa50d93f0305d5f60ea4b7109261191..50e2f4976e1c1c09b3664eb3dab3b3fc98cf8334 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="1503580550">
+<target name="Eclipse Oxygen" sequenceNumber="1503582707">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
@@ -201,6 +201,10 @@
       <unit id="net.ucanaccess.source" version="3.0.7"/>
       <unit id="org.antlr.runtime" version="3.5.2"/>
       <unit id="org.antlr.runtime.source" version="3.5.2"/>
+      <unit id="org.apache.aries.spifly.core-internal" version="1.0.8"/>
+      <unit id="org.apache.aries.spifly.dynamic.bundle" version="1.0.8"/>
+      <unit id="org.apache.aries.spifly.weaver-internal" version="1.0.8"/>
+      <unit id="org.apache.aries.util" version="1.0.0"/>
       <unit id="org.apache.commons.codec" version="1.10.0"/>
       <unit id="org.apache.commons.codec.source" version="1.10.0"/>
       <unit id="org.apache.commons.collections" version="3.2.2"/>

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 821e4792a7e67788b168c3779058b529ca76eebf..5018f573e89f3b401c0f02aa08e34204e6c7ee1c 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
@@ -200,6 +200,10 @@ location "http://www.simantics.org/download/master/external-components/maven" {
        net.ucanaccess.source
        org.antlr.runtime
        org.antlr.runtime.source
+       org.apache.aries.spifly.core-internal
+       org.apache.aries.spifly.dynamic.bundle
+       org.apache.aries.spifly.weaver-internal
+       org.apache.aries.util
        org.apache.commons.codec
        org.apache.commons.codec.source
        org.apache.commons.collections