Update target platforms with jersey and jackson version change

gitlab #486

Change-Id: I1b3d56efddeb3d91cf172b5f25077c97f1b25c89

diff --git a/bundles/org.simantics.auditlogging/META-INF/MANIFEST.MF b/bundles/org.simantics.auditlogging/META-INF/MANIFEST.MF
index 7c26acd26defb9240083be621c8d3595e63c29f2..427b274c44ff0e53a9e1c508dd9ed448984394f0 100644 (file)
--- a/bundles/org.simantics.auditlogging/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.auditlogging/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.core.runtime,
  com.fasterxml.jackson.core.jackson-core,
  org.slf4j.api,
  javax.servlet-api,
- jakarta.ws.rs-api,
+ javax.ws.rs-api,
  org.eclipse.jetty.server;bundle-version="9.4.24",
  org.eclipse.jetty.servlet;bundle-version="9.4.24",
  org.eclipse.jetty.util;bundle-version="9.4.24",

diff --git a/bundles/org.simantics.history.rest/META-INF/MANIFEST.MF b/bundles/org.simantics.history.rest/META-INF/MANIFEST.MF
index c9f04535f309513145c48ba2534f0a54d91db17b..6ee40d1c191497a40ae62eabc10059a3a66b849c 100644 (file)
--- a/bundles/org.simantics.history.rest/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.history.rest/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.simantics.history;bundle-version="1.0.0",
  org.eclipse.core.runtime;bundle-version="3.13.0",
  org.glassfish.jersey.core.jersey-server,
- jakarta.ws.rs-api,
+ javax.ws.rs-api,
  org.simantics.scl.compiler,
  org.simantics.scl.osgi,
  org.eclipse.jetty.servlet,

diff --git a/bundles/org.simantics.scl.rest/META-INF/MANIFEST.MF b/bundles/org.simantics.scl.rest/META-INF/MANIFEST.MF
index 2c2f670f850f294fa68f2c5586504917817942d5..dd0d78bf300b9cb8c74b2650e1e88262d19de1b1 100644 (file)
--- a/bundles/org.simantics.scl.rest/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.scl.rest/META-INF/MANIFEST.MF
@@ -24,7 +24,7 @@ Require-Bundle: org.glassfish.jersey.core.jersey-server,
  org.glassfish.jersey.core.jersey-common;bundle-version="2.25.1",
  org.simantics.scl.runtime,
  org.eclipse.osgi;bundle-version="3.15.100",
- jakarta.ws.rs-api;bundle-version="2.1.6"
+ javax.ws.rs-api
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.simantics.scl.rest

diff --git a/features/org.simantics.history.rest.feature/feature.xml b/features/org.simantics.history.rest.feature/feature.xml
index b5cd3f73d42aa66c56e96d07c2abdd8c2361acad..598157c6e1b58532274b578a4b987894e9c3afbf 100644 (file)
--- a/features/org.simantics.history.rest.feature/feature.xml
+++ b/features/org.simantics.history.rest.feature/feature.xml
@@ -40,7 +40,7 @@
          unpack="false"/>
 
    <plugin
-         id="jakarta.ws.rs-api"
+         id="javax.ws.rs-api"
          download-size="0"
          install-size="0"
          version="0.0.0"
@@ -152,7 +152,7 @@
          unpack="false"/>
 
    <plugin
-         id="jakarta.validation.jakarta.validation-api"
+         id="javax.validation.api"
          download-size="0"
          install-size="0"
          version="0.0.0"

diff --git a/features/org.simantics.scl.rest.feature/feature.xml b/features/org.simantics.scl.rest.feature/feature.xml
index b33416caada2000fefb9b76d6754cbfb3c5e6226..888c5713ec86fee427356ca7a41b5c8b3d9c20a4 100644 (file)
--- a/features/org.simantics.scl.rest.feature/feature.xml
+++ b/features/org.simantics.scl.rest.feature/feature.xml
@@ -110,7 +110,7 @@ This Agreement is governed by the laws of the State of New York and the intellec
          unpack="false"/>
 
    <plugin
-         id="jakarta.ws.rs-api"
+         id="javax.ws.rs-api"
          download-size="0"
          install-size="0"
          version="0.0.0"
@@ -236,7 +236,7 @@ This Agreement is governed by the laws of the State of New York and the intellec
          unpack="false"/>
 
    <plugin
-         id="jakarta.validation.jakarta.validation-api"
+         id="javax.validation.api"
          download-size="0"
          install-size="0"
          version="0.0.0"
@@ -284,11 +284,4 @@ This Agreement is governed by the laws of the State of New York and the intellec
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="jakarta.xml.bind-api"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
 </feature>

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 9524eff172bcd1c9bb918bbff210b5665c4e84d3..87d4910629e7101ddc92b006917ac7b4cd3e80bc 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="1583830231">
+<target name="Eclipse 2019-12 (4.14)" sequenceNumber="1587368699">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
@@ -195,28 +195,30 @@
       <unit id="com.esotericsoftware.minlog.source" version="1.3.0"/>
       <unit id="com.esotericsoftware.reflectasm" version="1.11.3"/>
       <unit id="com.esotericsoftware.reflectasm.source" version="1.11.3"/>
-      <unit id="com.fasterxml.jackson.core.jackson-annotations" version="2.10.2"/>
-      <unit id="com.fasterxml.jackson.core.jackson-annotations.source" version="2.10.2"/>
-      <unit id="com.fasterxml.jackson.core.jackson-core" version="2.10.2"/>
-      <unit id="com.fasterxml.jackson.core.jackson-core.source" version="2.10.2"/>
-      <unit id="com.fasterxml.jackson.core.jackson-databind" version="2.10.2"/>
-      <unit id="com.fasterxml.jackson.core.jackson-databind.source" version="2.10.2"/>
-      <unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-csv" version="2.10.2"/>
-      <unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-csv.source" version="2.10.2"/>
-      <unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-xml" version="2.10.2"/>
-      <unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-xml.source" version="2.10.2"/>
-      <unit id="com.fasterxml.jackson.datatype.jackson-datatype-jsr310" version="2.10.2"/>
-      <unit id="com.fasterxml.jackson.datatype.jackson-datatype-jsr310.source" version="2.10.2"/>
-      <unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base" version="2.10.2"/>
-      <unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base.source" version="2.10.2"/>
-      <unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" version="2.10.2"/>
-      <unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider.source" version="2.10.2"/>
-      <unit id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations" version="2.10.2"/>
-      <unit id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations.source" version="2.10.2"/>
-      <unit id="com.fasterxml.woodstox.woodstox-core" version="6.0.3"/>
-      <unit id="com.fasterxml.woodstox.woodstox-core.source" version="6.0.3"/>
+      <unit id="com.fasterxml.jackson.core.jackson-annotations" version="2.8.11"/>
+      <unit id="com.fasterxml.jackson.core.jackson-annotations.source" version="2.8.11"/>
+      <unit id="com.fasterxml.jackson.core.jackson-core" version="2.8.11"/>
+      <unit id="com.fasterxml.jackson.core.jackson-core.source" version="2.8.11"/>
+      <unit id="com.fasterxml.jackson.core.jackson-databind" version="2.8.11"/>
+      <unit id="com.fasterxml.jackson.core.jackson-databind.source" version="2.8.11"/>
+      <unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-csv" version="2.8.11"/>
+      <unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-csv.source" version="2.8.11"/>
+      <unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-xml" version="2.8.11"/>
+      <unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-xml.source" version="2.8.11"/>
+      <unit id="com.fasterxml.jackson.datatype.jackson-datatype-jsr310" version="2.8.11"/>
+      <unit id="com.fasterxml.jackson.datatype.jackson-datatype-jsr310.source" version="2.8.11"/>
+      <unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base" version="2.8.11"/>
+      <unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base.source" version="2.8.11"/>
+      <unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" version="2.8.11"/>
+      <unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider.source" version="2.8.11"/>
+      <unit id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations" version="2.8.11"/>
+      <unit id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations.source" version="2.8.11"/>
+      <unit id="com.fasterxml.woodstox.woodstox-core" version="5.0.3"/>
+      <unit id="com.fasterxml.woodstox.woodstox-core.source" version="5.0.3"/>
       <unit id="com.healthmarketscience.jackcess" version="2.1.3"/>
       <unit id="com.healthmarketscience.jackcess.source" version="2.1.3"/>
+      <unit id="com.influxdb.client-core" version="1.5.0"/>
+      <unit id="com.influxdb.client-core.source" version="1.5.0"/>
       <unit id="com.influxdb.client-java" version="1.5.0"/>
       <unit id="com.influxdb.client-java.source" version="1.5.0"/>
       <unit id="com.koloboke.api-jdk8" version="1.0.0"/>
@@ -260,12 +262,12 @@
       <unit id="jakarta-regexp" version="1.4.0"/>
       <unit id="javax.servlet-api" version="3.1.0"/>
       <unit id="javax.servlet-api.source" version="3.1.0"/>
-      <unit id="jakarta.xml.bind-api" version="2.3.2"/>
-      <unit id="jakarta.xml.bind-api.source" version="2.3.2"/>
-      <unit id="jakarta.validation.jakarta.validation-api" version="2.0.2"/>
-      <unit id="jakarta.validation.jakarta.validation-api.source" version="2.0.2"/>
-      <unit id="jakarta.ws.rs-api" version="2.1.6.b0005"/>
-      <unit id="jakarta.ws.rs-api.source" version="2.1.6.b0005"/>
+      <unit id="javax.ws.rs-api" version="2.0.1"/>
+      <unit id="javax.ws.rs-api.source" version="2.0.1"/>
+      <unit id="javax.validation.api" version="1.1.0.Final"/>
+      <unit id="javax.validation.api.source" version="1.1.0.Final"/>
+      <unit id="javax.annotation-api" version="1.2.0"/>
+      <unit id="javax.annotation-api.source" version="1.2.0"/>
       <unit id="net.jcip.annotations" version="1.0.0"/>
       <unit id="net.jcip.annotations.source" version="1.0.0"/>
       <unit id="net.ucanaccess" version="3.0.7"/>
@@ -315,24 +317,32 @@
       <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.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.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.b0005"/>
-      <unit id="org.glassfish.jersey.core.jersey-client.source" version="2.30.1.b0005"/>
-      <unit id="org.glassfish.jersey.core.jersey-common" version="2.30.1.b0005"/>
-      <unit id="org.glassfish.jersey.core.jersey-common.source" version="2.30.1.b0005"/>
-      <unit id="org.glassfish.jersey.core.jersey-server" version="2.30.1.b0005"/>
-      <unit id="org.glassfish.jersey.core.jersey-server.source" version="2.30.1.b0005"/>
-      <unit id="org.glassfish.jersey.ext.jersey-entity-filtering" version="2.30.1.b0005"/>
-      <unit id="org.glassfish.jersey.ext.jersey-entity-filtering.source" version="2.30.1.b0005"/>
-      <unit id="org.glassfish.jersey.media.jersey-media-json-jackson" version="2.30.1.b0005"/>
-      <unit id="org.glassfish.jersey.media.jersey-media-json-jackson.source" version="2.30.1.b0005"/>
-      <unit id="org.glassfish.jersey.media.jersey-media-multipart" version="2.30.1"/>
-      <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.b0005"/>
-      <unit id="org.glassfish.jersey.containers.jersey-container-servlet-core.source" version="2.30.1.b0005"/>
+      <unit id="org.glassfish.hk2.api" version="2.5.0.b32"/>
+      <unit id="org.glassfish.hk2.api.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.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.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.jersey.core.jersey-client" version="2.25.1.b0006"/>
+      <unit id="org.glassfish.jersey.core.jersey-client.source" version="2.25.1.b0006"/>
+      <unit id="org.glassfish.jersey.core.jersey-common" version="2.25.1.b0006"/>
+      <unit id="org.glassfish.jersey.core.jersey-common.source" version="2.25.1.b0006"/>
+      <unit id="org.glassfish.jersey.core.jersey-server" version="2.25.1.b0006"/>
+      <unit id="org.glassfish.jersey.core.jersey-server.source" version="2.25.1.b0006"/>
+      <unit id="org.glassfish.jersey.ext.jersey-entity-filtering" version="2.25.1.b0006"/>
+      <unit id="org.glassfish.jersey.ext.jersey-entity-filtering.source" version="2.25.1.b0006"/>
+      <unit id="org.glassfish.jersey.media.jersey-media-json-jackson" version="2.25.1.b0006"/>
+      <unit id="org.glassfish.jersey.media.jersey-media-json-jackson.source" version="2.25.1.b0006"/>
+      <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.containers.jersey-container-servlet-core" version="2.25.1.b0006"/>
+      <unit id="org.glassfish.jersey.containers.jersey-container-servlet-core.source" version="2.25.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"/>
@@ -355,8 +365,8 @@
       <unit id="org.jfree.jchart.source" version="1.5.0"/>
       <unit id="org.jsoup" version="1.12.2"/>
       <unit id="org.jsoup.source" version="1.12.2"/>
-      <unit id="org.jvnet.mimepull" version="1.9.11"/>
-      <unit id="org.jvnet.mimepull.source" version="1.9.11"/>
+      <unit id="org.jvnet.mimepull" version="1.9.6"/>
+      <unit id="org.jvnet.mimepull.source" version="1.9.6"/>
       <unit id="org.mozilla.rhino" version="1.7.12"/>
       <unit id="org.mozilla.rhino.source" version="1.7.12"/>
       <unit id="org.objenesis" version="2.5.1"/>
@@ -371,8 +381,8 @@
       <unit id="org.zeroturnaround.zt-exec.source" version="1.11.0"/>
       <unit id="com.impossibl.pgjdbc-ng" version="0.8.3"/>
       <unit id="com.impossibl.pgjdbc-ng.source" version="0.8.3"/>
-      <unit id="stax2-api" version="4.2.0"/>
-      <unit id="stax2-api.source" version="4.2.0"/>
+      <unit id="stax2-api" version="3.1.4"/>
+      <unit id="stax2-api.source" version="3.1.4"/>
       <repository location="http://www.simantics.org/download/release/1.43.0/external-components/maven/"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">

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 769dc513266772a1c2891656e60891e76314f386..c7d3e1d31efee124db78275d20ab908b5872118e 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
@@ -218,6 +218,8 @@ location "http://www.simantics.org/download/release/1.43.0/external-components/m
        com.fasterxml.woodstox.woodstox-core.source
        com.healthmarketscience.jackcess
        com.healthmarketscience.jackcess.source
+       com.influxdb.client-core
+       com.influxdb.client-core.source
        com.influxdb.client-java
        com.influxdb.client-java.source
        com.koloboke.api-jdk8
@@ -261,12 +263,12 @@ location "http://www.simantics.org/download/release/1.43.0/external-components/m
        jakarta-regexp
        javax.servlet-api
        javax.servlet-api.source
-       jakarta.xml.bind-api
-       jakarta.xml.bind-api.source
-       jakarta.validation.jakarta.validation-api
-       jakarta.validation.jakarta.validation-api.source
-       jakarta.ws.rs-api
-       jakarta.ws.rs-api.source
+       javax.ws.rs-api
+       javax.ws.rs-api.source
+       javax.validation.api
+       javax.validation.api.source
+       javax.annotation-api
+       javax.annotation-api.source
        net.jcip.annotations
        net.jcip.annotations.source
        net.ucanaccess
@@ -316,20 +318,18 @@ location "http://www.simantics.org/download/release/1.43.0/external-components/m
        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.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.jakarta.inject
-       org.glassfish.hk2.external.jakarta.inject.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.jersey.core.jersey-client
        org.glassfish.jersey.core.jersey-client.source
        org.glassfish.jersey.core.jersey-common

diff --git a/releng/org.simantics.sdk.build.targetdefinition/simantics.target b/releng/org.simantics.sdk.build.targetdefinition/simantics.target
index 2d6e2ff17a8c1ebab6390e486208bc615fa14741..027166a4b58a8d7e9e666775d466e57686b277ba 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.43.0" sequenceNumber="1583830231">
+<target name="Simantics 1.43.0" sequenceNumber="1587368710">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
@@ -195,28 +195,30 @@
       <unit id="com.esotericsoftware.minlog.source" version="1.3.0"/>
       <unit id="com.esotericsoftware.reflectasm" version="1.11.3"/>
       <unit id="com.esotericsoftware.reflectasm.source" version="1.11.3"/>
-      <unit id="com.fasterxml.jackson.core.jackson-annotations" version="2.10.2"/>
-      <unit id="com.fasterxml.jackson.core.jackson-annotations.source" version="2.10.2"/>
-      <unit id="com.fasterxml.jackson.core.jackson-core" version="2.10.2"/>
-      <unit id="com.fasterxml.jackson.core.jackson-core.source" version="2.10.2"/>
-      <unit id="com.fasterxml.jackson.core.jackson-databind" version="2.10.2"/>
-      <unit id="com.fasterxml.jackson.core.jackson-databind.source" version="2.10.2"/>
-      <unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-csv" version="2.10.2"/>
-      <unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-csv.source" version="2.10.2"/>
-      <unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-xml" version="2.10.2"/>
-      <unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-xml.source" version="2.10.2"/>
-      <unit id="com.fasterxml.jackson.datatype.jackson-datatype-jsr310" version="2.10.2"/>
-      <unit id="com.fasterxml.jackson.datatype.jackson-datatype-jsr310.source" version="2.10.2"/>
-      <unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base" version="2.10.2"/>
-      <unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base.source" version="2.10.2"/>
-      <unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" version="2.10.2"/>
-      <unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider.source" version="2.10.2"/>
-      <unit id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations" version="2.10.2"/>
-      <unit id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations.source" version="2.10.2"/>
-      <unit id="com.fasterxml.woodstox.woodstox-core" version="6.0.3"/>
-      <unit id="com.fasterxml.woodstox.woodstox-core.source" version="6.0.3"/>
+      <unit id="com.fasterxml.jackson.core.jackson-annotations" version="2.8.11"/>
+      <unit id="com.fasterxml.jackson.core.jackson-annotations.source" version="2.8.11"/>
+      <unit id="com.fasterxml.jackson.core.jackson-core" version="2.8.11"/>
+      <unit id="com.fasterxml.jackson.core.jackson-core.source" version="2.8.11"/>
+      <unit id="com.fasterxml.jackson.core.jackson-databind" version="2.8.11"/>
+      <unit id="com.fasterxml.jackson.core.jackson-databind.source" version="2.8.11"/>
+      <unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-csv" version="2.8.11"/>
+      <unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-csv.source" version="2.8.11"/>
+      <unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-xml" version="2.8.11"/>
+      <unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-xml.source" version="2.8.11"/>
+      <unit id="com.fasterxml.jackson.datatype.jackson-datatype-jsr310" version="2.8.11"/>
+      <unit id="com.fasterxml.jackson.datatype.jackson-datatype-jsr310.source" version="2.8.11"/>
+      <unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base" version="2.8.11"/>
+      <unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base.source" version="2.8.11"/>
+      <unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" version="2.8.11"/>
+      <unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider.source" version="2.8.11"/>
+      <unit id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations" version="2.8.11"/>
+      <unit id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations.source" version="2.8.11"/>
+      <unit id="com.fasterxml.woodstox.woodstox-core" version="5.0.3"/>
+      <unit id="com.fasterxml.woodstox.woodstox-core.source" version="5.0.3"/>
       <unit id="com.healthmarketscience.jackcess" version="2.1.3"/>
       <unit id="com.healthmarketscience.jackcess.source" version="2.1.3"/>
+      <unit id="com.influxdb.client-core" version="1.5.0"/>
+      <unit id="com.influxdb.client-core.source" version="1.5.0"/>
       <unit id="com.influxdb.client-java" version="1.5.0"/>
       <unit id="com.influxdb.client-java.source" version="1.5.0"/>
       <unit id="com.koloboke.api-jdk8" version="1.0.0"/>
@@ -260,12 +262,12 @@
       <unit id="jakarta-regexp" version="1.4.0"/>
       <unit id="javax.servlet-api" version="3.1.0"/>
       <unit id="javax.servlet-api.source" version="3.1.0"/>
-      <unit id="jakarta.xml.bind-api" version="2.3.2"/>
-      <unit id="jakarta.xml.bind-api.source" version="2.3.2"/>
-      <unit id="jakarta.validation.jakarta.validation-api" version="2.0.2"/>
-      <unit id="jakarta.validation.jakarta.validation-api.source" version="2.0.2"/>
-      <unit id="jakarta.ws.rs-api" version="2.1.6.b0005"/>
-      <unit id="jakarta.ws.rs-api.source" version="2.1.6.b0005"/>
+      <unit id="javax.ws.rs-api" version="2.0.1"/>
+      <unit id="javax.ws.rs-api.source" version="2.0.1"/>
+      <unit id="javax.validation.api" version="1.1.0.Final"/>
+      <unit id="javax.validation.api.source" version="1.1.0.Final"/>
+      <unit id="javax.annotation-api" version="1.2.0"/>
+      <unit id="javax.annotation-api.source" version="1.2.0"/>
       <unit id="net.jcip.annotations" version="1.0.0"/>
       <unit id="net.jcip.annotations.source" version="1.0.0"/>
       <unit id="net.ucanaccess" version="3.0.7"/>
@@ -315,24 +317,32 @@
       <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.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.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.b0005"/>
-      <unit id="org.glassfish.jersey.core.jersey-client.source" version="2.30.1.b0005"/>
-      <unit id="org.glassfish.jersey.core.jersey-common" version="2.30.1.b0005"/>
-      <unit id="org.glassfish.jersey.core.jersey-common.source" version="2.30.1.b0005"/>
-      <unit id="org.glassfish.jersey.core.jersey-server" version="2.30.1.b0005"/>
-      <unit id="org.glassfish.jersey.core.jersey-server.source" version="2.30.1.b0005"/>
-      <unit id="org.glassfish.jersey.ext.jersey-entity-filtering" version="2.30.1.b0005"/>
-      <unit id="org.glassfish.jersey.ext.jersey-entity-filtering.source" version="2.30.1.b0005"/>
-      <unit id="org.glassfish.jersey.media.jersey-media-json-jackson" version="2.30.1.b0005"/>
-      <unit id="org.glassfish.jersey.media.jersey-media-json-jackson.source" version="2.30.1.b0005"/>
-      <unit id="org.glassfish.jersey.media.jersey-media-multipart" version="2.30.1"/>
-      <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.b0005"/>
-      <unit id="org.glassfish.jersey.containers.jersey-container-servlet-core.source" version="2.30.1.b0005"/>
+      <unit id="org.glassfish.hk2.api" version="2.5.0.b32"/>
+      <unit id="org.glassfish.hk2.api.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.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.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.jersey.core.jersey-client" version="2.25.1.b0006"/>
+      <unit id="org.glassfish.jersey.core.jersey-client.source" version="2.25.1.b0006"/>
+      <unit id="org.glassfish.jersey.core.jersey-common" version="2.25.1.b0006"/>
+      <unit id="org.glassfish.jersey.core.jersey-common.source" version="2.25.1.b0006"/>
+      <unit id="org.glassfish.jersey.core.jersey-server" version="2.25.1.b0006"/>
+      <unit id="org.glassfish.jersey.core.jersey-server.source" version="2.25.1.b0006"/>
+      <unit id="org.glassfish.jersey.ext.jersey-entity-filtering" version="2.25.1.b0006"/>
+      <unit id="org.glassfish.jersey.ext.jersey-entity-filtering.source" version="2.25.1.b0006"/>
+      <unit id="org.glassfish.jersey.media.jersey-media-json-jackson" version="2.25.1.b0006"/>
+      <unit id="org.glassfish.jersey.media.jersey-media-json-jackson.source" version="2.25.1.b0006"/>
+      <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.containers.jersey-container-servlet-core" version="2.25.1.b0006"/>
+      <unit id="org.glassfish.jersey.containers.jersey-container-servlet-core.source" version="2.25.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"/>
@@ -355,8 +365,8 @@
       <unit id="org.jfree.jchart.source" version="1.5.0"/>
       <unit id="org.jsoup" version="1.12.2"/>
       <unit id="org.jsoup.source" version="1.12.2"/>
-      <unit id="org.jvnet.mimepull" version="1.9.11"/>
-      <unit id="org.jvnet.mimepull.source" version="1.9.11"/>
+      <unit id="org.jvnet.mimepull" version="1.9.6"/>
+      <unit id="org.jvnet.mimepull.source" version="1.9.6"/>
       <unit id="org.mozilla.rhino" version="1.7.12"/>
       <unit id="org.mozilla.rhino.source" version="1.7.12"/>
       <unit id="org.objenesis" version="2.5.1"/>
@@ -371,8 +381,8 @@
       <unit id="org.zeroturnaround.zt-exec.source" version="1.11.0"/>
       <unit id="com.impossibl.pgjdbc-ng" version="0.8.3"/>
       <unit id="com.impossibl.pgjdbc-ng.source" version="0.8.3"/>
-      <unit id="stax2-api" version="4.2.0"/>
-      <unit id="stax2-api.source" version="4.2.0"/>
+      <unit id="stax2-api" version="3.1.4"/>
+      <unit id="stax2-api.source" version="3.1.4"/>
       <repository location="http://www.simantics.org/download/release/1.43.0/external-components/maven/"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">

diff --git a/releng/org.simantics.sdk.build.targetdefinition/simantics.tpd b/releng/org.simantics.sdk.build.targetdefinition/simantics.tpd
index b93cd7597000360f4dffe59a39ef0d8584acd5fc..7e9cc3fcf01536a558e9cfabac5e8974037ef6f6 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.43.0"
 
 with source allEnvironments
 
-include "http://www.simantics.org/download/release/1.43.0/org.simantics.sdk.build.targetdefinition.tpd"
+include "./org.simantics.sdk.build.targetdefinition.tpd"
 
 location "http://www.simantics.org/download/release/1.43.0/sdk" {
        org.simantics.sdk.feature.group lazy