From: jsimomaa Date: Mon, 20 Apr 2020 07:29:24 +0000 (+0300) Subject: Update target platforms with jersey and jackson version change X-Git-Tag: v1.43.0~38 X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F63%2F4163%2F4;p=simantics%2Fplatform.git 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 7c26acd26..427b274c4 100644 --- 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 c9f04535f..6ee40d1c1 100644 --- 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 2c2f670f8..dd0d78bf3 100644 --- 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 b5cd3f73d..598157c6e 100644 --- a/features/org.simantics.history.rest.feature/feature.xml +++ b/features/org.simantics.history.rest.feature/feature.xml @@ -40,7 +40,7 @@ unpack="false"/> - - 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 9524eff17..87d491062 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 @@ -1,7 +1,7 @@ - + @@ -195,28 +195,30 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -260,12 +262,12 @@ - - - - - - + + + + + + @@ -315,24 +317,32 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -355,8 +365,8 @@ - - + + @@ -371,8 +381,8 @@ - - + + 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 769dc5132..c7d3e1d31 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 @@ -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 2d6e2ff17..027166a4b 100644 --- a/releng/org.simantics.sdk.build.targetdefinition/simantics.target +++ b/releng/org.simantics.sdk.build.targetdefinition/simantics.target @@ -1,7 +1,7 @@ - + @@ -195,28 +195,30 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -260,12 +262,12 @@ - - - - - - + + + + + + @@ -315,24 +317,32 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -355,8 +365,8 @@ - - + + @@ -371,8 +381,8 @@ - - + + diff --git a/releng/org.simantics.sdk.build.targetdefinition/simantics.tpd b/releng/org.simantics.sdk.build.targetdefinition/simantics.tpd index b93cd7597..7e9cc3fcf 100644 --- 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