Import shared-deps packages instead of requiring the bundle (#10066)

Change-Id: I6111f7b403dd6c8bbce6eab64a35b10d9d3d7b05

diff --git a/shared/build.xml b/shared/build.xml
index ecc00c978283713f4c7b2d9481f511dd62e5100d..0e52673ddd553b72dd91f59f91976dfc6105d3a8 100644 (file)
--- a/shared/build.xml
+++ b/shared/build.xml
@@ -16,9 +16,8 @@
 
 
        <target name="jar">
-               <property name="shared.osgi.import" value="org.json;version=&quot;20080701&quot;" />
+               <property name="shared.osgi.import" value="org.json;version=&quot;20080701&quot;, com.google.gwt.thirdparty.guava.common.annotations, com.google.gwt.thirdparty.guava.common.base, com.google.gwt.thirdparty.guava.common.base.internal, com.google.gwt.thirdparty.guava.common.cache, com.google.gwt.thirdparty.guava.common.collect, com.google.gwt.thirdparty.guava.common.eventbus, com.google.gwt.thirdparty.guava.common.io, com.google.gwt.thirdparty.guava.common.net, com.google.gwt.thirdparty.guava.common.primitives, com.google.gwt.thirdparty.guava.common.util.concurrent, com.google.gwt.thirdparty.streamhtmlparser, com.google.gwt.thirdparty.streamhtmlparser.impl, com.google.gwt.thirdparty.streamhtmlparser.util, org.w3c.flute.parser, org.w3c.flute.parser.selectors, org.w3c.flute.util" />
                <antcall target="common.jar">
-                       <param name="require-bundle" value="com.vaadin.shared.deps;bundle-version=&quot;1.0.0&quot;"/>
                        <param name="import-package" value="${shared.osgi.import}" />
                        <reference refid="shared.gwt.includes" torefid="extra.jar.includes" />
                </antcall>