Update maven-wrapper version and documentation.

Author: yveszoundi

README.org

@@ -26,7 +26,7 @@ To use snapshots instead of releases, you'll need to add as well as a =pluginRep
  :       <plugin>
  :         <groupId>com.rimerosolutions.maven.plugins</groupId>
  :         <artifactId>wrapper-maven-plugin</artifactId>
- :         <version>0.0.1</version>
+ :         <version>0.0.2-SNAPSHOT</version>
  :         <configuration>
  : 	    <!-- optional base distribution url --> 
  :          <baseDistributionUrl>https://repository.apache.org/content/repositories/releases/org/apache/maven/apache-maven</baseDistributionUrl>
@@ -40,13 +40,13 @@ To use snapshots instead of releases, you'll need to add as well as a =pluginRep
  : 
  :   <!-- 
  :   ADD A REFERENCE TO THE SONATYPE SNAPSHOTS REPOSITORY if you want to use snapshots
+ :   -->
  :   <pluginRepositories>
  :     <pluginRepository>
  :       <id>sonatype.snapshots</id>
  :       <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
  :     </pluginRepository>
  :   </pluginRepositories>
- :  -->
  : </project>
 
 

maven/maven-wrapper.jar

@@ -1,3 +1,3 @@
 #Maven download properties
-#Sun Jul 07 11:39:35 EDT 2013
-distributionUrl=https\://repository.apache.org/content/repositories/releases/org/apache/maven/apache-maven/3.0.3/apache-maven-3.0.3-bin.zip
+#Sun Jan 19 16:58:20 EST 2014
+distributionUrl=https\://repository.apache.org/content/repositories/releases/org/apache/maven/apache-maven/3.1.1/apache-maven-3.1.1-bin.zip

maven/maven-wrapper.properties

@@ -27,7 +27,6 @@
 #
 # Optional ENV vars
 # -----------------
-#   M2_HOME - location of maven2's installed home dir
 #   MAVEN_OPTS - parameters passed to the Java VM when running Maven
 #     e.g. to debug Maven itself, use
 #       set MAVEN_OPTS=-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
@@ -69,36 +68,8 @@ if [ -z "$JAVA_HOME" ] ; then
   fi
 fi
 
-if [ -z "$M2_HOME" ] ; then
-  ## resolve links - $0 may be a link to maven's home
-  PRG="$0"
-
-  # need this for relative symlinks
-  while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-      PRG="$link"
-    else
-      PRG="`dirname "$PRG"`/$link"
-    fi
-  done
-
-  saveddir=`pwd`
-
-  M2_HOME=`dirname "$PRG"`/..
-
-  # make it fully qualified
-  M2_HOME=`cd "$M2_HOME" && pwd`
-
-  cd "$saveddir"
-  # echo Using m2 at $M2_HOME
-fi
-
 # For Cygwin, ensure paths are in UNIX format before anything is touched
 if $cygwin ; then
-  [ -n "$M2_HOME" ] &&
-    M2_HOME=`cygpath --unix "$M2_HOME"`
   [ -n "$JAVA_HOME" ] &&
     JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
   [ -n "$CLASSPATH" ] &&
@@ -107,8 +78,6 @@ fi
 
 # For Migwn, ensure paths are in UNIX format before anything is touched
 if $mingw ; then
-  [ -n "$M2_HOME" ] &&
-    M2_HOME="`(cd "$M2_HOME"; pwd)`"
   [ -n "$JAVA_HOME" ] &&
     JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
   # TODO classpath?
@@ -155,17 +124,17 @@ fi
 WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
 
 # For Cygwin, switch paths to Windows format before running java
-if $cygwin; then
-  [ -n "$M2_HOME" ] &&
-    M2_HOME=`cygpath --path --windows "$M2_HOME"`
+if $cygwin; then  
   [ -n "$JAVA_HOME" ] &&
     JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
   [ -n "$CLASSPATH" ] &&
     CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
 fi
 
+DIR=`dirname "$0"`
+
 exec "$JAVACMD" \
   $MAVEN_OPTS \
-  -classpath "\
-./maven/maven-wrapper.jar" \
+  -classpath \
+"$DIR/maven/maven-wrapper.jar" \
   ${WRAPPER_LAUNCHER} "$@"

mvnw

@@ -24,7 +24,6 @@
 @REM JAVA_HOME - location of a JDK home dir
 @REM
 @REM Optional ENV vars
-@REM M2_HOME - location of maven2's installed home dir
 @REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
 @REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending
 @REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
@@ -63,7 +62,7 @@ echo.
 goto error
 
 :OkJHome
-if exist "%JAVA_HOME%\bin\java.exe" goto chkMHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory.
@@ -73,39 +72,6 @@ echo location of your Java installation
 echo.
 goto error
 
-:chkMHome
-if not "%M2_HOME%"=="" goto valMHome
-
-if "%OS%"=="Windows_NT" SET "M2_HOME=%~dp0.."
-if "%OS%"=="WINNT" SET "M2_HOME=%~dp0.."
-if not "%M2_HOME%"=="" goto valMHome
-
-echo.
-echo ERROR: M2_HOME not found in your environment.
-echo Please set the M2_HOME variable in your environment to match the
-echo location of the Maven installation
-echo.
-goto error
-
-:valMHome
-
-:stripMHome
-if not "_%M2_HOME:~-1%"=="_\" goto checkMBat
-set "M2_HOME=%M2_HOME:~0,-1%"
-goto stripMHome
-
-:checkMBat
-if exist "%M2_HOME%\bin\mvn.bat" goto init
-
-echo.
-echo ERROR: M2_HOME is set to an invalid directory.
-echo M2_HOME = "%M2_HOME%"
-echo Please set the M2_HOME variable in your environment to match the
-echo location of the Maven installation
-echo.
-goto error
-@REM ==== END VALIDATION ====
-
 :init
 @REM Decide how to startup depending on the version of windows
 
@@ -144,7 +110,7 @@ goto Win9xApp
 SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
 
 @REM -- Regular WinNT shell
-set WRAPPER_JAR="".\maven\maven-wrapper.jar""
+set WRAPPER_JAR=%~dp0maven\maven-wrapper.jar""
 goto runm2
 
 @REM Start MAVEN2

mvnw.bat

@@ -85,7 +85,7 @@ limitations under the License.
       <plugin>
         <groupId>com.rimerosolutions.maven.plugins</groupId>
         <artifactId>wrapper-maven-plugin</artifactId>
-        <version>0.0.1</version>
+        <version>0.0.2-SNAPSHOT</version>
         <configuration>
           <!-- optional wrapper jar output folder -->
           <!--
@@ -100,10 +100,10 @@ limitations under the License.
     </plugins>
   </build>
 
-<!--  <pluginRepositories>
+  <pluginRepositories>
     <pluginRepository>
       <id>sonatype.snapshots</id>
       <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
     </pluginRepository>
-  </pluginRepositories> -->
+  </pluginRepositories>
 </project>