diff options
| author | Artur Signell <artur@vaadin.com> | 2013-06-10 20:15:35 +0300 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2013-06-10 20:21:56 +0300 |
| commit | 37bc9e41db0278f42263452e12a8b3fc87b664ba (patch) | |
| tree | ec48ab05ece102bd43e727da253030dac26475b3 /server | |
| parent | d9becf9523fdd71abb1b93072a76df163b9dd2c0 (diff) | |
| download | vaadin-framework-37bc9e41db0278f42263452e12a8b3fc87b664ba.tar.gz vaadin-framework-37bc9e41db0278f42263452e12a8b3fc87b664ba.zip | |
Reformatted using Ant editor (#12040)
Change-Id: If8afd65d5905302c64f12ef7f76ee7e63073c474
Diffstat (limited to 'server')
| -rw-r--r-- | server/build.xml | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/server/build.xml b/server/build.xml index a812404862..057f65a0d3 100644 --- a/server/build.xml +++ b/server/build.xml @@ -1,7 +1,6 @@ <?xml version="1.0"?> -<project name="vaadin-server" basedir="." default="publish-local" - xmlns:ivy="antlib:org.apache.ivy.ant"> +<project name="vaadin-server" basedir="." default="publish-local" xmlns:ivy="antlib:org.apache.ivy.ant"> <description> Compiles build helpers used when building other modules. </description> @@ -24,10 +23,8 @@ </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.require" - value="com.vaadin.shared;bundle-version="${vaadin.version}",com.vaadin.push;bundle-version="${vaadin.version}";resolution:=optional" /> + <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.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}" /> <param name="import-package" value="${server.osgi.import}" /> |