You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2022/03/27 15:27:09 UTC
[maven-wrapper] branch MWRAPPER-49 created (now ce895a6)
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a change to branch MWRAPPER-49
in repository https://gitbox.apache.org/repos/asf/maven-wrapper.git.
at ce895a6 [MWRAPPER-49] add Wrapper version in mvnw/mvnw.cmd scripts
This branch includes the following new commits:
new ce895a6 [MWRAPPER-49] add Wrapper version in mvnw/mvnw.cmd scripts
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven-wrapper] 01/01: [MWRAPPER-49] add Wrapper version in mvnw/mvnw.cmd scripts
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch MWRAPPER-49
in repository https://gitbox.apache.org/repos/asf/maven-wrapper.git
commit ce895a6fecf39826d7d839bbc605ee46fb9a2470
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Sun Mar 27 17:26:59 2022 +0200
[MWRAPPER-49] add Wrapper version in mvnw/mvnw.cmd scripts
---
maven-wrapper-distribution/pom.xml | 2 +-
.../src/resources/mvn/wrapper/MavenWrapperDownloader.java | 2 +-
maven-wrapper-distribution/src/resources/mvnw | 6 +++---
maven-wrapper-distribution/src/resources/mvnw.cmd | 6 +++---
maven-wrapper-distribution/src/resources/mvnwDebug | 2 +-
maven-wrapper-distribution/src/resources/mvnwDebug.cmd | 2 +-
6 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/maven-wrapper-distribution/pom.xml b/maven-wrapper-distribution/pom.xml
index 5b0d871..289e405 100644
--- a/maven-wrapper-distribution/pom.xml
+++ b/maven-wrapper-distribution/pom.xml
@@ -62,7 +62,7 @@ under the License.
<descriptor>src/assembly/bin.xml</descriptor>
</descriptors>
<delimiters>
- <delimiter>@</delimiter>
+ <delimiter>@@</delimiter>
</delimiters>
</configuration>
</plugin>
diff --git a/maven-wrapper-distribution/src/resources/mvn/wrapper/MavenWrapperDownloader.java b/maven-wrapper-distribution/src/resources/mvn/wrapper/MavenWrapperDownloader.java
index c37b593..e0e3ae0 100644
--- a/maven-wrapper-distribution/src/resources/mvn/wrapper/MavenWrapperDownloader.java
+++ b/maven-wrapper-distribution/src/resources/mvn/wrapper/MavenWrapperDownloader.java
@@ -32,7 +32,7 @@ import java.util.Properties;
public final class MavenWrapperDownloader
{
- private static final String WRAPPER_VERSION = "@project.version@";
+ private static final String WRAPPER_VERSION = "@@project.version@@";
private static final boolean VERBOSE = Boolean.parseBoolean( System.getenv( "MVNW_VERBOSE" ) );
diff --git a/maven-wrapper-distribution/src/resources/mvnw b/maven-wrapper-distribution/src/resources/mvnw
index 9a2d3e1..ee49af4 100755
--- a/maven-wrapper-distribution/src/resources/mvnw
+++ b/maven-wrapper-distribution/src/resources/mvnw
@@ -19,7 +19,7 @@
# ----------------------------------------------------------------------------
# ----------------------------------------------------------------------------
-# Maven Start Up Batch script
+# Apache Maven Wrapper startup batch script, version @@project.version@@
#
# Required ENV vars:
# ------------------
@@ -187,9 +187,9 @@ else
echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
fi
if [ -n "$MVNW_REPOURL" ]; then
- wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/@project.version@/maven-wrapper-@project.version@.jar"
+ wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/@@project.version@@/maven-wrapper-@@project.version@@.jar"
else
- wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/@project.version@/maven-wrapper-@project.version@.jar"
+ wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/@@project.version@@/maven-wrapper-@@project.version@@.jar"
fi
while IFS="=" read key value; do
case "$key" in (wrapperUrl) wrapperUrl="$value"; break ;;
diff --git a/maven-wrapper-distribution/src/resources/mvnw.cmd b/maven-wrapper-distribution/src/resources/mvnw.cmd
index b0e2bac..0d399a4 100644
--- a/maven-wrapper-distribution/src/resources/mvnw.cmd
+++ b/maven-wrapper-distribution/src/resources/mvnw.cmd
@@ -18,7 +18,7 @@
@REM ----------------------------------------------------------------------------
@REM ----------------------------------------------------------------------------
-@REM Maven Start Up Batch script
+@REM Apache Maven Wrapper startup batch script, version @@project.version@@
@REM
@REM Required ENV vars:
@REM JAVA_HOME - location of a JDK home dir
@@ -119,7 +119,7 @@ SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
-set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/@project.version@/maven-wrapper-@project.version@.jar"
+set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/@@project.version@@/maven-wrapper-@@project.version@@.jar"
FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
IF "%%A"=="wrapperUrl" SET WRAPPER_URL=%%B
@@ -133,7 +133,7 @@ if exist %WRAPPER_JAR% (
)
) else (
if not "%MVNW_REPOURL%" == "" (
- SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/@project.version@/maven-wrapper-@project.version@.jar"
+ SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/@@project.version@@/maven-wrapper-@@project.version@@.jar"
)
if "%MVNW_VERBOSE%" == "true" (
echo Couldn't find %WRAPPER_JAR%, downloading it ...
diff --git a/maven-wrapper-distribution/src/resources/mvnwDebug b/maven-wrapper-distribution/src/resources/mvnwDebug
index 3e66a1a..1c6fcb5 100644
--- a/maven-wrapper-distribution/src/resources/mvnwDebug
+++ b/maven-wrapper-distribution/src/resources/mvnwDebug
@@ -18,7 +18,7 @@
# under the License.
# -----------------------------------------------------------------------------
-# Apache Maven Debug Script
+# Apache Maven Wrapper debug script, version @@project.version@@
#
# Environment Variable Prerequisites
#
diff --git a/maven-wrapper-distribution/src/resources/mvnwDebug.cmd b/maven-wrapper-distribution/src/resources/mvnwDebug.cmd
index 52368be..b47e8f6 100644
--- a/maven-wrapper-distribution/src/resources/mvnwDebug.cmd
+++ b/maven-wrapper-distribution/src/resources/mvnwDebug.cmd
@@ -16,7 +16,7 @@
@REM under the License.
@REM -----------------------------------------------------------------------------
-@REM Apache Maven Debug Script
+@REM Apache Maven Wrapper debug script, version @@project.version@@
@REM
@REM Environment Variable Prerequisites
@REM