diff options
| -rw-r--r-- | WebContent/css/ie.css | 1 | ||||
| -rw-r--r-- | common.xml | 4 | ||||
| -rw-r--r-- | server/build.xml | 6 | ||||
| -rw-r--r-- | shared/build.xml | 2 |
4 files changed, 7 insertions, 6 deletions
diff --git a/WebContent/css/ie.css b/WebContent/css/ie.css index e69de29bb2..4ddd2f51c8 100644 --- a/WebContent/css/ie.css +++ b/WebContent/css/ie.css @@ -0,0 +1 @@ +/* Placeholder due to https://issues.apache.org/bugzilla/show_bug.cgi?id=53626 */
\ No newline at end of file diff --git a/common.xml b/common.xml index 0875fea71a..15f4891c12 100644 --- a/common.xml +++ b/common.xml @@ -13,7 +13,7 @@ <ivy:settings file="${vaadin.basedir}/ivysettings.xml" /> <ivy:settings file="${vaadin.basedir}/ivysettings.xml" id="ivysettings" /> - <ivy:resolve file="${vaadin.basedir}/ivy-taskdefs.xml" conf="taskdefs" /> + <ivy:resolve file="${vaadin.basedir}/ivy-taskdefs.xml" conf="taskdefs" log="quiet" /> <ivy:cachepath pathid="taskdefs.classpath" conf="taskdefs" /> <taskdef uri="antlib:net.sf.antcontrib" resource="net/sf/antcontrib/antlib.xml" classpathref="taskdefs.classpath" /> <!-- ant contrib for Maven integration --> @@ -355,4 +355,4 @@ <ivy:publish conf="${conf}" resolver="local-maven" overwrite="true"> </ivy:publish> </target> -</project>
\ No newline at end of file +</project> diff --git a/server/build.xml b/server/build.xml index 50311a18d9..a987ec3846 100644 --- a/server/build.xml +++ b/server/build.xml @@ -22,10 +22,10 @@ </union> <target name="jar"> - <property name="server.osgi.import" value="org.jsoup;version="1.6.3""/> + <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""/> <antcall target="common.jar"> - <param name="require-bundle" value="com.vaadin.vaadin-shared;version="${vaadin.version}""/> - <param name="import-package" value="javax.servlet;version="2.4.0",${server.osgi.import}" /> + <param name="require-bundle" value="com.vaadin.vaadin-shared;bundle-version="${vaadin.version}""/> + <param name="import-package" value="${server.osgi.import}" /> <reference torefid="extra.jar.includes" refid="jar.includes" /> </antcall> </target> diff --git a/shared/build.xml b/shared/build.xml index 71276a6b19..ecc00c9782 100644 --- a/shared/build.xml +++ b/shared/build.xml @@ -18,7 +18,7 @@ <target name="jar"> <property name="shared.osgi.import" value="org.json;version="20080701"" /> <antcall target="common.jar"> - <param name="require-bundle" value="com.vaadin.shared.deps;version="1.0.0""/> + <param name="require-bundle" value="com.vaadin.shared.deps;bundle-version="1.0.0""/> <param name="import-package" value="${shared.osgi.import}" /> <reference refid="shared.gwt.includes" torefid="extra.jar.includes" /> </antcall> |