Fix target platform for SCL REST API

Include javax.servlet and required Jersey dependencies to target
platform

refs #7374

Change-Id: I9291db6bb01f12fa45d733457df9f05d489dffee

diff --git a/releng/org.simantics.sdk.build.p2.site/pom.xml b/releng/org.simantics.sdk.build.p2.site/pom.xml
index b5a9dd167fb32324f1cb7392f4df27f245470725..aa4aa4e291bc7653c9962cc87a2789d230a4e780 100644 (file)
--- a/releng/org.simantics.sdk.build.p2.site/pom.xml
+++ b/releng/org.simantics.sdk.build.p2.site/pom.xml
@@ -15,6 +15,8 @@
         <lucene.prefix>org.apache.lucene4</lucene.prefix>
         <jdom.version>2.0.6</jdom.version>
         <jdom.version.actual>2.0.6.b0001</jdom.version.actual>
         <lucene.prefix>org.apache.lucene4</lucene.prefix>
         <jdom.version>2.0.6</jdom.version>
         <jdom.version.actual>2.0.6.b0001</jdom.version.actual>

+        <javax.version>3.1.0</javax.version>
+        <jersey.version>2.25.1</jersey.version>

     </properties>
 
 
     </properties>
 
 


@@ -324,6 +326,10 @@
                                     <id>net.java.dev.jna:jna-platform:4.3.0</id>
                                     <source>true</source>
                                 </artifact>
                                     <id>net.java.dev.jna:jna-platform:4.3.0</id>
                                     <source>true</source>
                                 </artifact>

+                                <artifact>
+                                    <id>javax.servlet:javax.servlet-api:${javax.version}</id>
+                                    <source>true</source>
+                                </artifact>

                                 <artifact>
                                     <id>com.fasterxml.jackson.core:jackson-core:2.8.8</id>
                                     <source>true</source>
                                 <artifact>
                                     <id>com.fasterxml.jackson.core:jackson-core:2.8.8</id>
                                     <source>true</source>


@@ -371,19 +377,23 @@
                                     <source>true</source>
                                 </artifact>
                                 <artifact>
                                     <source>true</source>
                                 </artifact>
                                 <artifact>

-                                    <id>org.glassfish.jersey.core:jersey-server:2.25.1</id>
+                                    <id>org.glassfish.jersey.core:jersey-server:${jersey.version}</id>
+                                    <source>true</source>
+                                </artifact>
+                                <artifact>
+                                    <id>org.glassfish.jersey.core:jersey-client:${jersey.version}</id>

                                     <source>true</source>
                                 </artifact>
                                 <artifact>
                                     <source>true</source>
                                 </artifact>
                                 <artifact>

-                                    <id>org.glassfish.jersey.core:jersey-client:2.25.1</id>
+                                    <id>org.glassfish.jersey.media:jersey-media-multipart:${jersey.version}</id>

                                     <source>true</source>
                                 </artifact>
                                 <artifact>
                                     <source>true</source>
                                 </artifact>
                                 <artifact>

-                                    <id>org.glassfish.jersey.media:jersey-media-multipart:2.25.1</id>
+                                    <id>org.glassfish.jersey.media:jersey-media-json-jackson:${jersey.version}</id>

                                     <source>true</source>
                                 </artifact>
                                 <artifact>
                                     <source>true</source>
                                 </artifact>
                                 <artifact>

-                                    <id>org.glassfish.jersey.media:jersey-media-json-jackson:2.25.1</id>
+                                    <id>org.glassfish.jersey.containers:jersey-container-servlet-core:${jersey.version}</id>

                                     <source>true</source>
                                 </artifact>
                                 <artifact>
                                     <source>true</source>
                                 </artifact>
                                 <artifact>