diff options
| author | Henri Sara <hesara@vaadin.com> | 2016-08-25 10:39:02 +0300 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2016-08-25 09:51:22 +0000 |
| commit | 6439a2e0c9a37da5a34f021a31eb8d61c902fd69 (patch) | |
| tree | a22f64a672f14a820b0da2f876481ac2c5d8588b | |
| parent | 0055a460334ecd77e271ca05b78ae5a559b05d23 (diff) | |
| download | vaadin-framework-6439a2e0c9a37da5a34f021a31eb8d61c902fd69.tar.gz vaadin-framework-6439a2e0c9a37da5a34f021a31eb8d61c902fd69.zip | |
Add sources to vaadin-compatibility-shared JAR
This is required by vaadin-compatibility-client-compiled client side
compilation.
Change-Id: I8ef49736eaf6c747d5d8892615dbf93a519f3ee0
| -rw-r--r-- | compatibility-client/pom.xml | 54 | ||||
| -rwxr-xr-x | compatibility-client/src/main/resources/com/vaadin/v7/Vaadin7WidgetSet.gwt.xml | 3 | ||||
| -rw-r--r-- | compatibility-shared/pom.xml | 28 |
3 files changed, 58 insertions, 27 deletions
diff --git a/compatibility-client/pom.xml b/compatibility-client/pom.xml index bab3989642..28ab3f0107 100644 --- a/compatibility-client/pom.xml +++ b/compatibility-client/pom.xml @@ -43,33 +43,33 @@ </executions> </plugin> - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <executions> - <!-- Copy .java files to package --> - <execution> - <id>copy-sources</id> - <!-- here the phase you need --> - <phase>prepare-package</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${project.build.outputDirectory}</outputDirectory> - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>false</filtering> - </resource> - <resource> - <directory>src/main/java</directory> - <filtering>false</filtering> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <executions> + <!-- Copy .java files to package --> + <execution> + <id>copy-sources</id> + <!-- here the phase you need --> + <phase>prepare-package</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${project.build.outputDirectory}</outputDirectory> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>false</filtering> + </resource> + <resource> + <directory>src/main/java</directory> + <filtering>false</filtering> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> diff --git a/compatibility-client/src/main/resources/com/vaadin/v7/Vaadin7WidgetSet.gwt.xml b/compatibility-client/src/main/resources/com/vaadin/v7/Vaadin7WidgetSet.gwt.xml index e124491d3a..f253c7e06f 100755 --- a/compatibility-client/src/main/resources/com/vaadin/v7/Vaadin7WidgetSet.gwt.xml +++ b/compatibility-client/src/main/resources/com/vaadin/v7/Vaadin7WidgetSet.gwt.xml @@ -4,4 +4,7 @@ <inherits name="com.vaadin.DefaultWidgetSet" /> + <source path="shared" /> + <source path="client" /> + </module> diff --git a/compatibility-shared/pom.xml b/compatibility-shared/pom.xml index 75c42a225d..9c9b88fdbc 100644 --- a/compatibility-shared/pom.xml +++ b/compatibility-shared/pom.xml @@ -63,6 +63,34 @@ </executions> </plugin> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <executions> + <!-- Copy .java files to package --> + <execution> + <id>copy-sources</id> + <!-- here the phase you need --> + <phase>prepare-package</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${project.build.outputDirectory}</outputDirectory> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>false</filtering> + </resource> + <resource> + <directory>src/main/java</directory> + <filtering>false</filtering> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> |