[gwt-contrib] [google-web-toolkit] r9632 committed - Cherry picking r9594, r9630 into releases/2.2, fix gwt-servlet dep in ...

[codesite-noreply]

Revision: 9632
Author: rj...@google.com
Date: Wed Jan 26 13:28:57 2011
Log: Cherry picking r9594, r9630 into releases/2.2, fix gwt-servlet dep in  
samples/expenses/pom.xml

http://code.google.com/p/google-web-toolkit/source/detail?r=9632

Modified:
 /releases/2.2/samples/expenses/pom.xml
 /releases/2.2/tools/scripts/maven_script.sh

=======================================
--- /releases/2.2/samples/expenses/pom.xml      Wed Jan 26 07:25:18 2011
+++ /releases/2.2/samples/expenses/pom.xml      Wed Jan 26 13:28:57 2011
@@ -623,7 +623,12 @@
             <artifactId>gwt-dev</artifactId>
             <version>${gwt.version}</version>
           </dependency>
-        </dependencies>
+          <dependency>
+            <groupId>com.google.gwt</groupId>
+            <artifactId>gwt-servlet</artifactId>
+            <version>${gwt.version}</version>
+          </dependency>
+       </dependencies>
         <configuration>
           <logLevel>INFO</logLevel>
           <style>PRETTY</style>
=======================================
--- /releases/2.2/tools/scripts/maven_script.sh Tue Dec 14 16:34:23 2010
+++ /releases/2.2/tools/scripts/maven_script.sh Wed Jan 26 13:28:57 2011
@@ -14,15 +14,17 @@
 # License for the specific language governing permissions and limitations  
under
 # the License.

-# This script should be run from the trunk dir.
-echo Did you remember to run ant clean dist-dev
-
-MAVEN_REPO=~/.m2/repository
+MAVEN_REPO=${MAVEN_REPO:-"~/.m2/repository"}
+GWT_VERSION=${GWT_VERSION:-"2.2-rc1"}
+GWT_DIR=${GWT_DIR:-"build/lib"}
+
+echo "Pushing GWT jars from ${GWT_DIR} into local maven repo with version  
${GWT_VERSION}."
+echo "Customize by setting GWT_DIR and GWT_VERSION."

 for i in dev user servlet
 do
-   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
+   mvn install:install-file -DgroupId=com.google.gwt -DartifactId=gwt-${i}  
-Dversion=${GWT_VERSION} -Dpackaging=jar -Dfile=${GWT_DIR}/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 -Dpackaging=jar  
-DgeneratePom=true -Dfile=/tmp/empty-fake-soyc-vis.jar
+mvn install:install-file -DgroupId=com.google.gwt  
-DartifactId=gwt-soyc-vis -Dversion=${GWT_VERSION} -Dpackaging=jar  
-DgeneratePom=true -Dfile=/tmp/empty-fake-soyc-vis.jar
 echo "installed the gwt libs in the maven repo"

--
http://groups.google.com/group/Google-Web-Toolkit-Contributors