diff options
| author | Miki <miki@vaadin.com> | 2015-02-27 13:37:35 +0200 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2015-03-04 07:16:18 +0000 |
| commit | 3025e1038cf2b2dcdff4436df35fc6aaed98aa0f (patch) | |
| tree | 98bf09f25974b8625400356e4c0e2f27b8fa1b36 /shared | |
| parent | 6e6dd6ff0d64917effed33c7253c3b135183c355 (diff) | |
| download | vaadin-framework-3025e1038cf2b2dcdff4436df35fc6aaed98aa0f.tar.gz vaadin-framework-3025e1038cf2b2dcdff4436df35fc6aaed98aa0f.zip | |
Add missing osgi import to guava (#16739)
Change-Id: I889b918600db98b70a7c02e86fbbeca31f083f80
Diffstat (limited to 'shared')
| -rw-r--r-- | shared/build.xml | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/shared/build.xml b/shared/build.xml index a9cd0b9803..30f4ac65ce 100644 --- a/shared/build.xml +++ b/shared/build.xml @@ -3,8 +3,7 @@ <project name="vaadin-shared" basedir="." default="publish-local" xmlns:ivy="antlib:org.apache.ivy.ant"> <description> - Compiles build helpers used when building other - modules. + The shared module containing classes used by both server and client. </description> <include file="../common.xml" as="common" /> <include file="../build.xml" as="vaadin" /> @@ -23,7 +22,9 @@ <target name="jar"> <property name="shared.osgi.import" - value="com.google.gwt.thirdparty.guava.common.annotations;version="16.0.1.vaadin1", com.google.gwt.thirdparty.guava.common.base;version="16.0.1.vaadin1", com.google.gwt.thirdparty.guava.common.base.internal;version="16.0.1.vaadin1", com.google.gwt.thirdparty.guava.common.cache;version="16.0.1.vaadin1", com.google.gwt.thirdparty.guava.common.collect;version="16.0.1.vaadin1", com.google.gwt.thirdparty.guava.common.eventbus;version="16.0.1.vaadin1", com.google.gwt.thirdparty.guava.common.io;version="16.0.1.vaadin1", com.google.gwt.thirdparty.guava.common.net;version="16.0.1.vaadin1", com.google.gwt.thirdparty.guava.common.primitives;version="16.0.1.vaadin1", com.google.gwt.thirdparty.guava.common.util.concurrent;version="16.0.1.vaadin1", com.google.gwt.thirdparty.streamhtmlparser;version="0.0.10.vaadin1", com.google.gwt.thirdparty.streamhtmlparser.impl;version="0.0.10.vaadin1", com.google.gwt.thirdparty.streamhtmlparser.util;version="0.0.10.vaadin1", org.w3c.flute.parser;version="1.3.0.gg2", org.w3c.flute.parser.selectors;version="1.3.0.gg2", org.w3c.flute.util;version="1.3.0.gg2"" /> + value="com.google.gwt.thirdparty.streamhtmlparser;version="0.0.10.vaadin1", com.google.gwt.thirdparty.streamhtmlparser.impl;version="0.0.10.vaadin1", com.google.gwt.thirdparty.streamhtmlparser.util;version="0.0.10.vaadin1", org.w3c.flute.parser;version="1.3.0.gg2", org.w3c.flute.parser.selectors;version="1.3.0.gg2", org.w3c.flute.util;version="1.3.0.gg2"" /> + <property name="shared.osgi.require-bundle" + value="com.google.gwt.thirdparty.guava;bundle-version="16.0.1.vaadin1"" /> <delete dir="${src.filtered}" /> <!-- Update version in Version.java --> <copy todir="${src.filtered}"> @@ -38,6 +39,7 @@ <antcall target="common.jar"> <param name="import-package" value="${shared.osgi.import}" /> + <param name="require-bundle" value="${shared.osgi.require-bundle}" /> <reference refid="shared.gwt.includes" torefid="extra.jar.includes" /> <param name="osgi.extra.package.prefixes" value="elemental" /> </antcall> |