From d9c00d433395020d2efe3dfb2eb66d22aed2c021 Mon Sep 17 00:00:00 2001 From: Manfred Moser Date: Mon, 25 Feb 2019 13:24:55 -0800 Subject: [PATCH] resolved --- .../.mvn/wrapper/MavenWrapperDownloader.java | 2 +- maven-wrapper/.mvn/wrapper/maven-wrapper.properties | 2 +- maven-wrapper/CHANGELOG.md | 13 ++++++++++++- maven-wrapper/mvnw | 4 ++-- maven-wrapper/mvnw.cmd | 4 ++-- 5 files changed, 18 insertions(+), 7 deletions(-) diff --git a/maven-wrapper/.mvn/wrapper/MavenWrapperDownloader.java b/maven-wrapper/.mvn/wrapper/MavenWrapperDownloader.java index fc5ad5edde..b20a55a7a9 100644 --- a/maven-wrapper/.mvn/wrapper/MavenWrapperDownloader.java +++ b/maven-wrapper/.mvn/wrapper/MavenWrapperDownloader.java @@ -20,7 +20,7 @@ import java.util.Properties; public class MavenWrapperDownloader { - private static final String WRAPPER_VERSION = "0.5.2"; + private static final String WRAPPER_VERSION = "0.5.3"; /** * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided. */ diff --git a/maven-wrapper/.mvn/wrapper/maven-wrapper.properties b/maven-wrapper/.mvn/wrapper/maven-wrapper.properties index e12abb174a..3ddc5e5900 100644 --- a/maven-wrapper/.mvn/wrapper/maven-wrapper.properties +++ b/maven-wrapper/.mvn/wrapper/maven-wrapper.properties @@ -1,3 +1,3 @@ distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.0/apache-maven-3.6.0-bin.zip -wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.2/maven-wrapper-0.5.2.jar +wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.3/maven-wrapper-0.5.3.jar diff --git a/maven-wrapper/CHANGELOG.md b/maven-wrapper/CHANGELOG.md index 8748cf5052..4f82a88267 100644 --- a/maven-wrapper/CHANGELOG.md +++ b/maven-wrapper/CHANGELOG.md @@ -4,7 +4,18 @@ The [git commit history](https://github.com/takari/maven-wrapper/commits/master) is the detailed source of all changes. The following provides most information at an easier glance. -## Version 0.5.2 - 2019-02-20 + +## Version 0.5.3 - 2019-02-25 + +- MVNW_REPOURL check bug in mvnw + - fixes https://github.com/takari/maven-wrapper/issues/109 + - see https://github.com/takari/maven-wrapper/pull/111 + - contributed by Piotrek Żygieło https://github.com/pzygielo and + Sebastian Peters https://github.com/sepe81, + +Release performed by Manfred Moser - http://www.simpligility.com + +## Version0.5.32 - 2019-02-20 - Re-applied TLS1.2 fix for Windows - see https://github.com/takari/maven-wrapper/pull/108 diff --git a/maven-wrapper/mvnw b/maven-wrapper/mvnw index b17728f736..34d9dae8d0 100755 --- a/maven-wrapper/mvnw +++ b/maven-wrapper/mvnw @@ -212,9 +212,9 @@ else echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." fi if [ -n "$MVNW_REPOURL" ]; then - jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.2/maven-wrapper-0.5.2.jar" + jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.3/maven-wrapper-0.5.3.jar" else - jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.2/maven-wrapper-0.5.2.jar" + jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.3/maven-wrapper-0.5.3.jar" fi while IFS="=" read key value; do case "$key" in (wrapperUrl) jarUrl="$value"; break ;; diff --git a/maven-wrapper/mvnw.cmd b/maven-wrapper/mvnw.cmd index c27534c3b6..3b18119920 100644 --- a/maven-wrapper/mvnw.cmd +++ b/maven-wrapper/mvnw.cmd @@ -120,7 +120,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 DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.2/maven-wrapper-0.5.2.jar" +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.3/maven-wrapper-0.5.3.jar" FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B ) @@ -131,7 +131,7 @@ if exist %WRAPPER_JAR% ( echo Found %WRAPPER_JAR% ) else ( if not "%MVNW_REPOURL%" == "" ( - SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.2/maven-wrapper-0.5.2.jar" + SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.3/maven-wrapper-0.5.3.jar" ) echo Couldn't find %WRAPPER_JAR%, downloading it ... echo Downloading from: %DOWNLOAD_URL%