Add sources to vaadin-compatibility-shared JAR

This is required by vaadin-compatibility-client-compiled client side
compilation.

Change-Id: I8ef49736eaf6c747d5d8892615dbf93a519f3ee0

diff --git a/compatibility-client/pom.xml b/compatibility-client/pom.xml
index bab39896425bd403201b2629068e0a8d6bce9f1c..28ab3f01077bd29bbfa7465c7937b2a4c435156a 100644 (file)
--- 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 e124491d3a3201ba1909a2cb51cf0d8031fd6745..f253c7e06f30887033e2ba1f831c916a09565cef 100755 (executable)
--- 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 75c42a225d3416043bc947958cffb67a6b47df0e..9c9b88fdbc54ef50df46a3a9ca0bc0d31b816df2 100644 (file)
--- 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>