Updated to GWT 1.5.2

diff --git a/gwtquery-core/pom.xml b/gwtquery-core/pom.xml
index a458a93c9d785d6ae3c7d2760a04a6d3c05540f0..8a5c45a69b7bd320e45c9c90e23a1e632855c9cc 100644 (file)
--- a/gwtquery-core/pom.xml
+++ b/gwtquery-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>gwtquery</groupId>
     <artifactId>gwtquery-project</artifactId>
-    <version>0.3-SNAPSHOT</version>
+    <version>0.31-SNAPSHOT</version>
   </parent>
 
   <artifactId>gwtquery</artifactId>
@@ -17,24 +17,26 @@
       <version>3.8.1</version>
       <type>jar</type>
     </dependency>
-
-    <!--  stuff that is NOT war bundled -->
     <dependency>
       <groupId>com.google.gwt</groupId>
       <artifactId>gwt-user</artifactId>
       <version>${gwtversion}</version>
-      <type>jar</type>
-      <!--<scope>provided</scope>-->
     </dependency>
-
     <dependency>
       <groupId>com.google.gwt</groupId>
-      <artifactId>gwt-dev-${gwtplatform}</artifactId>
+      <artifactId>gwt-dev</artifactId>
       <version>${gwtversion}</version>
-      <type>jar</type>
-      <!--<scope>provided</scope>-->
+      <classifier>${gwtplatform}-libs</classifier>
+      <type>zip</type>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.gwt</groupId>
+      <artifactId>gwt-dev</artifactId>
+      <version>${gwtversion}</version>
+      <classifier>${gwtplatform}</classifier>
+      <scope>provided</scope>
     </dependency>
-
   </dependencies>
   <build>
     <resources>

diff --git a/pom.xml b/pom.xml
index 39885342ff726facf7cfd0dc65d2ca358fa217e8..126be73942ece51539112bc3d7acf47b4e19c34f 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
   <groupId>gwtquery</groupId>
   <artifactId>gwtquery-project</artifactId>
   <packaging>pom</packaging>
-  <version>0.3-SNAPSHOT</version>
+  <version>0.31-SNAPSHOT</version>
   <name>GwtQuery Project</name>
   <url>http://gwtquery.com</url>
   <description>GwtQuery is a jQuery clone written in GWT.</description>
@@ -105,7 +105,7 @@
       </activation>
 
       <properties>
-        <gwtversion>1.5.0-rc1</gwtversion>
+        <gwtversion>1.5.2</gwtversion>
         <!--           <maven.test.skip>true</maven.test.skip> -->
       </properties>
     </profile>

diff --git a/samples/pom.xml b/samples/pom.xml
index 9fe806c9e65a72c0a76df456dec5d58feb27e1e4..ffab1e68bdafa24b7b0befa90734a673e6f17553 100644 (file)
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>gwtquery</groupId>
     <artifactId>gwtquery-project</artifactId>
-    <version>0.3-SNAPSHOT</version>
+    <version>0.31-SNAPSHOT</version>
   </parent>
 
   <name>GwtQuery Samples</name>
@@ -20,9 +20,38 @@
   </dependencies>
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>unpack</id>
+            <phase>compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>com.google.gwt</groupId>
+                  <artifactId>gwt-dev</artifactId>
+                  <version>${gwtversion}</version>
+                  <classifier>${gwtplatform}-libs</classifier>
+                  <type>zip</type>
+                  <overWrite>true</overWrite>
+                  <outputDirectory>
+                    ${settings.localRepository}/com/google/gwt/gwt-dev/${gwtversion}
+                  </outputDirectory>
+                </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>com.totsp.gwt</groupId>
         <artifactId>maven-googlewebtoolkit2-plugin</artifactId>
+        <version>2.0-beta24</version>
         <configuration>
           <gwtVersion>${gwtversion}</gwtVersion>
           <logLevel>WARN</logLevel>
@@ -43,14 +72,6 @@
           <style>OBF</style>
         </configuration>
         <executions>
-          <execution>
-            <id>setupgwt</id>
-            <phase>validate</phase>
-            <goals>
-              <goal>setup</goal>
-              <goal>extractGwt</goal>
-            </goals>
-          </execution>
           <execution>
             <id>compilegwt</id>
             <goals>