summaryrefslogtreecommitdiffstats
path: root/client-compiled
diff options
context:
space:
mode:
authorTeemu Suo-Anttila <teemusa@vaadin.com>2016-04-19 16:01:33 +0300
committerTeemu Suo-Anttila <teemusa@vaadin.com>2016-04-19 13:39:15 +0000
commit60968e491f61a524a50ed578c5df2d42eb7cd3a5 (patch)
tree52e45946b74ba6b7fc93a2a0c1c49984a9886a28 /client-compiled
parent9697eebd6ff74393da03ee881c04d2c3b7e41b88 (diff)
downloadvaadin-framework-60968e491f61a524a50ed578c5df2d42eb7cd3a5.tar.gz
vaadin-framework-60968e491f61a524a50ed578c5df2d42eb7cd3a5.zip
Compile default widgetset with maven plugin, fix unit cache
Change-Id: I0b0666e22e93ed1b36796365b1811eca863c9cb1
Diffstat (limited to 'client-compiled')
-rw-r--r--client-compiled/pom.xml65
1 files changed, 19 insertions, 46 deletions
diff --git a/client-compiled/pom.xml b/client-compiled/pom.xml
index 8972b7a9ad..f231af3ed2 100644
--- a/client-compiled/pom.xml
+++ b/client-compiled/pom.xml
@@ -58,52 +58,6 @@
<artifactId>exec-maven-plugin</artifactId>
<executions>
<execution>
- <phase>generate-resources</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- <configuration>
- <classpathScope>compile</classpathScope>
- <executable>${java.home}/bin/java</executable>
- <arguments>
- <!-- TODO: Do we need these? -->
- <!-- <jvmarg value="-Xss8M" /> -->
- <!-- <jvmarg value="-XX:MaxPermSize=256M" /> -->
- <jvmarg value="-Djava.awt.headless=true" />
- <argument>-Dgwt.persistentunitcachedir=${project.build.directory}/compile</argument>
- <argument>-DvFailIfNotSerializable=true</argument>
-
- <argument>-classpath</argument>
- <classpath />
-
- <argument>com.google.gwt.dev.Compiler</argument>
-
- <argument>-workDir</argument>
- <argument>${project.build.directory}/compile</argument>
- <argument>-logLevel</argument>
- <argument>TRACE</argument>
- <argument>-war</argument>
- <!-- This will write the result directly to target/classes for packaging -->
- <argument>${project.build.outputDirectory}/VAADIN/widgetsets/</argument>
- <argument>-style</argument>
- <argument>${widgetset.style}</argument>
- <argument>-localWorkers</argument>
- <argument>${widgetset.local.workers}</argument>
-
- <argument>-strict</argument>
-
- <!-- Move unnecessary stuff to compile folder -->
- <argument>-deploy</argument>
- <argument>${project.build.directory}/compile</argument>
- <argument>-extra</argument>
- <argument>${project.build.directory}/compile</argument>
-
- <argument>${widgetset.name}</argument>
- </arguments>
- </configuration>
- </execution>
-
- <execution>
<id>generate-export-package</id>
<phase>package</phase>
<goals>
@@ -129,6 +83,25 @@
</executions>
</plugin>
+ <plugin>
+ <groupId>com.vaadin</groupId>
+ <artifactId>vaadin-maven-plugin</artifactId>
+ <configuration>
+ <modules>
+ <module>com.vaadin.DefaultWidgetSet</module>
+ </modules>
+ <webappDirectory>${project.build.outputDirectory}/VAADIN/widgetsets</webappDirectory>
+ <persistentunitcachedir>${project.build.directory}/gwt-unitCache</persistentunitcachedir>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
<plugin>
<groupId>org.apache.felix</groupId>