diff --git a/maven/google-poms/gwt/gwt-codeserver/pom-template.xml b/maven/google-poms/gwt/gwt-codeserver/pom-template.xml
new file mode 100644
index 0000000..d64807a
--- /dev/null
+++ b/maven/google-poms/gwt/gwt-codeserver/pom-template.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.google.gwt</groupId>
+    <artifactId>gwt-codeserver</artifactId>
+    <version>${gwtVersion}</version>
+    <distributionManagement>
+        <relocation>
+            <groupId>org.gwtproject</groupId>
+        </relocation>
+    </distributionManagement>
+</project>
\ No newline at end of file
diff --git a/maven/google-poms/gwt/gwt-dev/pom-template.xml b/maven/google-poms/gwt/gwt-dev/pom-template.xml
new file mode 100644
index 0000000..07b8f24
--- /dev/null
+++ b/maven/google-poms/gwt/gwt-dev/pom-template.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.google.gwt</groupId>
+    <artifactId>gwt-dev</artifactId>
+    <version>${gwtVersion}</version>
+    <distributionManagement>
+        <relocation>
+            <groupId>org.gwtproject</groupId>
+        </relocation>
+    </distributionManagement>
+</project>
\ No newline at end of file
diff --git a/maven/google-poms/gwt/gwt-servlet/pom-template.xml b/maven/google-poms/gwt/gwt-servlet/pom-template.xml
new file mode 100644
index 0000000..5a9dec2
--- /dev/null
+++ b/maven/google-poms/gwt/gwt-servlet/pom-template.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.google.gwt</groupId>
+    <artifactId>gwt-servlet</artifactId>
+    <version>${gwtVersion}</version>
+    <distributionManagement>
+        <relocation>
+            <groupId>org.gwtproject</groupId>
+        </relocation>
+    </distributionManagement>
+</project>
\ No newline at end of file
diff --git a/maven/google-poms/gwt/gwt-user/pom-template.xml b/maven/google-poms/gwt/gwt-user/pom-template.xml
new file mode 100644
index 0000000..762817a
--- /dev/null
+++ b/maven/google-poms/gwt/gwt-user/pom-template.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.google.gwt</groupId>
+    <artifactId>gwt-user</artifactId>
+    <version>${gwtVersion}</version>
+    <distributionManagement>
+        <relocation>
+            <groupId>org.gwtproject</groupId>
+        </relocation>
+    </distributionManagement>
+</project>
\ No newline at end of file
diff --git a/maven/google-poms/gwt/pom-template.xml b/maven/google-poms/gwt/pom-template.xml
new file mode 100644
index 0000000..dc7f26b
--- /dev/null
+++ b/maven/google-poms/gwt/pom-template.xml
@@ -0,0 +1,251 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>org.sonatype.oss</groupId>
+        <artifactId>oss-parent</artifactId>
+        <version>4</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.google.gwt</groupId>
+    <artifactId>gwt</artifactId>
+    <packaging>pom</packaging>
+    <name>GWT</name>
+    <url>http://www.gwtproject.org/</url>
+    <version>${gwtVersion}</version>
+    <licenses>
+        <license>
+            <name>GWT Terms</name>
+            <url>http://www.gwtproject.org/terms.html</url>
+        </license>
+    </licenses>
+    <properties>
+        <jetty.version>9.4.44.v20210927</jetty.version>
+        <asm.version>9.2</asm.version>
+    </properties>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.gwtproject</groupId>
+                <artifactId>gwt-user</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.gwtproject</groupId>
+                <artifactId>gwt-dev</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.gwtproject</groupId>
+                <artifactId>gwt-codeserver</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.gwtproject</groupId>
+                <artifactId>gwt-servlet</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.gwt</groupId>
+                <artifactId>gwt-user</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.gwt</groupId>
+                <artifactId>gwt-dev</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.gwt</groupId>
+                <artifactId>gwt-codeserver</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.gwt</groupId>
+                <artifactId>gwt-servlet</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.web.bindery</groupId>
+                <artifactId>requestfactory</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>com.google.jsinterop</groupId>
+                <artifactId>jsinterop-annotations</artifactId>
+                <version>2.0.0</version>
+            </dependency>
+            <dependency>
+                <groupId>javax.servlet</groupId>
+                <artifactId>javax.servlet-api</artifactId>
+                <version>3.1.0</version>
+            </dependency>
+            <dependency>
+                <groupId>javax.validation</groupId>
+                <artifactId>validation-api</artifactId>
+                <version>1.0.0.GA</version>
+            </dependency>
+            <dependency>
+                <groupId>javax.validation</groupId>
+                <artifactId>validation-api</artifactId>
+                <version>1.0.0.GA</version>
+                <!-- Note: use classifier=sources rather than type=java-sources so they're added to the classpath -->
+                <classifier>sources</classifier>
+            </dependency>
+            <dependency>
+                <groupId>com.google.code.gson</groupId>
+                <artifactId>gson</artifactId>
+                <version>2.6.2</version>
+            </dependency>
+            <dependency>
+                <groupId>org.ow2.asm</groupId>
+                <artifactId>asm</artifactId>
+                <version>${asm.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.ow2.asm</groupId>
+                <artifactId>asm-commons</artifactId>
+                <version>${asm.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.ow2.asm</groupId>
+                <artifactId>asm-util</artifactId>
+                <version>${asm.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>colt</groupId>
+                <artifactId>colt</artifactId>
+                <version>1.2.0</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-collections</groupId>
+                <artifactId>commons-collections</artifactId>
+                <version>3.2.2</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-io</groupId>
+                <artifactId>commons-io</artifactId>
+                <version>2.4</version>
+            </dependency>
+            <dependency>
+                <groupId>com.ibm.icu</groupId>
+                <artifactId>icu4j</artifactId>
+                <version>63.1</version>
+            </dependency>
+            <dependency>
+                <groupId>net.sourceforge.htmlunit</groupId>
+                <artifactId>htmlunit</artifactId>
+                <version>2.19</version>
+            </dependency>
+            <dependency>
+                <groupId>org.w3c.css</groupId>
+                <artifactId>sac</artifactId>
+                <version>1.3</version>
+            </dependency>
+            <dependency>
+                <groupId>tapestry</groupId>
+                <artifactId>tapestry</artifactId>
+                <version>4.0.2</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.code.findbugs</groupId>
+                <artifactId>jsr305</artifactId>
+                <version>1.3.9</version>
+            </dependency>
+            <!-- For DevMode / JUnitShell (transitive dependency on jetty-server for CodeServer) -->
+            <dependency>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-webapp</artifactId>
+                <version>${jetty.version}</version>
+            </dependency>
+            <!-- For CodeServer (GZip support) -->
+            <dependency>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-servlets</artifactId>
+                <version>${jetty.version}</version>
+            </dependency>
+            <!-- For JSPs (and annotations scanning) in DevMode -->
+            <!-- Those two dependencies are actually optional, included here mostly for backwards compatibility -->
+            <dependency>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-annotations</artifactId>
+                <version>${jetty.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>apache-jsp</artifactId>
+                <version>${jetty.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.eclipse.jetty.orbit</groupId>
+                        <artifactId>org.eclipse.jdt.core</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <!-- Some transitive dependencies of the above, to (tentatively) prevent conflicts -->
+            <dependency>
+                <groupId>org.eclipse.jetty.websocket</groupId>
+                <artifactId>websocket-api</artifactId>
+                <version>${jetty.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.jetty.websocket</groupId>
+                <artifactId>websocket-common</artifactId>
+                <version>${jetty.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-continuation</artifactId>
+                <version>${jetty.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-http</artifactId>
+                <version>${jetty.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-io</artifactId>
+                <version>${jetty.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-jndi</artifactId>
+                <version>${jetty.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-plus</artifactId>
+                <version>${jetty.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-util</artifactId>
+                <version>${jetty.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-security</artifactId>
+                <version>${jetty.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-server</artifactId>
+                <version>${jetty.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-servlet</artifactId>
+                <version>${jetty.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-xml</artifactId>
+                <version>${jetty.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+</project>
diff --git a/maven/google-poms/requestfactory/apt/pom-template.xml b/maven/google-poms/requestfactory/apt/pom-template.xml
new file mode 100644
index 0000000..e24aff8
--- /dev/null
+++ b/maven/google-poms/requestfactory/apt/pom-template.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.google.web.bindery</groupId>
+    <artifactId>requestfactory-apt</artifactId>
+    <version>${gwtVersion}</version>
+    <distributionManagement>
+        <relocation>
+            <groupId>org.gwtproject.web.bindery</groupId>
+        </relocation>
+    </distributionManagement>
+</project>
diff --git a/maven/google-poms/requestfactory/client/pom-template.xml b/maven/google-poms/requestfactory/client/pom-template.xml
new file mode 100644
index 0000000..3e1d969
--- /dev/null
+++ b/maven/google-poms/requestfactory/client/pom-template.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.google.web.bindery</groupId>
+    <artifactId>requestfactory-client</artifactId>
+    <version>${gwtVersion}</version>
+    <distributionManagement>
+        <relocation>
+            <groupId>org.gwtproject.web.bindery</groupId>
+        </relocation>
+    </distributionManagement>
+</project>
diff --git a/maven/google-poms/requestfactory/pom-template.xml b/maven/google-poms/requestfactory/pom-template.xml
new file mode 100644
index 0000000..bd43648
--- /dev/null
+++ b/maven/google-poms/requestfactory/pom-template.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>org.sonatype.oss</groupId>
+        <artifactId>oss-parent</artifactId>
+        <version>4</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.google.web.bindery</groupId>
+    <artifactId>requestfactory</artifactId>
+    <packaging>pom</packaging>
+    <name>RequestFactory</name>
+    <url>http://www.gwtproject.org/doc/latest/DevGuideRequestFactory.html</url>
+    <version>${gwtVersion}</version>
+    <licenses>
+        <license>
+            <name>GWT Terms</name>
+            <url>http://www.gwtproject.org/terms.html</url>
+        </license>
+    </licenses>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>com.google.web.bindery</groupId>
+                <artifactId>requestfactory-apt</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.web.bindery</groupId>
+                <artifactId>requestfactory-client</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.web.bindery</groupId>
+                <artifactId>requestfactory-server</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.gwtproject.web.bindery</groupId>
+                <artifactId>requestfactory-apt</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.gwtproject.web.bindery</groupId>
+                <artifactId>requestfactory-client</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.gwtproject.web.bindery</groupId>
+                <artifactId>requestfactory-server</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>javax.validation</groupId>
+                <artifactId>validation-api</artifactId>
+                <version>1.0.0.GA</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.code.gson</groupId>
+                <artifactId>gson</artifactId>
+                <version>2.6.2</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+</project>
diff --git a/maven/google-poms/requestfactory/server/pom-template.xml b/maven/google-poms/requestfactory/server/pom-template.xml
new file mode 100644
index 0000000..34d31ad
--- /dev/null
+++ b/maven/google-poms/requestfactory/server/pom-template.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.google.web.bindery</groupId>
+    <artifactId>requestfactory-server</artifactId>
+    <version>${gwtVersion}</version>
+    <distributionManagement>
+        <relocation>
+            <groupId>org.gwtproject.web.bindery</groupId>
+        </relocation>
+    </distributionManagement>
+</project>
diff --git a/maven/poms/gwt/gwt-codeserver/pom-template.xml b/maven/poms/gwt/gwt-codeserver/pom-template.xml
index 1940f83..d30ef28 100644
--- a/maven/poms/gwt/gwt-codeserver/pom-template.xml
+++ b/maven/poms/gwt/gwt-codeserver/pom-template.xml
@@ -4,18 +4,18 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>com.google.gwt</groupId>
+        <groupId>org.gwtproject</groupId>
         <artifactId>gwt</artifactId>
         <version>${gwtVersion}</version>
     </parent>
-    <groupId>com.google.gwt</groupId>
+    <groupId>org.gwtproject</groupId>
     <artifactId>gwt-codeserver</artifactId>
     <packaging>jar</packaging>
     <version>${gwtVersion}</version>
 
     <dependencies>
       <dependency>
-        <groupId>com.google.gwt</groupId>
+        <groupId>org.gwtproject</groupId>
         <artifactId>gwt-dev</artifactId>
       </dependency>
     </dependencies>
diff --git a/maven/poms/gwt/gwt-dev/pom-template.xml b/maven/poms/gwt/gwt-dev/pom-template.xml
index 534ea4e..368ece8 100644
--- a/maven/poms/gwt/gwt-dev/pom-template.xml
+++ b/maven/poms/gwt/gwt-dev/pom-template.xml
@@ -4,11 +4,11 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>com.google.gwt</groupId>
+        <groupId>org.gwtproject</groupId>
         <artifactId>gwt</artifactId>
         <version>${gwtVersion}</version>
     </parent>
-    <groupId>com.google.gwt</groupId>
+    <groupId>org.gwtproject</groupId>
     <artifactId>gwt-dev</artifactId>
     <packaging>jar</packaging>
     <version>${gwtVersion}</version>
diff --git a/maven/poms/gwt/gwt-servlet/pom-template.xml b/maven/poms/gwt/gwt-servlet/pom-template.xml
index 06ee054..0bad1fb 100644
--- a/maven/poms/gwt/gwt-servlet/pom-template.xml
+++ b/maven/poms/gwt/gwt-servlet/pom-template.xml
@@ -4,11 +4,11 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>com.google.gwt</groupId>
+        <groupId>org.gwtproject</groupId>
         <artifactId>gwt</artifactId>
         <version>${gwtVersion}</version>
     </parent>
-    <groupId>com.google.gwt</groupId>
+    <groupId>org.gwtproject</groupId>
     <artifactId>gwt-servlet</artifactId>
     <packaging>jar</packaging>
     <version>${gwtVersion}</version>
diff --git a/maven/poms/gwt/gwt-user/pom-template.xml b/maven/poms/gwt/gwt-user/pom-template.xml
index e9fa33c..122f045 100644
--- a/maven/poms/gwt/gwt-user/pom-template.xml
+++ b/maven/poms/gwt/gwt-user/pom-template.xml
@@ -4,11 +4,11 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>com.google.gwt</groupId>
+        <groupId>org.gwtproject</groupId>
         <artifactId>gwt</artifactId>
         <version>${gwtVersion}</version>
     </parent>
-    <groupId>com.google.gwt</groupId>
+    <groupId>org.gwtproject</groupId>
     <artifactId>gwt-user</artifactId>
     <packaging>jar</packaging>
     <version>${gwtVersion}</version>
diff --git a/maven/poms/gwt/pom-template.xml b/maven/poms/gwt/pom-template.xml
index f4bae17..aeabac3 100644
--- a/maven/poms/gwt/pom-template.xml
+++ b/maven/poms/gwt/pom-template.xml
@@ -3,12 +3,12 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
-	<groupId>org.sonatype.oss</groupId>
-	<artifactId>oss-parent</artifactId>
-	<version>4</version>
+        <groupId>org.sonatype.oss</groupId>
+        <artifactId>oss-parent</artifactId>
+        <version>4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <groupId>com.google.gwt</groupId>
+    <groupId>org.gwtproject</groupId>
     <artifactId>gwt</artifactId>
     <packaging>pom</packaging>
     <name>GWT</name>
@@ -32,22 +32,42 @@
                 <version>${project.version}</version>
             </dependency>
             <dependency>
+                <groupId>org.gwtproject</groupId>
+                <artifactId>gwt-user</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
                 <groupId>com.google.gwt</groupId>
                 <artifactId>gwt-dev</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
+                <groupId>org.gwtproject</groupId>
+                <artifactId>gwt-dev</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
                 <groupId>com.google.gwt</groupId>
                 <artifactId>gwt-codeserver</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
+                <groupId>org.gwtproject</groupId>
+                <artifactId>gwt-codeserver</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
                 <groupId>com.google.gwt</groupId>
                 <artifactId>gwt-servlet</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>com.google.web.bindery</groupId>
+                <groupId>org.gwtproject</groupId>
+                <artifactId>gwt-servlet</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.gwtproject.web.bindery</groupId>
                 <artifactId>requestfactory</artifactId>
                 <version>${project.version}</version>
                 <type>pom</type>
diff --git a/maven/poms/requestfactory/apt/pom-template.xml b/maven/poms/requestfactory/apt/pom-template.xml
index 40591b8..675f0c2 100644
--- a/maven/poms/requestfactory/apt/pom-template.xml
+++ b/maven/poms/requestfactory/apt/pom-template.xml
@@ -4,11 +4,11 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>com.google.web.bindery</groupId>
+        <groupId>org.gwtproject.web.bindery</groupId>
         <artifactId>requestfactory</artifactId>
         <version>${gwtVersion}</version>
     </parent>
-    <groupId>com.google.web.bindery</groupId>
+    <groupId>org.gwtproject.web.bindery</groupId>
     <artifactId>requestfactory-apt</artifactId>
     <packaging>jar</packaging>
     <version>${gwtVersion}</version>
diff --git a/maven/poms/requestfactory/client/pom-template.xml b/maven/poms/requestfactory/client/pom-template.xml
index 5ff777d..ac2c321 100644
--- a/maven/poms/requestfactory/client/pom-template.xml
+++ b/maven/poms/requestfactory/client/pom-template.xml
@@ -4,11 +4,11 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>com.google.web.bindery</groupId>
+        <groupId>org.gwtproject.web.bindery</groupId>
         <artifactId>requestfactory</artifactId>
         <version>${gwtVersion}</version>
     </parent>
-    <groupId>com.google.web.bindery</groupId>
+    <groupId>org.gwtproject.web.bindery</groupId>
     <artifactId>requestfactory-client</artifactId>
     <packaging>jar</packaging>
     <version>${gwtVersion}</version>
diff --git a/maven/poms/requestfactory/pom-template.xml b/maven/poms/requestfactory/pom-template.xml
index f0c559d..bc2746d 100644
--- a/maven/poms/requestfactory/pom-template.xml
+++ b/maven/poms/requestfactory/pom-template.xml
@@ -8,7 +8,7 @@
         <version>4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <groupId>com.google.web.bindery</groupId>
+    <groupId>org.gwtproject.web.bindery</groupId>
     <artifactId>requestfactory</artifactId>
     <packaging>pom</packaging>
     <name>RequestFactory</name>
@@ -28,16 +28,31 @@
                 <version>${project.version}</version>
             </dependency>
             <dependency>
+                <groupId>org.gwtproject.web.bindery</groupId>
+                <artifactId>requestfactory-apt</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
                 <groupId>com.google.web.bindery</groupId>
                 <artifactId>requestfactory-client</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
+                <groupId>org.gwtproject.web.bindery</groupId>
+                <artifactId>requestfactory-client</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
                 <groupId>com.google.web.bindery</groupId>
                 <artifactId>requestfactory-server</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
+                <groupId>org.gwtproject.web.bindery</groupId>
+                <artifactId>requestfactory-server</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
                 <groupId>javax.validation</groupId>
                 <artifactId>validation-api</artifactId>
                 <version>1.0.0.GA</version>
diff --git a/maven/poms/requestfactory/server/pom-template.xml b/maven/poms/requestfactory/server/pom-template.xml
index b48c510..e271cfb 100644
--- a/maven/poms/requestfactory/server/pom-template.xml
+++ b/maven/poms/requestfactory/server/pom-template.xml
@@ -4,11 +4,11 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>com.google.web.bindery</groupId>
+        <groupId>org.gwtproject.web.bindery</groupId>
         <artifactId>requestfactory</artifactId>
         <version>${gwtVersion}</version>
     </parent>
-    <groupId>com.google.web.bindery</groupId>
+    <groupId>org.gwtproject.web.bindery</groupId>
     <artifactId>requestfactory-server</artifactId>
     <packaging>jar</packaging>
     <version>${gwtVersion}</version>
diff --git a/maven/push-gwt.sh b/maven/push-gwt.sh
index 36b58a7..193f876 100755
--- a/maven/push-gwt.sh
+++ b/maven/push-gwt.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
 #
-# Pushes GWT artifacts to a local (the default) or remote maven repository
+# Pushes GWT poms with "com.google" groupIds to a local (the default) or remote maven repository.
+# These poms are relocation poms, and point to the new "org.gwtproject" poms, rather than being
+# deployed with any artifacts.
 # To push remote, set 2 env variables: GWT_MAVEN_REPO_URL and GWT_MAVEN_REPO_ID
 #
 # GWT_MAVEN_REPO_ID = a server id in your .m2/settings.xml with remote repo username and password
@@ -13,7 +15,7 @@
 
 pushd $(dirname $0) >/dev/null 2>&1
 
-export pomDir=./poms
+export pomDir=./google-poms
 
 source lib-gwt.sh
 
@@ -27,9 +29,6 @@
 # use GWT_DIST_FILE to specify the default distribution file
 gwtTrunk=$(dirname $(pwd))
 gwtPathDefault=${GWT_DIST_FILE:=$(ls -t1 ${gwtTrunk}/build/dist/gwt-*.zip 2>/dev/null | head -1)}
-if [[ -f "$gwtPathDefault" ]]; then
-  gwtPathPrompt="($gwtPathDefault)"
-fi
 
 VERSION_REGEX='[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*-*.*'
 
@@ -44,13 +43,6 @@
   exit 1
 fi
 
-read -e -p"Path to GWT distro zip $gwtPathPrompt: " gwtPath
-gwtPath=${gwtPath:=$gwtPathDefault}
-if [[ ! -f  $gwtPath ]]; then
-  echo "ERROR: Cannot find file at \"$gwtPath\""
-  exit 1
-fi
-
 read -e -p"Deploy to repo URL ($repoUrlDefault): " repoUrl
 repoUrl=${repoUrl:=$repoUrlDefault}
 
@@ -64,9 +56,39 @@
 read -p"GPG passphrase for jar signing (may skip for local deployment): " gpgPassphrase
 gpgPassphrase=${gpgPassphrase:=$GWT_GPG_PASS}
 
-maven-gwt "$gwtVersion" \
-          "$gwtPath" \
-          "$repoUrl" \
-          "$repoId"
+# A simplified maven-gwt is inlined here, since only poms are templated and deployed
+
+gwtMavenVersion="$gwtVersion"
+mavenRepoUrl="$repoUrl"
+mavenRepoId="$repoId"
+
+# Generate POMs with correct version
+for template in `find $pomDir -name pom-template.xml`
+do
+  dir=`dirname $template`
+  pushd $dir > /dev/null
+  sed -e "s|\${gwtVersion}|$gwtMavenVersion|g" pom-template.xml >pom.xml
+  popd > /dev/null
+done
+
+# push parent poms
+maven-deploy-file $mavenRepoUrl $mavenRepoId $pomDir/gwt/pom.xml $pomDir/gwt/pom.xml || die
+
+# push artifact relocation poms for gwt
+for i in dev user servlet codeserver
+do
+  gwtPomFile=$pomDir/gwt/gwt-$i/pom.xml
+  maven-deploy-file $mavenRepoUrl $mavenRepoId $gwtPomFile $gwtPomFile || die
+
+done
+
+# Deploy RequestFactory jars
+maven-deploy-file $mavenRepoUrl $mavenRepoId $pomDir/requestfactory/pom.xml $pomDir/requestfactory/pom.xml || die
+
+for i in client server apt
+do
+  rfPomFile=$pomDir/requestfactory/${i}/pom.xml
+  maven-deploy-file $mavenRepoUrl $mavenRepoId $rfPomFile $rfPomFile || die
+done
 
 popd >/dev/null 2>&1
diff --git a/maven/push-gwtproject.sh b/maven/push-gwtproject.sh
new file mode 100755
index 0000000..b05f518
--- /dev/null
+++ b/maven/push-gwtproject.sh
@@ -0,0 +1,72 @@
+#!/bin/bash
+#
+# Pushes GWT artifacts to a local (the default) or remote maven repository
+# To push remote, set 2 env variables: GWT_MAVEN_REPO_URL and GWT_MAVEN_REPO_ID
+#
+# GWT_MAVEN_REPO_ID = a server id in your .m2/settings.xml with remote repo username and password
+#
+# Sonatype staging repo (promotes to Maven Central)
+#   GWT_MAVEN_REPO_URL=https://oss.sonatype.org/service/local/staging/deploy/maven2/
+#
+# Sonatype Google SNAPSHOTs repo (can only deploy SNAPSHOTs here, and they are immediately public)
+#   GWT_MAVEN_REPO_URL=https://oss.sonatype.org/content/repositories/snapshots/
+
+pushd $(dirname $0) >/dev/null 2>&1
+
+export pomDir=./poms
+
+source lib-gwt.sh
+
+# use GWT_MAVEN_REPO_URL if set else M2_REPO else default location for local repo
+localRepoUrl=${M2_REPO:="$HOME/.m2/repository"}
+localRepoUrl="file://$localRepoUrl"
+repoUrlDefault=${GWT_MAVEN_REPO_URL:=$localRepoUrl}
+# repo id is ignored by local repo
+repoId=${GWT_MAVEN_REPO_ID:=none}
+
+# use GWT_DIST_FILE to specify the default distribution file
+gwtTrunk=$(dirname $(pwd))
+gwtPathDefault=${GWT_DIST_FILE:=$(ls -t1 ${gwtTrunk}/build/dist/gwt-*.zip 2>/dev/null | head -1)}
+if [[ -f "$gwtPathDefault" ]]; then
+  gwtPathPrompt="($gwtPathDefault)"
+fi
+
+VERSION_REGEX='[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*-*.*'
+
+# use GWT_VERSION to specify the default version or get it from the file name
+gwtVersionDefault=${GWT_VERSION:=$(expr "$gwtPathDefault" : '.*gwt-\('$VERSION_REGEX'\)\.zip')}
+
+# prompt for info
+read -e -p"GWT version for Maven (${gwtVersionDefault:-ex: HEAD-SNAPSHOT}): " gwtVersion
+gwtVersion=${gwtVersion:=$gwtVersionDefault}
+if test "$gwtVersion" != "HEAD-SNAPSHOT" && ! expr "$gwtVersion" : "$VERSION_REGEX" >/dev/null; then
+  echo "Please enter a version of the form x.y.z or x.y.z-abc"
+  exit 1
+fi
+
+read -e -p"Path to GWT distro zip $gwtPathPrompt: " gwtPath
+gwtPath=${gwtPath:=$gwtPathDefault}
+if [[ ! -f  $gwtPath ]]; then
+  echo "ERROR: Cannot find file at \"$gwtPath\""
+  exit 1
+fi
+
+read -e -p"Deploy to repo URL ($repoUrlDefault): " repoUrl
+repoUrl=${repoUrl:=$repoUrlDefault}
+
+# setting the repoUrl to 'install' will instruct to maven-gwt to
+# execute the install goal instead of the deploy one.
+if [[ "$repoUrl" == "$localRepoUrl" ]]; then
+  repoUrl=install
+fi
+
+# use GWT_GPG_PASS environment var by default if set
+read -p"GPG passphrase for jar signing (may skip for local deployment): " gpgPassphrase
+gpgPassphrase=${gpgPassphrase:=$GWT_GPG_PASS}
+
+maven-gwt "$gwtVersion" \
+          "$gwtPath" \
+          "$repoUrl" \
+          "$repoId"
+
+popd >/dev/null 2>&1
diff --git a/samples/dynatablerf/pom.xml b/samples/dynatablerf/pom.xml
index ccbcdad..4b6d530 100644
--- a/samples/dynatablerf/pom.xml
+++ b/samples/dynatablerf/pom.xml
@@ -29,7 +29,7 @@
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>com.google.gwt</groupId>
+        <groupId>org.gwtproject</groupId>
         <artifactId>gwt</artifactId>
         <version>${gwt.version}</version>
         <type>pom</type>
@@ -41,13 +41,13 @@
   <dependencies>
     <!-- GWT -->
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-user</artifactId>
       <!-- "provided" so that we don't deploy -->
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-dev</artifactId>
       <!-- "provided" so that we don't deploy -->
       <scope>provided</scope>
@@ -61,13 +61,13 @@
     </dependency>
 
     <dependency>
-      <groupId>com.google.web.bindery</groupId>
+      <groupId>org.gwtproject.web.bindery</groupId>
       <artifactId>requestfactory-server</artifactId>
     </dependency>
     <!-- Need to run the RF Validation tool. This works on both the command-line
          and in Eclipse, provided that m2e-apt is installed. -->
     <dependency>
-      <groupId>com.google.web.bindery</groupId>
+      <groupId>org.gwtproject.web.bindery</groupId>
       <artifactId>requestfactory-apt</artifactId>
       <!-- "provided" so that we don't deploy -->
       <scope>provided</scope>
@@ -118,7 +118,7 @@
       <plugin>
         <groupId>net.ltgt.gwt.maven</groupId>
         <artifactId>gwt-maven-plugin</artifactId>
-        <version>1.0-rc-8</version>
+        <version>1.0.1</version>
         <executions>
           <execution>
             <goals>
diff --git a/samples/mobilewebapp/pom.xml b/samples/mobilewebapp/pom.xml
index 92b5d00..f6a12f7 100644
--- a/samples/mobilewebapp/pom.xml
+++ b/samples/mobilewebapp/pom.xml
@@ -43,7 +43,7 @@
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>com.google.gwt</groupId>
+        <groupId>org.gwtproject</groupId>
         <artifactId>gwt</artifactId>
         <version>${gwt.version}</version>
         <type>pom</type>
@@ -55,26 +55,26 @@
   <dependencies>
     <!-- GWT -->
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-user</artifactId>
       <!-- "provided" so that we don't deploy -->
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-dev</artifactId>
       <!-- "provided" so that we don't deploy -->
       <scope>provided</scope>
     </dependency>
 
     <dependency>
-      <groupId>com.google.web.bindery</groupId>
+      <groupId>org.gwtproject.web.bindery</groupId>
       <artifactId>requestfactory-server</artifactId>
     </dependency>
     <!-- Need to run the RF Validation tool. This works on both the command-line
          and in Eclipse, provided that m2e-apt is installed. -->
     <dependency>
-      <groupId>com.google.web.bindery</groupId>
+      <groupId>org.gwtproject.web.bindery</groupId>
       <artifactId>requestfactory-apt</artifactId>
       <!-- "provided" so that we don't deploy -->
       <scope>provided</scope>
@@ -187,7 +187,7 @@
       <plugin>
         <groupId>net.ltgt.gwt.maven</groupId>
         <artifactId>gwt-maven-plugin</artifactId>
-        <version>1.0-rc-8</version>
+        <version>1.0.1</version>
         <executions>
           <execution>
             <goals>
diff --git a/samples/validation/pom.xml b/samples/validation/pom.xml
index 12539d8..51b2c59 100644
--- a/samples/validation/pom.xml
+++ b/samples/validation/pom.xml
@@ -15,7 +15,7 @@
 
     <!-- Setting maven.compiler.source to something different to 1.8
          needs that you configure the sourceLevel in gwt-maven-plugin since
-         GWT 2.8 requires 1.8 (see gwt-maven-plugin block below) -->
+         GWT 2.8 and above requires 1.8 (see gwt-maven-plugin block below) -->
     <maven.compiler.source>1.7</maven.compiler.source>
     <maven.compiler.target>1.7</maven.compiler.target>
 
@@ -28,7 +28,7 @@
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>com.google.gwt</groupId>
+        <groupId>org.gwtproject</groupId>
         <artifactId>gwt</artifactId>
         <version>${gwt.version}</version>
         <type>pom</type>
@@ -40,18 +40,18 @@
   <dependencies>
     <!-- GWT -->
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-servlet</artifactId>
       <scope>runtime</scope>
     </dependency>
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-user</artifactId>
       <!-- "provided" so that we don't deploy -->
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-dev</artifactId>
       <!-- "provided" so that we don't deploy -->
       <scope>provided</scope>
@@ -123,7 +123,7 @@
       <plugin>
         <groupId>net.ltgt.gwt.maven</groupId>
         <artifactId>gwt-maven-plugin</artifactId>
-        <version>1.0-rc-8</version>
+        <version>1.0.1</version>
         <executions>
           <execution>
             <goals>
@@ -135,7 +135,7 @@
           <moduleName>com.google.gwt.sample.validation.Validation</moduleName>
           <moduleShortName>Validation</moduleShortName>
           <failOnError>true</failOnError>
-          <!-- GWT compiler 2.8 requires 1.8, hence define sourceLevel here if you use
+          <!-- GWT compiler 2.8 and above requires 1.8, hence define sourceLevel here if you use
                a different source language for java compilation -->
           <sourceLevel>1.8</sourceLevel>
           <!-- Compiler configuration -->
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 f1b19e7..b5d58e1 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
@@ -14,7 +14,7 @@
 
     <!-- Setting maven.compiler.source to something different to 1.8
          needs that you configure the sourceLevel in gwt-maven-plugin since
-         GWT compiler 2.8 requires 1.8 (see gwt-maven-plugin block below) -->
+         GWT compiler 2.8 and above requires 1.8 (see gwt-maven-plugin block below) -->
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
 
@@ -27,7 +27,7 @@
     <dependencies>
       <!-- ensure all GWT deps use the same version (unless overridden) -->
       <dependency>
-        <groupId>com.google.gwt</groupId>
+        <groupId>org.gwtproject</groupId>
         <artifactId>gwt</artifactId>
         <version>@gwtVersion</version>
         <type>pom</type>
@@ -38,24 +38,24 @@
 
   <dependencies>
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-servlet</artifactId>
       <scope>runtime</scope>
     </dependency>
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-user</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>com.google.gwt</groupId>
+      <groupId>org.gwtproject</groupId>
       <artifactId>gwt-dev</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.11</version>
+      <version>4.13.2</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -70,7 +70,7 @@
       <plugin>
         <groupId>net.ltgt.gwt.maven</groupId>
         <artifactId>gwt-maven-plugin</artifactId>
-        <version>1.0-rc-8</version>
+        <version>1.0.1</version>
         <executions>
           <execution>
             <goals>
@@ -83,7 +83,7 @@
           <moduleName>@moduleName</moduleName>
           <moduleShortName>@moduleShortName</moduleShortName>
           <failOnError>true</failOnError>
-          <!-- GWT compiler 2.8 requires 1.8, hence define sourceLevel here if you use
+          <!-- GWT compiler 2.8 and above requires 1.8, hence define sourceLevel here if you use
                a different source language for java compilation -->
           <sourceLevel>1.8</sourceLevel>
           <!-- Compiler configuration -->