diff --git a/samples/dynatablerf/README-MAVEN.txt b/samples/dynatablerf/README-MAVEN.txt
index 3f95038..705d7fb 100644
--- a/samples/dynatablerf/README-MAVEN.txt
+++ b/samples/dynatablerf/README-MAVEN.txt
@@ -51,14 +51,14 @@
 build your project (http://maven.apache.org/). You will also need Java
 1.6 JDK. Maven uses the supplied 'pom.xml' file which describes
 exactly how to build your project. This file has been tested to work
-against Maven 2.2.1. The following assumes 'mvn' is on your command
+against Maven 3.3.1. The following assumes 'mvn' is on your command
 line path.
 
-To run development mode use the Maven GWT Plugin.
+To run development mode use the Maven Plugin for GWT.
 
-  mvn gwt:run
+  mvn gwt:devmode
 
 To compile your project for deployment, just type 'mvn package'.
 
 For a full listing of other goals, visit:
-http://mojo.codehaus.org/gwt-maven-plugin/plugin-info.html
+https://tbroyer.github.io/gwt-maven-plugin/plugin-info.html
diff --git a/samples/dynatablerf/pom.xml b/samples/dynatablerf/pom.xml
index 69cc43f..85c1ddb 100644
--- a/samples/dynatablerf/pom.xml
+++ b/samples/dynatablerf/pom.xml
@@ -15,7 +15,7 @@
     <!-- Convenience property to set the GWT version -->
     <gwt.version>2.8.0-SNAPSHOT</gwt.version>
 
-    <!-- GWT needs at least java 1.6 -->
+    <!-- GWT needs at least java 1.7 -->
     <maven.compiler.source>1.7</maven.compiler.source>
     <maven.compiler.target>1.7</maven.compiler.target>
 
@@ -114,29 +114,34 @@
 
       <!-- GWT Maven Plugin-->
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
+        <groupId>net.ltgt.gwt.maven</groupId>
         <artifactId>gwt-maven-plugin</artifactId>
-        <version>${gwt.version}</version>
+        <version>1.0-rc-6</version>
         <executions>
           <execution>
             <goals>
+              <goal>import-sources</goal>
               <goal>compile</goal>
             </goals>
           </execution>
         </executions>
-        <!-- Plugin configuration. There are many available options,
-             see gwt-maven-plugin documentation at codehaus.org -->
         <configuration>
-          <!-- URL that should be opened by DevMode (gwt:run). -->
-          <runTarget>DynaTableRf.html</runTarget>
-          <!-- Ask GWT to create the Story of Your Compile (SOYC) (gwt:compile) -->
-          <compileReport>true</compileReport>
-          <compilerMetrics>true</compilerMetrics>
-          <module>com.google.gwt.sample.dynatablerf.DynaTableRf</module>
-          <logLevel>INFO</logLevel>
-          <style>${gwt.style}</style>
-
-          <copyWebapp>true</copyWebapp>
+          <moduleName>com.google.gwt.sample.dynatablerf.DynaTableRf</moduleName>
+          <moduleShortName>DynaTableRf</moduleShortName>
+          <failOnError>true</failOnError>
+          <!-- Compiler configuration -->
+          <compilerArgs>
+            <!-- Ask GWT to create the Story of Your Compile (SOYC) (gwt:compile) -->
+            <arg>-compileReport</arg>
+            <arg>-XcompilerMetrics</arg>
+          </compilerArgs>
+          <!-- DevMode configuration -->
+          <warDir>${project.build.directory}/${project.build.finalName}</warDir>
+          <classpathScope>compile+runtime</classpathScope>
+          <!-- URL(s) that should be opened by DevMode (gwt:devmode). -->
+          <startupUrls>
+            <startupUrl>DynaTableRf.html</startupUrl>
+          </startupUrls>
         </configuration>
       </plugin>
 
@@ -155,26 +160,4 @@
       </snapshots>
     </repository>
   </repositories>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>google-snapshots</id>
-      <url>https://oss.sonatype.org/content/repositories/google-snapshots/</url>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </pluginRepository>
-    <pluginRepository>
-      <id>gwt-plugin-snapshots</id>
-      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </pluginRepository>
-  </pluginRepositories>
 </project>
diff --git a/samples/mobilewebapp/README-MAVEN.txt b/samples/mobilewebapp/README-MAVEN.txt
index eadca76..cddc4e9 100644
--- a/samples/mobilewebapp/README-MAVEN.txt
+++ b/samples/mobilewebapp/README-MAVEN.txt
@@ -52,17 +52,20 @@
 build your project (http://maven.apache.org/). You will also need Java
 1.6 JDK. Maven uses the supplied 'pom.xml' file which describes
 exactly how to build your project. This file has been tested to work
-against Maven 2.2.1. The following assumes 'mvn' is on your command
+against Maven 3.3.1. The following assumes 'mvn' is on your command
 line path. Also, see note below if you have gae.home set in settings.xml.
 
-To run development mode use the Maven GWT Plugin.
+To run development mode use the Maven Plugin for AppEngine and Maven
+Plugin for GWT.
 
-  mvn gwt:run
+  mvn appengine:devserver_start
+  mvn gwt:codeserver
+  mvn appengine:devserver_stop
 
 To compile your project for deployment, just type 'mvn package'.
 
 For a full listing of other goals, visit:
-http://mojo.codehaus.org/gwt-maven-plugin/plugin-info.html
+https://tbroyer.github.io/gwt-maven-plugin/plugin-info.html
 
 -- Important Note:
 
diff --git a/samples/mobilewebapp/pom.xml b/samples/mobilewebapp/pom.xml
index 704fba2..8ce47a0 100644
--- a/samples/mobilewebapp/pom.xml
+++ b/samples/mobilewebapp/pom.xml
@@ -13,7 +13,7 @@
     <!-- Convenience property to set the GWT version -->
     <gwt.version>2.8.0-SNAPSHOT</gwt.version>
 
-    <!-- GWT needs at least java 1.6 -->
+    <!-- GWT needs at least java 1.7 -->
     <maven.compiler.source>1.7</maven.compiler.source>
     <maven.compiler.target>1.7</maven.compiler.target>
 
@@ -32,7 +32,7 @@
   <!-- Running with Maven -->
   <!-- mvn clean package -->
   <!-- mvn appengine:devserver_start - start web server -->
-  <!-- mvn gwt:run-codeserver - start gwt code server -->
+  <!-- mvn gwt:codeserver - start gwt code server -->
   <!-- goto http://localhost:8080 -->
   <!-- mvn appengine:devserver_stop - stop web server -->
 
@@ -181,40 +181,35 @@
 
       <!-- GWT Maven Plugin-->
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
+        <groupId>net.ltgt.gwt.maven</groupId>
         <artifactId>gwt-maven-plugin</artifactId>
-        <version>${gwt.version}</version>
+        <version>1.0-rc-6</version>
         <executions>
           <execution>
             <goals>
+              <goal>import-sources</goal>
               <goal>compile</goal>
             </goals>
           </execution>
         </executions>
-
-        <!-- Plugin configuration. There are many available options,
-             see gwt-maven-plugin documentation at codehaus.org -->
         <configuration>
-          <!-- URL that should be opened by DevMode (gwt:run). -->
-          <runTarget>MobileWebApp.html</runTarget>
-          <!-- Ask GWT to create the Story of Your Compile (SOYC) (gwt:compile) -->
-          <compileReport>true</compileReport>
-          <compilerMetrics>true</compilerMetrics>
-          <modules>
-            <module>com.google.gwt.sample.mobilewebapp.MobileWebApp</module>
-          </modules>
-
-          <logLevel>INFO</logLevel>
-          <style>${gwt.style}</style>
-
-          <copyWebapp>true</copyWebapp>
-          
-          <!-- mvn gwt:run-codeserver - won't have to use the bookmarklet -->
+          <moduleName>com.google.gwt.sample.mobilewebapp.MobileWebApp</moduleName>
+          <moduleShortName>MobileWebApp</moduleShortName>
+          <failOnError>true</failOnError>
+          <!-- Compiler configuration -->
+          <compilerArgs>
+            <!-- Ask GWT to create the Story of Your Compile (SOYC) (gwt:compile) -->
+            <arg>-compileReport</arg>
+            <arg>-XcompilerMetrics</arg>
+          </compilerArgs>
+          <!-- DevMode configuration -->
           <launcherDir>${project.build.directory}/${project.build.finalName}</launcherDir>
-
-          <!-- Run tests using HtmlUnit -->
-          <mode>htmlunit</mode>
-         </configuration>
+          <classpathScope>compile+runtime</classpathScope>
+          <!-- URL(s) that should be opened by DevMode (gwt:devmode). -->
+          <startupUrls>
+            <startupUrl>MobileWebApp.html</startupUrl>
+          </startupUrls>
+        </configuration>
       </plugin>
 
       <!-- Google App Engine Plugin -->
@@ -254,26 +249,4 @@
       </snapshots>
     </repository>
   </repositories>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>google-snapshots</id>
-      <url>https://oss.sonatype.org/content/repositories/google-snapshots/</url>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </pluginRepository>
-    <pluginRepository>
-      <id>gwt-plugin-snapshots</id>
-      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </pluginRepository>
-  </pluginRepositories>
 </project>
diff --git a/samples/validation/README-MAVEN.txt b/samples/validation/README-MAVEN.txt
index 58d4570..3b07608 100644
--- a/samples/validation/README-MAVEN.txt
+++ b/samples/validation/README-MAVEN.txt
@@ -46,14 +46,14 @@
 build your project (http://maven.apache.org/). You will also need Java
 1.6 JDK. Maven uses the supplied 'pom.xml' file which describes
 exactly how to build your project. This file has been tested to work
-against Maven 2.2.1. The following assumes 'mvn' is on your command
+against Maven 3.3.1. The following assumes 'mvn' is on your command
 line path.
 
 To run development mode use the Maven GWT Plugin.
 
-  mvn gwt:run
+  mvn gwt:devmode
 
 To compile your project for deployment, just type 'mvn package'.
 
 For a full listing of other goals, visit:
-http://mojo.codehaus.org/gwt-maven-plugin/plugin-info.html
+https://tbroyer.github.io/gwt-maven-plugin/plugin-info.html
diff --git a/samples/validation/pom.xml b/samples/validation/pom.xml
index 1219820..4f28791 100644
--- a/samples/validation/pom.xml
+++ b/samples/validation/pom.xml
@@ -13,7 +13,7 @@
     <!-- Convenience property to set the GWT version -->
     <gwt.version>2.8.0-SNAPSHOT</gwt.version>
 
-    <!-- GWT needs at least java 1.6 -->
+    <!-- GWT needs at least java 1.7 -->
     <maven.compiler.source>1.7</maven.compiler.source>
     <maven.compiler.target>1.7</maven.compiler.target>
 
@@ -119,29 +119,34 @@
     <plugins>
       <!-- GWT Maven Plugin-->
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
+        <groupId>net.ltgt.gwt.maven</groupId>
         <artifactId>gwt-maven-plugin</artifactId>
-        <version>${gwt.version}</version>
+        <version>1.0-rc-6</version>
         <executions>
           <execution>
             <goals>
+              <goal>import-sources</goal>
               <goal>compile</goal>
             </goals>
           </execution>
         </executions>
-        <!-- Plugin configuration. There are many available options,
-             see gwt-maven-plugin documentation at codehaus.org -->
         <configuration>
-          <!-- URL that should be opened by DevMode (gwt:run). -->
-          <runTarget>Validation.html</runTarget>
-          <!-- Ask GWT to create the Story of Your Compile (SOYC) (gwt:compile) -->
-          <compileReport>true</compileReport>
-          <compilerMetrics>true</compilerMetrics>
-          <module>com.google.gwt.sample.validation.Validation</module>
-          <logLevel>INFO</logLevel>
-          <style>${gwt.style}</style>
-
-          <copyWebapp>true</copyWebapp>
+          <moduleName>com.google.gwt.sample.validation.Validation</moduleName>
+          <moduleShortName>Validation</moduleShortName>
+          <failOnError>false</failOnError><!-- There are deliberate server-only code in ServerValidator that would fail the build -->
+          <!-- Compiler configuration -->
+          <compilerArgs>
+            <!-- Ask GWT to create the Story of Your Compile (SOYC) (gwt:compile) -->
+            <arg>-compileReport</arg>
+            <arg>-XcompilerMetrics</arg>
+          </compilerArgs>
+          <!-- DevMode configuration -->
+          <warDir>${project.build.directory}/${project.build.finalName}</warDir>
+          <classpathScope>compile+runtime</classpathScope>
+          <!-- URL(s) that should be opened by DevMode (gwt:devmode). -->
+          <startupUrls>
+            <startupUrl>Validation.html</startupUrl>
+          </startupUrls>
         </configuration>
       </plugin>
     </plugins>
@@ -159,26 +164,4 @@
       </snapshots>
     </repository>
   </repositories>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>google-snapshots</id>
-      <url>https://oss.sonatype.org/content/repositories/google-snapshots/</url>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </pluginRepository>
-    <pluginRepository>
-      <id>gwt-plugin-snapshots</id>
-      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </pluginRepository>
-  </pluginRepositories>
 </project>
diff --git a/user/src/com/google/gwt/user/tools/templates/maven/pom.xmlsrc b/user/src/com/google/gwt/user/tools/templates/maven/pom.xmlsrc
index 084c9d8..8a506bb 100644
--- a/user/src/com/google/gwt/user/tools/templates/maven/pom.xmlsrc
+++ b/user/src/com/google/gwt/user/tools/templates/maven/pom.xmlsrc
@@ -11,8 +11,6 @@
   <name>@moduleName</name>
   
   <properties>
-    <!-- Convenience property to set the GWT version -->
-    <gwtVersion>@gwtVersion</gwtVersion>
     <!-- Note: GWT needs at least java 1.7 -->
     <maven.compiler.source>1.7</maven.compiler.source>
     <maven.compiler.target>1.7</maven.compiler.target>
@@ -28,7 +26,7 @@
       <dependency>
         <groupId>com.google.gwt</groupId>
         <artifactId>gwt</artifactId>
-        <version>${gwtVersion}</version>
+        <version>@gwtVersion</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -67,37 +65,36 @@
       
       <!-- GWT Maven Plugin-->
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
+        <groupId>net.ltgt.gwt.maven</groupId>
         <artifactId>gwt-maven-plugin</artifactId>
-        <version>${gwtVersion}</version>
+        <version>1.0-rc-6</version>
         <executions>
           <execution>
             <goals>
+              <goal>import-sources</goal>
               <goal>compile</goal>
-            </goals>
-          </execution>
-          <execution>
-            <!-- Run tests through gwt:test, this allows reusing the plugin configuration for GWTTestCases -->
-            <id>gwt-tests</id>
-            <phase>test</phase>
-            <goals>
+              <goal>import-test-sources</goal>
               <goal>test</goal>
             </goals>
           </execution>
         </executions>
-        <!-- Plugin configuration. There are many available options, 
-             see gwt-maven-plugin documentation at codehaus.org --> 
         <configuration>
-          <modules>
-            <module>@moduleName</module>
-          </modules>
-          <!-- URL that should be opened by DevMode (gwt:run). -->
-          <runTarget>@moduleShortName.html</runTarget>
-          <!-- Ask GWT to create the Story of Your Compile (SOYC) (gwt:compile) -->
-          <compileReport>true</compileReport>
-          <compilerMetrics>true</compilerMetrics>
-          <!-- Run tests using HtmlUnit -->
-          <mode>htmlunit</mode>
+          <moduleName>@moduleName</moduleName>
+          <moduleShortName>@moduleShortName</moduleShortName>
+          <failOnError>true</failOnError>
+          <!-- Compiler configuration -->
+          <compilerArgs>
+            <!-- Ask GWT to create the Story of Your Compile (SOYC) (gwt:compile) -->
+            <arg>-compileReport</arg>
+            <arg>-XcompilerMetrics</arg>
+          </compilerArgs>
+          <!-- DevMode configuration -->
+          <warDir>${project.build.directory}/${project.build.finalName}</warDir>
+          <classpathScope>compile+runtime</classpathScope>
+          <!-- URL(s) that should be opened by DevMode (gwt:devmode). -->
+          <startupUrls>
+            <startupUrl>@moduleShortName.html</startupUrl>
+          </startupUrls>
         </configuration>
       </plugin>
 
diff --git a/user/src/com/google/gwt/user/tools/templates/readme/README.txtsrc b/user/src/com/google/gwt/user/tools/templates/readme/README.txtsrc
index c0a8de6..ef5760e 100644
--- a/user/src/com/google/gwt/user/tools/templates/readme/README.txtsrc
+++ b/user/src/com/google/gwt/user/tools/templates/readme/README.txtsrc
@@ -76,8 +76,8 @@
 
 mvn clean         # delete temporary stuff
 mvn test          # run all the tests (gwt and junit)
-mvn gwt:run       # run development mode
+mvn gwt:devmode   # run development mode (needs "mvn package" to be run before)
 mvn package       # generate a .war package ready to deploy
 
 For more information about other available goals, read Maven and gwt-maven-plugin 
-documentation (http://maven.apache.org, http://mojo.codehaus.org/gwt-maven-plugin)  
+documentation (http://maven.apache.org, https://tbroyer.github.io/gwt-maven-plugin/)