Cherry pick r9423 to releases/2.1, Update samples/expenses/pom.xml for 2.1.1 git-svn-id: https://google-web-toolkit.googlecode.com/svn/releases/2.1@9426 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/samples/expenses/pom.xml b/samples/expenses/pom.xml index 4d79e59..7752829 100644 --- a/samples/expenses/pom.xml +++ b/samples/expenses/pom.xml
@@ -7,7 +7,7 @@ <version>0.1.0.BUILD-SNAPSHOT</version> <name>expenses</name> <properties> - <gwt.version>2.1.1-rc1</gwt.version> + <gwt.version>2.1.1</gwt.version> <roo.version>1.1.0.RELEASE</roo.version> <spring.version>3.0.3.RELEASE</spring.version> <slf4j.version>1.6.1</slf4j.version> @@ -620,7 +620,7 @@ </dependency> <dependency> <groupId>com.google.gwt</groupId> - <artifactId>gwt-user</artifactId> + <artifactId>gwt-dev</artifactId> <version>${gwt.version}</version> </dependency> </dependencies>
diff --git a/samples/expenses/src/main/resources/log4j.properties b/samples/expenses/src/main/resources/log4j.properties new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/samples/expenses/src/main/resources/log4j.properties
diff --git a/tools/scripts/maven_script.sh b/tools/scripts/maven_script.sh index 1e9ef0e..19f5f5e 100755 --- a/tools/scripts/maven_script.sh +++ b/tools/scripts/maven_script.sh
@@ -14,16 +14,15 @@ # License for the specific language governing permissions and limitations under # the License. - # This script should be run from the trunk dir. -ant clean dist-dev +echo Did you remember to run ant clean dist-dev MAVEN_REPO=~/.m2/repository for i in dev user servlet do - mvn install:install-file -DgroupId=com.google.gwt -DartifactId=gwt-${i} -Dversion=2.1.1-rc1 -Dpackaging=jar -Dfile=build/lib/gwt-${i}.jar -DgeneratePom=true + mvn install:install-file -DgroupId=com.google.gwt -DartifactId=gwt-${i} -Dversion=2.1.1 -Dpackaging=jar -Dfile=build/lib/gwt-${i}.jar -DgeneratePom=true done touch /tmp/empty-fake-soyc-vis.jar -mvn install:install-file -DgroupId=com.google.gwt -DartifactId=gwt-soyc-vis -Dversion=2.1.1-rc1 -Dpackaging=jar -DgeneratePom=true -Dfile=/tmp/empty-fake-soyc-vis.jar +mvn install:install-file -DgroupId=com.google.gwt -DartifactId=gwt-soyc-vis -Dversion=2.1.1 -Dpackaging=jar -DgeneratePom=true -Dfile=/tmp/empty-fake-soyc-vis.jar echo "installed the gwt libs in the maven repo"