From e25f8f94eb540f3685a28d32352dd872084b60b7 Mon Sep 17 00:00:00 2001 From: jsimomaa Date: Mon, 14 Aug 2017 09:04:08 +0300 Subject: [PATCH] Fix target platform for SCL REST API Include javax.servlet and required Jersey dependencies to target platform refs #7374 Change-Id: I4f63583ad0ffa168586106dd5592bf8c67f7e633 --- ...imantics.sdk.build.targetdefinition.target | 626 +++++++++--------- ...g.simantics.sdk.build.targetdefinition.tpd | 6 + 2 files changed, 323 insertions(+), 309 deletions(-) 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 04120326f..cf36cc7b9 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,311 +1,319 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 ca9d6be94..f770d4f01 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 @@ -194,6 +194,8 @@ location "http://www.simantics.org/download/master/external-components/maven" { jakarta-regexp javassist javassist.source + javax.servlet-api + javax.servlet-api.source javax.validation.api javax.validation.api.source javax.ws.rs-api @@ -265,8 +267,12 @@ location "http://www.simantics.org/download/master/external-components/maven" { org.glassfish.jersey.core.jersey-server.source org.glassfish.jersey.ext.jersey-entity-filtering org.glassfish.jersey.ext.jersey-entity-filtering.source + org.glassfish.jersey.media.jersey-media-json-jackson + org.glassfish.jersey.media.jersey-media-json-jackson.source org.glassfish.jersey.media.jersey-media-multipart 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.hsqldb.hsqldb org.hsqldb.hsqldb.source org.ini4j -- 2.47.1