From 525b4ccded510c8607b705f1bc137aabcf476b7e Mon Sep 17 00:00:00 2001 From: emeroad Date: Tue, 8 Sep 2020 14:23:04 +0900 Subject: [PATCH] [#noissue] Update mvnw --- .mvn/wrapper/MavenWrapperDownloader.java | 51 +++++++++++++---------- .mvn/wrapper/maven-wrapper.jar | Bin 48336 -> 50710 bytes .mvn/wrapper/maven-wrapper.properties | 3 +- mvnw | 32 ++++++++++++-- mvnw.cmd | 39 +++++++++++++---- 5 files changed, 89 insertions(+), 36 deletions(-) diff --git a/.mvn/wrapper/MavenWrapperDownloader.java b/.mvn/wrapper/MavenWrapperDownloader.java index d475a89ce1d2..c32394f140a7 100644 --- a/.mvn/wrapper/MavenWrapperDownloader.java +++ b/.mvn/wrapper/MavenWrapperDownloader.java @@ -1,22 +1,18 @@ /* -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. -*/ - + * Copyright 2007-present the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ import java.net.*; import java.io.*; import java.nio.channels.*; @@ -24,11 +20,12 @@ Licensed to the Apache Software Foundation (ASF) under one public class MavenWrapperDownloader { + private static final String WRAPPER_VERSION = "0.5.5"; /** * 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.0/maven-wrapper-0.4.0.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 @@ -76,13 +73,13 @@ public static void main(String args[]) { } } } - System.out.println("- Downloading from: : " + url); + System.out.println("- Downloading from: " + url); File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH); if(!outputFile.getParentFile().exists()) { if(!outputFile.getParentFile().mkdirs()) { System.out.println( - "- ERROR creating output direcrory '" + outputFile.getParentFile().getAbsolutePath() + "'"); + "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'"); } } System.out.println("- Downloading to: " + outputFile.getAbsolutePath()); @@ -98,6 +95,16 @@ public static void main(String args[]) { } private static void downloadFileFromURL(String urlString, File destination) throws Exception { + if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) { + String username = System.getenv("MVNW_USERNAME"); + char[] password = System.getenv("MVNW_PASSWORD").toCharArray(); + Authenticator.setDefault(new Authenticator() { + @Override + protected PasswordAuthentication getPasswordAuthentication() { + return new PasswordAuthentication(username, password); + } + }); + } URL website = new URL(urlString); ReadableByteChannel rbc; rbc = Channels.newChannel(website.openStream()); diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar index 08ebbb67f088c53eac9a4e2cb019b93f69a1e49c..0d5e649888a4843c1520054d9672f80c62ebbb48 100644 GIT binary patch delta 13080 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 Sh56%@zpuyc;gF6HW?k=0)4qv_^cPmO8%4 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 b<&wLWA$|}6?E}OIh(b&V2%NINfAjwU{j*B4 diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index 42fa4da21999..15fbe3d284ea 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -1 +1,2 @@ -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.5.3/apache-maven-3.5.3-bin.zip \ No newline at end of file +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar diff --git a/mvnw b/mvnw index 961a82500138..d2f0ea38081d 100755 --- a/mvnw +++ b/mvnw @@ -114,7 +114,6 @@ if $mingw ; then M2_HOME="`(cd "$M2_HOME"; pwd)`" [ -n "$JAVA_HOME" ] && JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" - # TODO classpath? fi if [ -z "$JAVA_HOME" ]; then @@ -212,7 +211,11 @@ else if [ "$MVNW_VERBOSE" = true ]; then echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." fi - jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.0/maven-wrapper-0.4.0.jar" + if [ -n "$MVNW_REPOURL" ]; then + jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar" + else + jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar" + fi while IFS="=" read key value; do case "$key" in (wrapperUrl) jarUrl="$value"; break ;; esac @@ -221,22 +224,38 @@ else echo "Downloading from: $jarUrl" fi wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + if $cygwin; then + wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` + fi if command -v wget > /dev/null; then if [ "$MVNW_VERBOSE" = true ]; then echo "Found wget ... using wget" fi - wget "$jarUrl" -O "$wrapperJarPath" + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget "$jarUrl" -O "$wrapperJarPath" + else + wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" + fi elif command -v curl > /dev/null; then if [ "$MVNW_VERBOSE" = true ]; then echo "Found curl ... using curl" fi - curl -o "$wrapperJarPath" "$jarUrl" + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl -o "$wrapperJarPath" "$jarUrl" -f + else + curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f + fi + else if [ "$MVNW_VERBOSE" = true ]; then echo "Falling back to using Java to download" fi javaClass="$BASE_DIR/.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 "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then if [ "$MVNW_VERBOSE" = true ]; then @@ -277,6 +296,11 @@ if $cygwin; then MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` fi +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" +export MAVEN_CMD_LINE_ARGS + WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain exec "$JAVACMD" \ diff --git a/mvnw.cmd b/mvnw.cmd index 830073a17e4e..b26ab24f039e 100644 --- a/mvnw.cmd +++ b/mvnw.cmd @@ -37,7 +37,7 @@ @echo off @REM set title of command window title %0 -@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on' +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' @if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% @REM set %HOME% to equivalent of $HOME @@ -120,23 +120,44 @@ 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.0/maven-wrapper-0.4.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 +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar" + +FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B ) @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. if exist %WRAPPER_JAR% ( - echo Found %WRAPPER_JAR% + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) ) else ( - echo Couldn't find %WRAPPER_JAR%, downloading it ... - echo Downloading from: %DOWNLOAD_URL% - powershell -Command "(New-Object Net.WebClient).DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')" - echo Finished downloading %WRAPPER_JAR% + if not "%MVNW_REPOURL%" == "" ( + SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) ) @REM End of extension +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + %MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* if ERRORLEVEL 1 goto error goto end