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 2021/10/10 18:48:49 UTC
[maven] 04/05: [MNG-6914] move download script to wrapper/shared
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch MNG-6914_2
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 9f33b07874ce0d553d69536f12fd581888d73c3e
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Sun Oct 10 20:36:17 2021 +0200
[MNG-6914] move download script to wrapper/shared
---
apache-maven/src/assembly/wrapper/script.xml | 4 +--
.../assembly/wrapper/{script => shared}/download | 0
.../wrapper/{script => shared}/download.cmd | 0
apache-maven/src/assembly/wrapper/source.xml | 4 +--
apache-maven/src/assembly/wrapper/source/download | 34 ----------------------
.../src/assembly/wrapper/source/download.cmd | 21 -------------
6 files changed, 4 insertions(+), 59 deletions(-)
diff --git a/apache-maven/src/assembly/wrapper/script.xml b/apache-maven/src/assembly/wrapper/script.xml
index 53c9c78..7cc4929 100644
--- a/apache-maven/src/assembly/wrapper/script.xml
+++ b/apache-maven/src/assembly/wrapper/script.xml
@@ -44,7 +44,7 @@ under the License.
<source>src/assembly/shared/validate.cmd</source>
<source>src/assembly/shared/init.cmd</source>
<source>src/assembly/shared/mvnwlauncher.cmd</source>
- <source>src/assembly/wrapper/script/download.cmd</source>
+ <source>src/assembly/wrapper/shared/download.cmd</source>
<source>src/assembly/shared/run.cmd</source>
</sources>
<destName>mvnw.cmd</destName>
@@ -57,7 +57,7 @@ under the License.
<source>src/assembly/shared/validate</source>
<source>src/assembly/shared/init</source>
<source>src/assembly/shared/mvnwlauncher</source>
- <source>src/assembly/wrapper/script/download</source>
+ <source>src/assembly/wrapper/shared/download</source>
<source>src/assembly/shared/run</source>
</sources>
<destName>mvnw</destName>
diff --git a/apache-maven/src/assembly/wrapper/script/download b/apache-maven/src/assembly/wrapper/shared/download
similarity index 100%
rename from apache-maven/src/assembly/wrapper/script/download
rename to apache-maven/src/assembly/wrapper/shared/download
diff --git a/apache-maven/src/assembly/wrapper/script/download.cmd b/apache-maven/src/assembly/wrapper/shared/download.cmd
similarity index 100%
rename from apache-maven/src/assembly/wrapper/script/download.cmd
rename to apache-maven/src/assembly/wrapper/shared/download.cmd
diff --git a/apache-maven/src/assembly/wrapper/source.xml b/apache-maven/src/assembly/wrapper/source.xml
index 0fb3147..b0355c0 100644
--- a/apache-maven/src/assembly/wrapper/source.xml
+++ b/apache-maven/src/assembly/wrapper/source.xml
@@ -44,7 +44,7 @@ under the License.
<source>src/assembly/shared/validate.cmd</source>
<source>src/assembly/shared/init.cmd</source>
<source>src/assembly/shared/mvnwlauncher.cmd</source>
- <source>src/assembly/wrapper/source/download.cmd</source>
+ <source>src/assembly/wrapper/shared/download.cmd</source>
<source>src/assembly/shared/run.cmd</source>
</sources>
<destName>mvnw.cmd</destName>
@@ -57,7 +57,7 @@ under the License.
<source>src/assembly/shared/validate</source>
<source>src/assembly/shared/init</source>
<source>src/assembly/shared/mvnwlauncher</source>
- <source>src/assembly/wrapper/source/download</source>
+ <source>src/assembly/wrapper/shared/download</source>
<source>src/assembly/shared/run</source>
</sources>
<destName>mvnw</destName>
diff --git a/apache-maven/src/assembly/wrapper/source/download b/apache-maven/src/assembly/wrapper/source/download
deleted file mode 100644
index 30cf5e4..0000000
--- a/apache-maven/src/assembly/wrapper/source/download
+++ /dev/null
@@ -1,34 +0,0 @@
-##########################################################################################
-# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
-# This allows using the maven wrapper in projects that prohibit checking in binary data.
-##########################################################################################
-if [ -r "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" ]; then
- if [ "$MVNW_VERBOSE" = true ]; then
- echo "Found .mvn/wrapper/maven-wrapper.jar"
- fi
-else
- javaClass="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.java"
- # For Cygwin, switch paths to Windows format before running javac
- if $cygwin; then
- javaClass=`cygpath --path --windows "$javaClass"`
- fi
- if [ -e "$javaClass" ]; then
- if [ ! -e "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
- if [ "$MVNW_VERBOSE" = true ]; then
- echo " - Compiling MavenWrapperDownloader.java ..."
- fi
- # Compiling the Java class
- ("$JAVA_HOME/bin/javac" "$javaClass")
- fi
- if [ -e "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
- # Running the downloader
- if [ "$MVNW_VERBOSE" = true ]; then
- echo " - Running MavenWrapperDownloader.java ..."
- fi
- ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
- fi
- fi
-fi
-##########################################################################################
-# End of extension
-##########################################################################################
diff --git a/apache-maven/src/assembly/wrapper/source/download.cmd b/apache-maven/src/assembly/wrapper/source/download.cmd
deleted file mode 100644
index 40d8451..0000000
--- a/apache-maven/src/assembly/wrapper/source/download.cmd
+++ /dev/null
@@ -1,21 +0,0 @@
-@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
-@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
-
-SET javaClass="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\MavenWrapperDownloader.java"
-IF EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\MavenDownloader.class" goto :runDownloader
-
-if "%MVNW_VERBOSE%" == "true" echo - Compiling MavenWrapperDownloader.java ...
-
-@REM Compiling the Java class
-"%JAVA_HOME%\bin\javac" %javaClass%
-
-:runDownloader
-IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\MavenWrapperDownloader.class" goto endWrapper
-
-if "%MVNW_VERBOSE%" == "true" echo - Running MavenWrapperDownloader.class ...
-@REM Running the downloader
-"%JAVA_HOME%\bin\java" -cp "%MAVEN_PROJECTBASEDIR%\.mvn\wrapper" MavenWrapperDownloader "%MAVEN_PROJECTBASEDIR%"
-
-:endWrapper
-@REM End of extension
-