diff options
| author | Johannes Dahlström <johannesd@vaadin.com> | 2013-07-31 15:07:12 +0300 |
|---|---|---|
| committer | Johannes Dahlström <johannesd@vaadin.com> | 2013-07-31 15:10:37 +0300 |
| commit | 17bb700e551aabcacde52528e9abd5c4b7481ffb (patch) | |
| tree | 5b3a60c81f8e8fe6491bc917d6e3fe9851d5fb2b /server | |
| parent | f5e3663d1fda0a5766dd1cfbb48eb31795ad93ff (diff) | |
| download | vaadin-framework-17bb700e551aabcacde52528e9abd5c4b7481ffb.tar.gz vaadin-framework-17bb700e551aabcacde52528e9abd5c4b7481ffb.zip | |
Add optional OSGi Import-Package for javax.validation (#12301)
Change-Id: Iff9105537a2a8123b808be33f8cd390b0c23edd6
Diffstat (limited to 'server')
| -rw-r--r-- | server/build.xml | 2 | ||||
| -rw-r--r-- | server/ivy.xml | 3 |
2 files changed, 4 insertions, 1 deletions
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="2.4.0",javax.servlet.http;version="2.4.0",org.jsoup;version="1.6.3",org.jsoup.parser;version="1.6.3",org.jsoup.nodes;version="1.6.3",org.jsoup.helper;version="1.6.3",org.jsoup.safety;version="1.6.3",org.json;version="0.0.20080701"" /> + <property name="server.osgi.import" value="javax.servlet;version="2.4.0",javax.servlet.http;version="2.4.0",javax.validation;version="1.0.0.GA";resolution:=optional,org.jsoup;version="1.6.3",org.jsoup.parser;version="1.6.3",org.jsoup.nodes;version="1.6.3",org.jsoup.helper;version="1.6.3",org.jsoup.safety;version="1.6.3",org.json;version="0.0.20080701"" /> <property name="server.osgi.require" value="com.vaadin.shared;bundle-version="${vaadin.version}",com.vaadin.push;bundle-version="${vaadin.version}";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" /> |