diff --git a/maven-wrapper/.mvn/wrapper/MavenWrapperDownloader.java b/maven-wrapper/.mvn/wrapper/MavenWrapperDownloader.java index bd9f348dec..ea01c28664 100644 --- a/maven-wrapper/.mvn/wrapper/MavenWrapperDownloader.java +++ b/maven-wrapper/.mvn/wrapper/MavenWrapperDownloader.java @@ -20,11 +20,12 @@ import java.util.Properties; public class MavenWrapperDownloader { + private static final String WRAPPER_VERSION = "0.5.0"; /** * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided. */ - private static final String DEFAULT_DOWNLOAD_URL = - "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar"; + private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/" + + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + " .jar"; /** * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to diff --git a/maven-wrapper/.mvn/wrapper/maven-wrapper.properties b/maven-wrapper/.mvn/wrapper/maven-wrapper.properties index af632155e6..701e6cf52f 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.4.2/maven-wrapper-0.4.2.jar +wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.0/maven-wrapper-0.5.0.jar diff --git a/maven-wrapper/CHANGELOG.md b/maven-wrapper/CHANGELOG.md index 96a0f549c8..379f539449 100644 --- a/maven-wrapper/CHANGELOG.md +++ b/maven-wrapper/CHANGELOG.md @@ -3,7 +3,7 @@ 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.0 - Some Time Soon +## Version 0.5.0 - 2019-02-18 - update to Maven 3.6.0 as default - Use TLS 1.2 on Windows diff --git a/maven-wrapper/README.md b/maven-wrapper/README.md index 074aa06e6c..1f075c0671 100644 --- a/maven-wrapper/README.md +++ b/maven-wrapper/README.md @@ -152,7 +152,7 @@ To test Maven wrapper usage: - use on test project with takari-maven-plugin version ``` -mvn -N -X io.takari:maven:0.7.0-SNAPSHOT:wrapper +mvn -N -X io.takari:maven:0.7.1-SNAPSHOT:wrapper ``` For release diff --git a/maven-wrapper/mvnw b/maven-wrapper/mvnw index f4cc0c8b5b..6a2957f93a 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 [ "$MVNW_REPOURL" = true]; then - jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar" + jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.0/maven-wrapper-0.5.0.jar" else - jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar" + jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.0/maven-wrapper-0.5.0.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 13b1a3d1ef..e73ee35e65 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.4.2/maven-wrapper-0.4.2.jar" +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.0/maven-wrapper-0.5.0.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 exist %MVNW_REPOURL% ( - SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar" + SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.0/maven-wrapper-0.5.0.jar" ) echo Couldn't find %WRAPPER_JAR%, downloading it ... echo Downloading from: %DOWNLOAD_URL%