From: Johannes Dahlström <johannesd@vaadin.com>
Date: Wed, 31 Jul 2013 12:07:12 +0000 (+0300)
Subject: Add optional OSGi Import-Package for javax.validation (#12301)
X-Git-Tag: 7.1.2~9
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=17bb700e551aabcacde52528e9abd5c4b7481ffb;p=vaadin-framework.git

Add optional OSGi Import-Package for javax.validation (#12301)

Change-Id: Iff9105537a2a8123b808be33f8cd390b0c23edd6
---

diff --git a/server/build.xml b/server/build.xml
index 057f65a0d3..98ee2342cf 100644
--- a/server/build.xml
+++ b/server/build.xml
@@ -23,7 +23,7 @@
     </union>
 
     <target name="jar">
-        <property name="server.osgi.import" value="javax.servlet;version=&quot;2.4.0&quot;,javax.servlet.http;version=&quot;2.4.0&quot;,org.jsoup;version=&quot;1.6.3&quot;,org.jsoup.parser;version=&quot;1.6.3&quot;,org.jsoup.nodes;version=&quot;1.6.3&quot;,org.jsoup.helper;version=&quot;1.6.3&quot;,org.jsoup.safety;version=&quot;1.6.3&quot;,org.json;version=&quot;0.0.20080701&quot;" />
+        <property name="server.osgi.import" value="javax.servlet;version=&quot;2.4.0&quot;,javax.servlet.http;version=&quot;2.4.0&quot;,javax.validation;version=&quot;1.0.0.GA&quot;;resolution:=optional,org.jsoup;version=&quot;1.6.3&quot;,org.jsoup.parser;version=&quot;1.6.3&quot;,org.jsoup.nodes;version=&quot;1.6.3&quot;,org.jsoup.helper;version=&quot;1.6.3&quot;,org.jsoup.safety;version=&quot;1.6.3&quot;,org.json;version=&quot;0.0.20080701&quot;" />
         <property name="server.osgi.require" value="com.vaadin.shared;bundle-version=&quot;${vaadin.version}&quot;,com.vaadin.push;bundle-version=&quot;${vaadin.version}&quot;;resolution:=optional" />
         <antcall target="common.jar">
             <param name="require-bundle" value="${server.osgi.require}" />
diff --git a/server/ivy.xml b/server/ivy.xml
index db7e953371..b78541c52f 100644
--- a/server/ivy.xml
+++ b/server/ivy.xml
@@ -25,6 +25,7 @@
         <!-- Liferay Portal Service -->
         <dependency org="com.liferay.portal" name="portal-service"
             rev="6.0.2" conf="build-provided,ide -> default" />
+
         <!--Servlet API version 2.4 -->
         <dependency org="javax.servlet" name="servlet-api"
             rev="2.4" conf="build-provided,ide,test -> default" />
@@ -36,6 +37,8 @@
         <!-- Google App Engine -->
         <dependency org="com.google.appengine" name="appengine-api-1.0-sdk"
             rev="1.2.1" conf="build-provided,ide,test -> default" />
+
+        <!-- Bean Validation API -->
         <dependency org="javax.validation" name="validation-api"
             rev="1.0.0.GA" conf="build-provided,ide,test -> default" />