From: Jani Simomaa <jani.simomaa@semantum.fi>
Date: Thu, 25 May 2017 04:02:00 +0000 (+0300)
Subject: Merge "Add missing jersey-server for Jersey HTTP Client.. does not make sense.."
X-Git-Tag: v1.29.0~22
X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=bf3f3eee4e468188ba771503e746840fbae88c01;hp=41aa955f4f03286359497397e998739c6dcc1d9a

Merge "Add missing jersey-server for Jersey HTTP Client.. does not make sense.."
---

diff --git a/releng/org.simantics.sdk.build.p2.site/pom.xml b/releng/org.simantics.sdk.build.p2.site/pom.xml
index 295988bb7..1d93fcbe4 100644
--- a/releng/org.simantics.sdk.build.p2.site/pom.xml
+++ b/releng/org.simantics.sdk.build.p2.site/pom.xml
@@ -368,6 +368,10 @@
                                     <id>com.esotericsoftware:kryo:4.0.0</id>
                                     <source>true</source>
                                 </artifact>
+                                <artifact>
+                                    <id>org.glassfish.jersey.core:jersey-server:2.25.1</id>
+                                    <source>true</source>
+                                </artifact>
                                 <artifact>
                                     <id>org.glassfish.jersey.core:jersey-client:2.25.1</id>
                                     <source>true</source>
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 091548c48..b231ddab2 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
@@ -215,6 +215,8 @@
 <unit id="org.glassfish.jersey.core.jersey-client.source" version="2.25.1"/>
 <unit id="org.glassfish.jersey.core.jersey-common" version="2.25.1"/>
 <unit id="org.glassfish.jersey.core.jersey-common.source" version="2.25.1"/>
+<unit id="org.glassfish.jersey.core.jersey-server" version="2.25.1"/>
+<unit id="org.glassfish.jersey.core.jersey-server.source" version="2.25.1"/>
 <unit id="org.glassfish.jersey.ext.jersey-entity-filtering" version="2.25.1"/>
 <unit id="org.glassfish.jersey.ext.jersey-entity-filtering.source" version="2.25.1"/>
 <unit id="org.glassfish.jersey.media.jersey-media-multipart" version="2.25.1"/>
@@ -225,6 +227,8 @@
 <unit id="org.hsqldb.hsqldb.source" version="2.3.1"/>
 <unit id="javassist" version="3.20.0.GA"/>
 <unit id="javassist.source" version="3.20.0.GA"/>
+<unit id="javax.validation.api" version="1.1.0.Final"/>
+<unit id="javax.validation.api.source" version="1.1.0.Final"/>
 <unit id="org.jdom2" version="2.0.6.b0001"/>
 <unit id="org.jdom2.source" version="2.0.6.b0001"/>
 <unit id="org.jfree.jchart" version="1.0.19"/>
diff --git a/releng/org.simantics.sdk.build.targetdefinition/simantics.target b/releng/org.simantics.sdk.build.targetdefinition/simantics.target
index 58aa8d1ff..ff078847d 100644
--- a/releng/org.simantics.sdk.build.targetdefinition/simantics.target
+++ b/releng/org.simantics.sdk.build.targetdefinition/simantics.target
@@ -221,6 +221,8 @@
 <unit id="org.glassfish.jersey.core.jersey-client.source" version="2.25.1"/>
 <unit id="org.glassfish.jersey.core.jersey-common" version="2.25.1"/>
 <unit id="org.glassfish.jersey.core.jersey-common.source" version="2.25.1"/>
+<unit id="org.glassfish.jersey.core.jersey-server" version="2.25.1"/>
+<unit id="org.glassfish.jersey.core.jersey-server.source" version="2.25.1"/>
 <unit id="org.glassfish.jersey.ext.jersey-entity-filtering" version="2.25.1"/>
 <unit id="org.glassfish.jersey.ext.jersey-entity-filtering.source" version="2.25.1"/>
 <unit id="org.glassfish.jersey.media.jersey-media-multipart" version="2.25.1"/>
@@ -231,6 +233,8 @@
 <unit id="org.hsqldb.hsqldb.source" version="2.3.1"/>
 <unit id="javassist" version="3.20.0.GA"/>
 <unit id="javassist.source" version="3.20.0.GA"/>
+<unit id="javax.validation.api" version="1.1.0.Final"/>
+<unit id="javax.validation.api.source" version="1.1.0.Final"/>
 <unit id="org.jdom2" version="2.0.6.b0001"/>
 <unit id="org.jdom2.source" version="2.0.6.b0001"/>
 <unit id="org.jfree.jchart" version="1.0.19"/>