diff options
| -rw-r--r-- | shared/bnd.bnd | 5 | ||||
| -rw-r--r-- | shared/pom.xml | 57 |
2 files changed, 8 insertions, 54 deletions
diff --git a/shared/bnd.bnd b/shared/bnd.bnd index 56b69fdfd0..93e05116cf 100644 --- a/shared/bnd.bnd +++ b/shared/bnd.bnd @@ -3,7 +3,6 @@ Bundle-Activator: com.vaadin.osgi.resources.OsgiVaadinResources Bundle-Name: Vaadin Shared Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0 -Import-Package: org.osgi* +Import-Package: org.osgi*, elemental.json* Export-Package: com.vaadin.osgi.resources;-noimport:=true,\ - com.vaadin.shared*;-noimport:=true,\ - elemental.json*;-noimport:=true + com.vaadin.shared*;-noimport:=tru diff --git a/shared/pom.xml b/shared/pom.xml index f1cc50af0f..af30d3af2a 100644 --- a/shared/pom.xml +++ b/shared/pom.xml @@ -33,6 +33,12 @@ <groupId>org.osgi</groupId> <artifactId>osgi.cmpn</artifactId> </dependency> + + <dependency> + <groupId>com.vaadin.external.gwt</groupId> + <artifactId>gwt-elemental</artifactId> + <version>2.8.2.vaadin2</version> + </dependency> </dependencies> <build> @@ -51,57 +57,6 @@ </executions> </plugin> - <!-- Copy needed GWT dependencies to package --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>unpack-dependencies</id> - <phase>generate-resources</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>com.google.gwt</groupId> - <artifactId>gwt-elemental</artifactId> - <includes> - elemental/json/**, - elemental/util/Array*, - elemental/util/Can*, - elemental/util/Map* - </includes> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> - - <!-- Unpacked Dependencies as source --> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - - <!-- Needs extra source folder for unpacked dependencies --> - <executions> - <execution> - <id>add-source-path</id> - <phase>generate-sources</phase> - <goals> - <goal>add-source</goal> - </goals> - <configuration> - <sources> - <source>${dependency.unpack.directory}</source> - </sources> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <artifactId>maven-resources-plugin</artifactId> <executions> |