aboutsummaryrefslogtreecommitdiffstats
path: root/shared/pom.xml
diff options
context:
space:
mode:
authorDenis <denis@vaadin.com>2021-10-04 16:07:07 +0300
committerGitHub <noreply@github.com>2021-10-04 16:07:07 +0300
commit65220e4794875bd8cab96423903314fe4db74996 (patch)
tree2ed0bc0197f562beb84f6b8a4aaa562997412cbe /shared/pom.xml
parent2fc98eaf9c0e2cd42cf4a66fb6d2cd2e9f0a08a9 (diff)
downloadvaadin-framework-65220e4794875bd8cab96423903314fe4db74996.tar.gz
vaadin-framework-65220e4794875bd8cab96423903314fe4db74996.zip
chore: avoid repackaging of google elemental dep and use it directly (#12416)
* chore: avoid repackaging of google elemental dep and use it directly The google elemental dependency is not OSGi compatible so it's repackaged into shared module to use it directly from there. But there is a custom Vaadin version of google elemental dep and it's OSGi compatible. Flow uses this version and to be able to use FW in MPR the versions should match. So the Vaadin google elemental dep is added instead of repackaging. * chore: import elemental package in the bnd file
Diffstat (limited to 'shared/pom.xml')
-rw-r--r--shared/pom.xml57
1 files changed, 6 insertions, 51 deletions
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>