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 00000000000..d64807acb6d
--- /dev/null
+++ b/maven/google-poms/gwt/gwt-codeserver/pom-template.xml
@@ -0,0 +1,14 @@
+
+
+ 4.0.0
+ com.google.gwt
+ gwt-codeserver
+ ${gwtVersion}
+
+
+ org.gwtproject
+
+
+
\ 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 00000000000..07b8f244809
--- /dev/null
+++ b/maven/google-poms/gwt/gwt-dev/pom-template.xml
@@ -0,0 +1,14 @@
+
+
+ 4.0.0
+ com.google.gwt
+ gwt-dev
+ ${gwtVersion}
+
+
+ org.gwtproject
+
+
+
\ 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 00000000000..5a9dec222b4
--- /dev/null
+++ b/maven/google-poms/gwt/gwt-servlet/pom-template.xml
@@ -0,0 +1,14 @@
+
+
+ 4.0.0
+ com.google.gwt
+ gwt-servlet
+ ${gwtVersion}
+
+
+ org.gwtproject
+
+
+
\ 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 00000000000..762817a7f48
--- /dev/null
+++ b/maven/google-poms/gwt/gwt-user/pom-template.xml
@@ -0,0 +1,14 @@
+
+
+ 4.0.0
+ com.google.gwt
+ gwt-user
+ ${gwtVersion}
+
+
+ org.gwtproject
+
+
+
\ 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 00000000000..dc7f26bd3d5
--- /dev/null
+++ b/maven/google-poms/gwt/pom-template.xml
@@ -0,0 +1,251 @@
+
+
+
+ org.sonatype.oss
+ oss-parent
+ 4
+
+ 4.0.0
+ com.google.gwt
+ gwt
+ pom
+ GWT
+ http://www.gwtproject.org/
+ ${gwtVersion}
+
+
+ GWT Terms
+ http://www.gwtproject.org/terms.html
+
+
+
+ 9.4.44.v20210927
+ 9.2
+
+
+
+
+ org.gwtproject
+ gwt-user
+ ${project.version}
+
+
+ org.gwtproject
+ gwt-dev
+ ${project.version}
+
+
+ org.gwtproject
+ gwt-codeserver
+ ${project.version}
+
+
+ org.gwtproject
+ gwt-servlet
+ ${project.version}
+
+
+ com.google.gwt
+ gwt-user
+ ${project.version}
+
+
+ com.google.gwt
+ gwt-dev
+ ${project.version}
+
+
+ com.google.gwt
+ gwt-codeserver
+ ${project.version}
+
+
+ com.google.gwt
+ gwt-servlet
+ ${project.version}
+
+
+ com.google.web.bindery
+ requestfactory
+ ${project.version}
+ pom
+ import
+
+
+ com.google.jsinterop
+ jsinterop-annotations
+ 2.0.0
+
+
+ javax.servlet
+ javax.servlet-api
+ 3.1.0
+
+
+ javax.validation
+ validation-api
+ 1.0.0.GA
+
+
+ javax.validation
+ validation-api
+ 1.0.0.GA
+
+ sources
+
+
+ com.google.code.gson
+ gson
+ 2.6.2
+
+
+ org.ow2.asm
+ asm
+ ${asm.version}
+
+
+ org.ow2.asm
+ asm-commons
+ ${asm.version}
+
+
+ org.ow2.asm
+ asm-util
+ ${asm.version}
+
+
+ colt
+ colt
+ 1.2.0
+
+
+ commons-collections
+ commons-collections
+ 3.2.2
+
+
+ commons-io
+ commons-io
+ 2.4
+
+
+ com.ibm.icu
+ icu4j
+ 63.1
+
+
+ net.sourceforge.htmlunit
+ htmlunit
+ 2.19
+
+
+ org.w3c.css
+ sac
+ 1.3
+
+
+ tapestry
+ tapestry
+ 4.0.2
+
+
+ com.google.code.findbugs
+ jsr305
+ 1.3.9
+
+
+
+ org.eclipse.jetty
+ jetty-webapp
+ ${jetty.version}
+
+
+
+ org.eclipse.jetty
+ jetty-servlets
+ ${jetty.version}
+
+
+
+
+ org.eclipse.jetty
+ jetty-annotations
+ ${jetty.version}
+
+
+ org.eclipse.jetty
+ apache-jsp
+ ${jetty.version}
+
+
+ org.eclipse.jetty.orbit
+ org.eclipse.jdt.core
+
+
+
+
+
+ org.eclipse.jetty.websocket
+ websocket-api
+ ${jetty.version}
+
+
+ org.eclipse.jetty.websocket
+ websocket-common
+ ${jetty.version}
+
+
+ org.eclipse.jetty
+ jetty-continuation
+ ${jetty.version}
+
+
+ org.eclipse.jetty
+ jetty-http
+ ${jetty.version}
+
+
+ org.eclipse.jetty
+ jetty-io
+ ${jetty.version}
+
+
+ org.eclipse.jetty
+ jetty-jndi
+ ${jetty.version}
+
+
+ org.eclipse.jetty
+ jetty-plus
+ ${jetty.version}
+
+
+ org.eclipse.jetty
+ jetty-util
+ ${jetty.version}
+
+
+ org.eclipse.jetty
+ jetty-security
+ ${jetty.version}
+
+
+ org.eclipse.jetty
+ jetty-server
+ ${jetty.version}
+
+
+ org.eclipse.jetty
+ jetty-servlet
+ ${jetty.version}
+
+
+ org.eclipse.jetty
+ jetty-xml
+ ${jetty.version}
+
+
+
+
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 00000000000..e24aff8ea98
--- /dev/null
+++ b/maven/google-poms/requestfactory/apt/pom-template.xml
@@ -0,0 +1,14 @@
+
+
+ 4.0.0
+ com.google.web.bindery
+ requestfactory-apt
+ ${gwtVersion}
+
+
+ org.gwtproject.web.bindery
+
+
+
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 00000000000..3e1d969a2e1
--- /dev/null
+++ b/maven/google-poms/requestfactory/client/pom-template.xml
@@ -0,0 +1,14 @@
+
+
+ 4.0.0
+ com.google.web.bindery
+ requestfactory-client
+ ${gwtVersion}
+
+
+ org.gwtproject.web.bindery
+
+
+
diff --git a/maven/google-poms/requestfactory/pom-template.xml b/maven/google-poms/requestfactory/pom-template.xml
new file mode 100644
index 00000000000..bd436484999
--- /dev/null
+++ b/maven/google-poms/requestfactory/pom-template.xml
@@ -0,0 +1,67 @@
+
+
+
+ org.sonatype.oss
+ oss-parent
+ 4
+
+ 4.0.0
+ com.google.web.bindery
+ requestfactory
+ pom
+ RequestFactory
+ http://www.gwtproject.org/doc/latest/DevGuideRequestFactory.html
+ ${gwtVersion}
+
+
+ GWT Terms
+ http://www.gwtproject.org/terms.html
+
+
+
+
+
+ com.google.web.bindery
+ requestfactory-apt
+ ${project.version}
+
+
+ com.google.web.bindery
+ requestfactory-client
+ ${project.version}
+
+
+ com.google.web.bindery
+ requestfactory-server
+ ${project.version}
+
+
+ org.gwtproject.web.bindery
+ requestfactory-apt
+ ${project.version}
+
+
+ org.gwtproject.web.bindery
+ requestfactory-client
+ ${project.version}
+
+
+ org.gwtproject.web.bindery
+ requestfactory-server
+ ${project.version}
+
+
+ javax.validation
+ validation-api
+ 1.0.0.GA
+
+
+ com.google.code.gson
+ gson
+ 2.6.2
+
+
+
+
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 00000000000..34d31adc83e
--- /dev/null
+++ b/maven/google-poms/requestfactory/server/pom-template.xml
@@ -0,0 +1,14 @@
+
+
+ 4.0.0
+ com.google.web.bindery
+ requestfactory-server
+ ${gwtVersion}
+
+
+ org.gwtproject.web.bindery
+
+
+
diff --git a/maven/poms/gwt/gwt-codeserver/pom-template.xml b/maven/poms/gwt/gwt-codeserver/pom-template.xml
index 1940f83b8fa..d30ef28d38e 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">
4.0.0
- com.google.gwt
+ org.gwtproject
gwt
${gwtVersion}
- com.google.gwt
+ org.gwtproject
gwt-codeserver
jar
${gwtVersion}
- com.google.gwt
+ org.gwtproject
gwt-dev
diff --git a/maven/poms/gwt/gwt-dev/pom-template.xml b/maven/poms/gwt/gwt-dev/pom-template.xml
index 534ea4ece0c..368ece89f4c 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">
4.0.0
- com.google.gwt
+ org.gwtproject
gwt
${gwtVersion}
- com.google.gwt
+ org.gwtproject
gwt-dev
jar
${gwtVersion}
diff --git a/maven/poms/gwt/gwt-servlet/pom-template.xml b/maven/poms/gwt/gwt-servlet/pom-template.xml
index 06ee054f95e..0bad1fb762b 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">
4.0.0
- com.google.gwt
+ org.gwtproject
gwt
${gwtVersion}
- com.google.gwt
+ org.gwtproject
gwt-servlet
jar
${gwtVersion}
diff --git a/maven/poms/gwt/gwt-user/pom-template.xml b/maven/poms/gwt/gwt-user/pom-template.xml
index e9fa33c2fb8..122f0456c00 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">
4.0.0
- com.google.gwt
+ org.gwtproject
gwt
${gwtVersion}
- com.google.gwt
+ org.gwtproject
gwt-user
jar
${gwtVersion}
diff --git a/maven/poms/gwt/pom-template.xml b/maven/poms/gwt/pom-template.xml
index f4bae170ae3..aeabac30cac 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">
- org.sonatype.oss
- oss-parent
- 4
+ org.sonatype.oss
+ oss-parent
+ 4
4.0.0
- com.google.gwt
+ org.gwtproject
gwt
pom
GWT
@@ -31,23 +31,43 @@
gwt-user
${project.version}
+
+ org.gwtproject
+ gwt-user
+ ${project.version}
+
com.google.gwt
gwt-dev
${project.version}
+
+ org.gwtproject
+ gwt-dev
+ ${project.version}
+
com.google.gwt
gwt-codeserver
${project.version}
+
+ org.gwtproject
+ gwt-codeserver
+ ${project.version}
+
com.google.gwt
gwt-servlet
${project.version}
- com.google.web.bindery
+ org.gwtproject
+ gwt-servlet
+ ${project.version}
+
+
+ org.gwtproject.web.bindery
requestfactory
${project.version}
pom
diff --git a/maven/poms/requestfactory/apt/pom-template.xml b/maven/poms/requestfactory/apt/pom-template.xml
index 40591b8043a..675f0c298d7 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">
4.0.0
- com.google.web.bindery
+ org.gwtproject.web.bindery
requestfactory
${gwtVersion}
- com.google.web.bindery
+ org.gwtproject.web.bindery
requestfactory-apt
jar
${gwtVersion}
diff --git a/maven/poms/requestfactory/client/pom-template.xml b/maven/poms/requestfactory/client/pom-template.xml
index 5ff777d2de1..ac2c321bedc 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">
4.0.0
- com.google.web.bindery
+ org.gwtproject.web.bindery
requestfactory
${gwtVersion}
- com.google.web.bindery
+ org.gwtproject.web.bindery
requestfactory-client
jar
${gwtVersion}
diff --git a/maven/poms/requestfactory/pom-template.xml b/maven/poms/requestfactory/pom-template.xml
index f0c559dd497..bc2746df9ad 100644
--- a/maven/poms/requestfactory/pom-template.xml
+++ b/maven/poms/requestfactory/pom-template.xml
@@ -8,7 +8,7 @@
4
4.0.0
- com.google.web.bindery
+ org.gwtproject.web.bindery
requestfactory
pom
RequestFactory
@@ -27,16 +27,31 @@
requestfactory-apt
${project.version}
+
+ org.gwtproject.web.bindery
+ requestfactory-apt
+ ${project.version}
+
com.google.web.bindery
requestfactory-client
${project.version}
+
+ org.gwtproject.web.bindery
+ requestfactory-client
+ ${project.version}
+
com.google.web.bindery
requestfactory-server
${project.version}
+
+ org.gwtproject.web.bindery
+ requestfactory-server
+ ${project.version}
+
javax.validation
validation-api
diff --git a/maven/poms/requestfactory/server/pom-template.xml b/maven/poms/requestfactory/server/pom-template.xml
index b48c510a908..e271cfbf7c7 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">
4.0.0
- com.google.web.bindery
+ org.gwtproject.web.bindery
requestfactory
${gwtVersion}
- com.google.web.bindery
+ org.gwtproject.web.bindery
requestfactory-server
jar
${gwtVersion}
diff --git a/maven/push-gwt.sh b/maven/push-gwt.sh
index 36b58a75578..193f87665ce 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 @@ 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]*-*.*'
@@ -44,13 +43,6 @@ if test "$gwtVersion" != "HEAD-SNAPSHOT" && ! expr "$gwtVersion" : "$VERSION_REG
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 @@ fi
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 00000000000..b05f518625a
--- /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 ccbcdadd286..4b6d5308405 100644
--- a/samples/dynatablerf/pom.xml
+++ b/samples/dynatablerf/pom.xml
@@ -29,7 +29,7 @@
- com.google.gwt
+ org.gwtproject
gwt
${gwt.version}
pom
@@ -41,13 +41,13 @@
- com.google.gwt
+ org.gwtproject
gwt-user
provided
- com.google.gwt
+ org.gwtproject
gwt-dev
provided
@@ -61,13 +61,13 @@
- com.google.web.bindery
+ org.gwtproject.web.bindery
requestfactory-server
- com.google.web.bindery
+ org.gwtproject.web.bindery
requestfactory-apt
provided
@@ -118,7 +118,7 @@
net.ltgt.gwt.maven
gwt-maven-plugin
- 1.0-rc-8
+ 1.0.1
diff --git a/samples/mobilewebapp/pom.xml b/samples/mobilewebapp/pom.xml
index 92b5d00e83a..f6a12f7ac0a 100644
--- a/samples/mobilewebapp/pom.xml
+++ b/samples/mobilewebapp/pom.xml
@@ -43,7 +43,7 @@
- com.google.gwt
+ org.gwtproject
gwt
${gwt.version}
pom
@@ -55,26 +55,26 @@
- com.google.gwt
+ org.gwtproject
gwt-user
provided
- com.google.gwt
+ org.gwtproject
gwt-dev
provided
- com.google.web.bindery
+ org.gwtproject.web.bindery
requestfactory-server
- com.google.web.bindery
+ org.gwtproject.web.bindery
requestfactory-apt
provided
@@ -187,7 +187,7 @@
net.ltgt.gwt.maven
gwt-maven-plugin
- 1.0-rc-8
+ 1.0.1
diff --git a/samples/validation/pom.xml b/samples/validation/pom.xml
index 12539d84375..51b2c595112 100644
--- a/samples/validation/pom.xml
+++ b/samples/validation/pom.xml
@@ -15,7 +15,7 @@
+ GWT 2.8 and above requires 1.8 (see gwt-maven-plugin block below) -->
1.7
1.7
@@ -28,7 +28,7 @@
- com.google.gwt
+ org.gwtproject
gwt
${gwt.version}
pom
@@ -40,18 +40,18 @@
- com.google.gwt
+ org.gwtproject
gwt-servlet
runtime
- com.google.gwt
+ org.gwtproject
gwt-user
provided
- com.google.gwt
+ org.gwtproject
gwt-dev
provided
@@ -123,7 +123,7 @@
net.ltgt.gwt.maven
gwt-maven-plugin
- 1.0-rc-8
+ 1.0.1
@@ -135,7 +135,7 @@
com.google.gwt.sample.validation.Validation
Validation
true
-
1.8
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 f1b19e77fe1..b5d58e1c0d3 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 @@
+ GWT compiler 2.8 and above requires 1.8 (see gwt-maven-plugin block below) -->
1.8
1.8
@@ -27,7 +27,7 @@
- com.google.gwt
+ org.gwtproject
gwt
@gwtVersion
pom
@@ -38,24 +38,24 @@
- com.google.gwt
+ org.gwtproject
gwt-servlet
runtime
- com.google.gwt
+ org.gwtproject
gwt-user
provided
- com.google.gwt
+ org.gwtproject
gwt-dev
provided
junit
junit
- 4.11
+ 4.13.2
test
@@ -70,7 +70,7 @@
net.ltgt.gwt.maven
gwt-maven-plugin
- 1.0-rc-8
+ 1.0.1
@@ -83,7 +83,7 @@
@moduleName
@moduleShortName
true
-
1.8