You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2020/05/27 19:17:03 UTC
[maven] branch MNG-6919 created (now 6a356af)
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a change to branch MNG-6919
in repository https://gitbox.apache.org/repos/asf/maven.git.
at 6a356af [MNG-6919] drop wrapperUrl from maven-wrapper.properties
This branch includes the following new commits:
new 6a356af [MNG-6919] drop wrapperUrl from maven-wrapper.properties
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] 01/01: [MNG-6919] drop wrapperUrl from
maven-wrapper.properties
Posted by rf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MNG-6919
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 6a356af2962f4a5f499899ea8187586b360e21db
Author: rfscholte <rf...@apache.org>
AuthorDate: Wed May 27 21:16:52 2020 +0200
[MNG-6919] drop wrapperUrl from maven-wrapper.properties
---
apache-maven/maven-wrapper.pom | 2 +-
apache-maven/src/assembly/wrapper/script/download | 4 ----
apache-maven/src/assembly/wrapper/script/download.cmd | 4 ----
.../src/assembly/wrapper/shared/.mvn/wrapper/maven-wrapper.properties | 1 -
apache-maven/src/assembly/wrapper/source/download.cmd | 4 ++--
5 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/apache-maven/maven-wrapper.pom b/apache-maven/maven-wrapper.pom
index 455e3a6..f2bcc7f 100644
--- a/apache-maven/maven-wrapper.pom
+++ b/apache-maven/maven-wrapper.pom
@@ -81,7 +81,7 @@ under the License.
</executions>
<configuration>
<descriptors>
- <descriptor>src/assembly/wrapper//script.xml</descriptor>
+ <descriptor>src/assembly/wrapper/script.xml</descriptor>
<descriptor>src/assembly/wrapper/bin.xml</descriptor>
<descriptor>src/assembly/wrapper/source.xml</descriptor>
</descriptors>
diff --git a/apache-maven/src/assembly/wrapper/script/download b/apache-maven/src/assembly/wrapper/script/download
index 2d08207..e2a011c 100755
--- a/apache-maven/src/assembly/wrapper/script/download
+++ b/apache-maven/src/assembly/wrapper/script/download
@@ -12,10 +12,6 @@ else
fi
jarUrl="https://repo.maven.apache.org/maven2/org/apache/maven/maven-wrapper/${project.version}/maven-wrapper-${project.version}.jar"
- while IFS="=" read key value; do
- case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
- esac
- done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties"
if [ -n "$MVNW_REPOURL" ]; then
jarUrl="$MVNW_REPOURL/org/apache/maven/maven-wrapper/${project.version}/maven-wrapper-${project.version}.jar"
diff --git a/apache-maven/src/assembly/wrapper/script/download.cmd b/apache-maven/src/assembly/wrapper/script/download.cmd
index 998dda5..8d71146 100755
--- a/apache-maven/src/assembly/wrapper/script/download.cmd
+++ b/apache-maven/src/assembly/wrapper/script/download.cmd
@@ -8,10 +8,6 @@ goto endWrapper
:downloadWrapper
set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/org/apache/maven/maven-wrapper/${project.version}/maven-wrapper-${project.version}.jar"
-FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
- IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
-)
-
if not "%MVNW_REPOURL%" == "" (
SET DOWNLOAD_URL="%MVNW_REPOURL%/org/apache/maven/maven-wrapper/${project.version}/maven-wrapper-${project.version}.jar"
)
diff --git a/apache-maven/src/assembly/wrapper/shared/.mvn/wrapper/maven-wrapper.properties b/apache-maven/src/assembly/wrapper/shared/.mvn/wrapper/maven-wrapper.properties
index a2987ea..6e53523 100644
--- a/apache-maven/src/assembly/wrapper/shared/.mvn/wrapper/maven-wrapper.properties
+++ b/apache-maven/src/assembly/wrapper/shared/.mvn/wrapper/maven-wrapper.properties
@@ -15,4 +15,3 @@
# specific language governing permissions and limitations
# under the License.
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/${project.version}/apache-maven-${project.version}-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/maven-wrapper/${project.version}/maven-wrapper-${project.version}.jar
diff --git a/apache-maven/src/assembly/wrapper/source/download.cmd b/apache-maven/src/assembly/wrapper/source/download.cmd
index 28d1349..40d8451 100644
--- a/apache-maven/src/assembly/wrapper/source/download.cmd
+++ b/apache-maven/src/assembly/wrapper/source/download.cmd
@@ -1,7 +1,7 @@
@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
+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 ...
@@ -14,7 +14,7 @@ IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\MavenWrapperDownloader.class"
if "%MVNW_VERBOSE%" == "true" echo - Running MavenWrapperDownloader.class ...
@REM Running the downloader
-"%JAVA_HOME%\bin\java" -cp .mvn\wrapper MavenWrapperDownloader "%MAVEN_PROJECTBASEDIR%"
+"%JAVA_HOME%\bin\java" -cp "%MAVEN_PROJECTBASEDIR%\.mvn\wrapper" MavenWrapperDownloader "%MAVEN_PROJECTBASEDIR%"
:endWrapper
@REM End of extension