From: jsimomaa Date: Wed, 23 Aug 2017 11:58:00 +0000 (+0300) Subject: Change jersey from 2.25.1 to 2.26 to resolve resource-locator problems X-Git-Tag: v1.31.0~226 X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F79%2F879%2F1;p=simantics%2Fplatform.git Change jersey from 2.25.1 to 2.26 to resolve resource-locator problems Update target platform definitions refs #7447 Change-Id: I9b5d485a9640f944ed0cbd78644edb7b96308f86 --- 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 9a8841129..af1ee318e 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 @@ - + @@ -160,10 +160,6 @@ - - - - @@ -191,14 +187,12 @@ - - - - + + @@ -248,32 +242,22 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + 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 efc9898d1..671f47214 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 @@ -159,10 +159,6 @@ location "http://www.simantics.org/download/master/external-components/maven" { com.fasterxml.jackson.dataformat.jackson-dataformat-xml.source com.fasterxml.jackson.datatype.jackson-datatype-jsr310 com.fasterxml.jackson.datatype.jackson-datatype-jsr310.source - com.fasterxml.jackson.jaxrs.jackson-jaxrs-base - com.fasterxml.jackson.jaxrs.jackson-jaxrs-base.source - com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider - com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider.source com.fasterxml.jackson.module.jackson-module-jaxb-annotations com.fasterxml.jackson.module.jackson-module-jaxb-annotations.source com.fasterxml.woodstox.woodstox-core @@ -190,8 +186,6 @@ 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 @@ -247,18 +241,8 @@ 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.external.aopalliance-repackaged - org.glassfish.hk2.external.aopalliance-repackaged.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.jersey.core.jersey-client org.glassfish.jersey.core.jersey-client.source org.glassfish.jersey.core.jersey-common