Skip to content

Commit 8ac48c5

Browse files
meltsufinartembilan
meltsufin
authored and
artembilan
committed
Update Maven Wrapper to 3.5.4
1 parent 05a3ef4 commit 8ac48c5

File tree

4 files changed

+127
-70
lines changed

4 files changed

+127
-70
lines changed

‎.mvn/wrapper/maven-wrapper.jar

100644100755
-1.14 KB
Binary file not shown.

‎.mvn/wrapper/maven-wrapper.properties

100644100755
+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.3.9/apache-maven-3.3.9-bin.zip
1+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.5.4/apache-maven-3.5.4-bin.zip

‎mvnw

+105-64
Original file line numberDiff line numberDiff line change
@@ -54,38 +54,16 @@ case "`uname`" in
5454
CYGWIN*) cygwin=true ;;
5555
MINGW*) mingw=true;;
5656
Darwin*) darwin=true
57-
#
58-
# Look for the Apple JDKs first to preserve the existing behaviour, and then look
59-
# for the new JDKs provided by Oracle.
60-
#
61-
if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK ] ; then
62-
#
63-
# Apple JDKs
64-
#
65-
export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home
66-
fi
67-
68-
if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Java/JavaVirtualMachines/CurrentJDK ] ; then
69-
#
70-
# Apple JDKs
71-
#
72-
export JAVA_HOME=/System/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
73-
fi
74-
75-
if [ -z "$JAVA_HOME" ] && [ -L "/Library/Java/JavaVirtualMachines/CurrentJDK" ] ; then
76-
#
77-
# Oracle JDKs
78-
#
79-
export JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
80-
fi
81-
82-
if [ -z "$JAVA_HOME" ] && [ -x "/usr/libexec/java_home" ]; then
83-
#
84-
# Apple JDKs
85-
#
86-
export JAVA_HOME=`/usr/libexec/java_home`
87-
fi
88-
;;
57+
# Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
58+
# See https://developer.apple.com/library/mac/qa/qa1170/_index.html
59+
if [ -z "$JAVA_HOME" ]; then
60+
if [ -x "/usr/libexec/java_home" ]; then
61+
export JAVA_HOME="`/usr/libexec/java_home`"
62+
else
63+
export JAVA_HOME="/Library/Java/Home"
64+
fi
65+
fi
66+
;;
8967
esac
9068

9169
if [ -z "$JAVA_HOME" ] ; then
@@ -130,7 +108,7 @@ if $cygwin ; then
130108
CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
131109
fi
132110

133-
# For Migwn, ensure paths are in UNIX format before anything is touched
111+
# For Mingw, ensure paths are in UNIX format before anything is touched
134112
if $mingw ; then
135113
[ -n "$M2_HOME" ] &&
136114
M2_HOME="`(cd "$M2_HOME"; pwd)`"
@@ -184,27 +162,28 @@ fi
184162

185163
CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
186164

187-
# For Cygwin, switch paths to Windows format before running java
188-
if $cygwin; then
189-
[ -n "$M2_HOME" ] &&
190-
M2_HOME=`cygpath --path --windows "$M2_HOME"`
191-
[ -n "$JAVA_HOME" ] &&
192-
JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
193-
[ -n "$CLASSPATH" ] &&
194-
CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
195-
fi
196-
197165
# traverses directory structure from process work directory to filesystem root
198166
# first directory with .mvn subdirectory is considered project base directory
199167
find_maven_basedir() {
200-
local basedir=$(pwd)
201-
local wdir=$(pwd)
168+
169+
if [ -z "$1" ]
170+
then
171+
echo "Path not specified to find_maven_basedir"
172+
return 1
173+
fi
174+
175+
basedir="$1"
176+
wdir="$1"
202177
while [ "$wdir" != '/' ] ; do
203178
if [ -d "$wdir"/.mvn ] ; then
204179
basedir=$wdir
205180
break
206181
fi
207-
wdir=$(cd "$wdir/.."; pwd)
182+
# workaround for JBEAP-8937 (on Solaris 10/Sparc)
183+
if [ -d "${wdir}" ]; then
184+
wdir=`cd "$wdir/.."; pwd`
185+
fi
186+
# end of workaround
208187
done
209188
echo "${basedir}"
210189
}
@@ -216,30 +195,92 @@ concat_lines() {
216195
fi
217196
}
218197

219-
export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-$(find_maven_basedir)}
220-
MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
221-
222-
# Provide a "standardized" way to retrieve the CLI args that will
223-
# work with both Windows and non-Windows executions.
224-
MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
225-
export MAVEN_CMD_LINE_ARGS
198+
BASE_DIR=`find_maven_basedir "$(pwd)"`
199+
if [ -z "$BASE_DIR" ]; then
200+
exit 1;
201+
fi
226202

227-
WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
203+
##########################################################################################
204+
# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
205+
# This allows using the maven wrapper in projects that prohibit checking in binary data.
206+
##########################################################################################
207+
if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
208+
if [ "$MVNW_VERBOSE" = true ]; then
209+
echo "Found .mvn/wrapper/maven-wrapper.jar"
210+
fi
211+
else
212+
if [ "$MVNW_VERBOSE" = true ]; then
213+
echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
214+
fi
215+
jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar"
216+
while IFS="=" read key value; do
217+
case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
218+
esac
219+
done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
220+
if [ "$MVNW_VERBOSE" = true ]; then
221+
echo "Downloading from: $jarUrl"
222+
fi
223+
wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
224+
225+
if command -v wget > /dev/null; then
226+
if [ "$MVNW_VERBOSE" = true ]; then
227+
echo "Found wget ... using wget"
228+
fi
229+
wget "$jarUrl" -O "$wrapperJarPath"
230+
elif command -v curl > /dev/null; then
231+
if [ "$MVNW_VERBOSE" = true ]; then
232+
echo "Found curl ... using curl"
233+
fi
234+
curl -o "$wrapperJarPath" "$jarUrl"
235+
else
236+
if [ "$MVNW_VERBOSE" = true ]; then
237+
echo "Falling back to using Java to download"
238+
fi
239+
javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
240+
if [ -e "$javaClass" ]; then
241+
if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
242+
if [ "$MVNW_VERBOSE" = true ]; then
243+
echo " - Compiling MavenWrapperDownloader.java ..."
244+
fi
245+
# Compiling the Java class
246+
("$JAVA_HOME/bin/javac" "$javaClass")
247+
fi
248+
if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
249+
# Running the downloader
250+
if [ "$MVNW_VERBOSE" = true ]; then
251+
echo " - Running MavenWrapperDownloader.java ..."
252+
fi
253+
("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
254+
fi
255+
fi
256+
fi
257+
fi
258+
##########################################################################################
259+
# End of extension
260+
##########################################################################################
228261

229-
echo "Running version check"
230-
VERSION=$( sed '\!<parent!,\!</parent!d' `dirname $0`/pom.xml | grep '<version' | head -1 | sed -e 's/.*<version>//' -e 's!</version>.*$!!' )
231-
echo "The found version is [${VERSION}]"
262+
export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
263+
if [ "$MVNW_VERBOSE" = true ]; then
264+
echo $MAVEN_PROJECTBASEDIR
265+
fi
266+
MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
232267

233-
if echo $VERSION | egrep -q 'M|RC'; then
234-
echo Activating \"milestone\" profile for version=\"$VERSION\"
235-
echo $MAVEN_ARGS | grep -q milestone || MAVEN_ARGS="$MAVEN_ARGS -Pmilestone"
236-
else
237-
echo Deactivating \"milestone\" profile for version=\"$VERSION\"
238-
echo $MAVEN_ARGS | grep -q milestone && MAVEN_ARGS=$(echo $MAVEN_ARGS | sed -e 's/-Pmilestone//')
268+
# For Cygwin, switch paths to Windows format before running java
269+
if $cygwin; then
270+
[ -n "$M2_HOME" ] &&
271+
M2_HOME=`cygpath --path --windows "$M2_HOME"`
272+
[ -n "$JAVA_HOME" ] &&
273+
JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
274+
[ -n "$CLASSPATH" ] &&
275+
CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
276+
[ -n "$MAVEN_PROJECTBASEDIR" ] &&
277+
MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
239278
fi
240279

280+
WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
281+
241282
exec "$JAVACMD" \
242283
$MAVEN_OPTS \
243284
-classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
244285
"-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
245-
${WRAPPER_LAUNCHER} ${MAVEN_ARGS} "$@"
286+
${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"

‎mvnw.cmd

100644100755
+21-5
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@
3535

3636
@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
3737
@echo off
38+
@REM set title of command window
39+
title %0
3840
@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on'
3941
@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO%
4042

@@ -80,8 +82,6 @@ goto error
8082

8183
:init
8284

83-
set MAVEN_CMD_LINE_ARGS=%*
84-
8585
@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
8686
@REM Fallback to current working directory if not found.
8787

@@ -117,11 +117,27 @@ for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do s
117117
:endReadAdditionalConfig
118118

119119
SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
120-
121-
set WRAPPER_JAR="".\.mvn\wrapper\maven-wrapper.jar""
120+
set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
122121
set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
123122

124-
%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CMD_LINE_ARGS%
123+
set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar"
124+
FOR /F "tokens=1,2 delims==" %%A IN (%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties) DO (
125+
IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
126+
)
127+
128+
@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
129+
@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
130+
if exist %WRAPPER_JAR% (
131+
echo Found %WRAPPER_JAR%
132+
) else (
133+
echo Couldn't find %WRAPPER_JAR%, downloading it ...
134+
echo Downloading from: %DOWNLOAD_URL%
135+
powershell -Command "(New-Object Net.WebClient).DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"
136+
echo Finished downloading %WRAPPER_JAR%
137+
)
138+
@REM End of extension
139+
140+
%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
125141
if ERRORLEVEL 1 goto error
126142
goto end
127143

0 commit comments

Comments
 (0)