Add jersey-hk2 bundle to target platforms

* Also using relative paths for `.tpd` inclusions for more convenient
target platform updates

gitlab #486

Change-Id: I186d4dade09e6e29a9fda5da4152e31ec8557e1a

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 7f51cb1cdc925b591f8a3dc506039376daa1acde..cc67db2769be17e925ac4b16b9ef3de009d5ed74 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/eclipse-cbi/targetplatform-dsl -->
-<target name="Eclipse 2019-12 (4.14)" sequenceNumber="1587028863">
+<target name="Eclipse 2019-12 (4.14)" sequenceNumber="1587044983">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
@@ -315,8 +315,16 @@
       <unit id="org.eclipse.jetty.servlets.source" version="9.4.24.v20191120"/>
       <unit id="com.github.benmanes.caffeine" version="2.8.1"/>
       <unit id="com.github.benmanes.caffeine.source" version="2.8.1"/>
+      <unit id="org.glassfish.hk2.api" version="2.6.1"/>
+      <unit id="org.glassfish.hk2.api.source" version="2.6.1"/>
+      <unit id="org.glassfish.hk2.locator" version="2.6.1"/>
+      <unit id="org.glassfish.hk2.locator.source" version="2.6.1"/>
       <unit id="org.glassfish.hk2.osgi-resource-locator" version="1.0.3"/>
       <unit id="org.glassfish.hk2.osgi-resource-locator.source" version="1.0.3"/>
+      <unit id="org.glassfish.hk2.utils" version="2.6.1"/>
+      <unit id="org.glassfish.hk2.utils.source" version="2.6.1"/>
+      <unit id="org.glassfish.hk2.external.aopalliance-repackaged" version="2.6.1"/>
+      <unit id="org.glassfish.hk2.external.aopalliance-repackaged.source" version="2.6.1"/>
       <unit id="org.glassfish.hk2.external.jakarta.inject" version="2.6.1"/>
       <unit id="org.glassfish.hk2.external.jakarta.inject.source" version="2.6.1"/>
       <unit id="org.glassfish.jersey.core.jersey-client" version="2.30.1.b0006"/>
@@ -333,6 +341,8 @@
       <unit id="org.glassfish.jersey.media.jersey-media-multipart.source" version="2.30.1"/>
       <unit id="org.glassfish.jersey.containers.jersey-container-servlet-core" version="2.30.1.b0006"/>
       <unit id="org.glassfish.jersey.containers.jersey-container-servlet-core.source" version="2.30.1.b0006"/>
+      <unit id="org.glassfish.jersey.inject.jersey-hk2" version="2.30.1.b0006"/>
+      <unit id="org.glassfish.jersey.inject.jersey-hk2.source" version="2.30.1.b0006"/>
       <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"/>
@@ -347,6 +357,12 @@
       <unit id="org.bitbucket.mstrobel.procyon-core.source" version="0.5.33"/>
       <unit id="org.jboss.windup.utils.windup-utils.forge-addon" version="4.3.0.Final"/>
       <unit id="org.jboss.windup.utils.windup-utils.forge-addon.source" version="4.3.0.Final"/>
+      <unit id="javassist" version="3.25.0.GA"/>
+      <unit id="javassist.source" version="3.25.0.GA"/>
+      <unit id="jakarta.activation-api" version="1.2.1"/>
+      <unit id="jakarta.activation-api.source" version="1.2.1"/>
+      <unit id="jakarta.annotation-api" version="1.3.5"/>
+      <unit id="jakarta.annotation-api.source" version="1.3.5"/>
       <unit id="jaxen" version="1.2.0"/>
       <unit id="jaxen.source" version="1.2.0"/>
       <unit id="org.jdom2" version="2.0.6.b0001"/>

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 8f52a357177b7d319549aeebbad70aea08fb1508..8544926afe6a8e3e32945f69fdd7b6bc3f057432 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
@@ -316,18 +316,18 @@ location "http://www.simantics.org/download/master/external-components/maven/" {
        org.eclipse.jetty.servlets.source
        com.github.benmanes.caffeine
        com.github.benmanes.caffeine.source
-       //org.glassfish.hk2.api
-       //org.glassfish.hk2.api.source
-       //org.glassfish.hk2.locator
-       //org.glassfish.hk2.locator.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.utils
+       org.glassfish.hk2.utils.source
        //org.glassfish.jersey.bundles.repackaged.jersey-guava
        //org.glassfish.jersey.bundles.repackaged.jersey-guava.source
-       //org.glassfish.hk2.external.aopalliance-repackaged
-       //org.glassfish.hk2.external.aopalliance-repackaged.source
+       org.glassfish.hk2.external.aopalliance-repackaged
+       org.glassfish.hk2.external.aopalliance-repackaged.source
        org.glassfish.hk2.external.jakarta.inject
        org.glassfish.hk2.external.jakarta.inject.source
        org.glassfish.jersey.core.jersey-client
@@ -344,6 +344,8 @@ location "http://www.simantics.org/download/master/external-components/maven/" {
        org.glassfish.jersey.media.jersey-media-multipart.source
        org.glassfish.jersey.containers.jersey-container-servlet-core
        org.glassfish.jersey.containers.jersey-container-servlet-core.source
+       org.glassfish.jersey.inject.jersey-hk2
+       org.glassfish.jersey.inject.jersey-hk2.source
        org.hsqldb.hsqldb
        org.hsqldb.hsqldb.source
        org.ini4j
@@ -358,6 +360,12 @@ location "http://www.simantics.org/download/master/external-components/maven/" {
        org.bitbucket.mstrobel.procyon-core.source
        org.jboss.windup.utils.windup-utils.forge-addon
        org.jboss.windup.utils.windup-utils.forge-addon.source
+       javassist
+       javassist.source
+       jakarta.activation-api
+       jakarta.activation-api.source
+       jakarta.annotation-api
+       jakarta.annotation-api.source
        jaxen
        jaxen.source
        org.jdom2

diff --git a/releng/org.simantics.sdk.build.targetdefinition/simantics.target b/releng/org.simantics.sdk.build.targetdefinition/simantics.target
index 5ae6bcbde3f740d9b7eadd5efcac8f7f52178a51..964c3edab16366453199fd8e8728fcdc607e0636 100644 (file)
--- a/releng/org.simantics.sdk.build.targetdefinition/simantics.target
+++ b/releng/org.simantics.sdk.build.targetdefinition/simantics.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="Simantics 1.44.0" sequenceNumber="1587028894">
+<target name="Simantics 1.44.0" sequenceNumber="1587044993">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
@@ -315,8 +315,16 @@
       <unit id="org.eclipse.jetty.servlets.source" version="9.4.24.v20191120"/>
       <unit id="com.github.benmanes.caffeine" version="2.8.1"/>
       <unit id="com.github.benmanes.caffeine.source" version="2.8.1"/>
+      <unit id="org.glassfish.hk2.api" version="2.6.1"/>
+      <unit id="org.glassfish.hk2.api.source" version="2.6.1"/>
+      <unit id="org.glassfish.hk2.locator" version="2.6.1"/>
+      <unit id="org.glassfish.hk2.locator.source" version="2.6.1"/>
       <unit id="org.glassfish.hk2.osgi-resource-locator" version="1.0.3"/>
       <unit id="org.glassfish.hk2.osgi-resource-locator.source" version="1.0.3"/>
+      <unit id="org.glassfish.hk2.utils" version="2.6.1"/>
+      <unit id="org.glassfish.hk2.utils.source" version="2.6.1"/>
+      <unit id="org.glassfish.hk2.external.aopalliance-repackaged" version="2.6.1"/>
+      <unit id="org.glassfish.hk2.external.aopalliance-repackaged.source" version="2.6.1"/>
       <unit id="org.glassfish.hk2.external.jakarta.inject" version="2.6.1"/>
       <unit id="org.glassfish.hk2.external.jakarta.inject.source" version="2.6.1"/>
       <unit id="org.glassfish.jersey.core.jersey-client" version="2.30.1.b0006"/>
@@ -333,6 +341,8 @@
       <unit id="org.glassfish.jersey.media.jersey-media-multipart.source" version="2.30.1"/>
       <unit id="org.glassfish.jersey.containers.jersey-container-servlet-core" version="2.30.1.b0006"/>
       <unit id="org.glassfish.jersey.containers.jersey-container-servlet-core.source" version="2.30.1.b0006"/>
+      <unit id="org.glassfish.jersey.inject.jersey-hk2" version="2.30.1.b0006"/>
+      <unit id="org.glassfish.jersey.inject.jersey-hk2.source" version="2.30.1.b0006"/>
       <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"/>
@@ -347,6 +357,12 @@
       <unit id="org.bitbucket.mstrobel.procyon-core.source" version="0.5.33"/>
       <unit id="org.jboss.windup.utils.windup-utils.forge-addon" version="4.3.0.Final"/>
       <unit id="org.jboss.windup.utils.windup-utils.forge-addon.source" version="4.3.0.Final"/>
+      <unit id="javassist" version="3.25.0.GA"/>
+      <unit id="javassist.source" version="3.25.0.GA"/>
+      <unit id="jakarta.activation-api" version="1.2.1"/>
+      <unit id="jakarta.activation-api.source" version="1.2.1"/>
+      <unit id="jakarta.annotation-api" version="1.3.5"/>
+      <unit id="jakarta.annotation-api.source" version="1.3.5"/>
       <unit id="jaxen" version="1.2.0"/>
       <unit id="jaxen.source" version="1.2.0"/>
       <unit id="org.jdom2" version="2.0.6.b0001"/>

diff --git a/releng/org.simantics.sdk.build.targetdefinition/simantics.tpd b/releng/org.simantics.sdk.build.targetdefinition/simantics.tpd
index 8d63f70f4a3977e7c950f5ab3c41ed2f9c837ddd..f607a133f843e1903d5866a7695beafbd72ac911 100644 (file)
--- a/releng/org.simantics.sdk.build.targetdefinition/simantics.tpd
+++ b/releng/org.simantics.sdk.build.targetdefinition/simantics.tpd
@@ -2,7 +2,7 @@ target "Simantics 1.44.0"
 
 with source allEnvironments
 
-include "http://www.simantics.org/download/master/org.simantics.sdk.build.targetdefinition.tpd"
+include "./org.simantics.sdk.build.targetdefinition.tpd"
 
 location "http://www.simantics.org/download/master/sdk" {
        org.simantics.sdk.feature.group lazy