Skip to content

Commit 8b3e7ad

Browse files
smcvbsmcvb
committed
Update Maven Wrapper by running wrapper goal
Update Maven Wrapper by running wrapper goal. Furthermore, manually increase the version to 3.6.3 #167
1 parent 7ca8c9a commit 8b3e7ad

File tree

4 files changed

+242
-82
lines changed

4 files changed

+242
-82
lines changed

Diff for: ‎.mvn/wrapper/maven-wrapper.jar

12.7 KB
Binary file not shown.

Diff for: ‎.mvn/wrapper/maven-wrapper.properties

+18-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,18 @@
1-
distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.6.2/apache-maven-3.6.2-bin.zip
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
18+
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar

Diff for: ‎mvnw

+148-67
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,14 @@
1919
# ----------------------------------------------------------------------------
2020

2121
# ----------------------------------------------------------------------------
22-
# Maven2 Start Up Batch script
22+
# Apache Maven Wrapper startup batch script, version 3.2.0
2323
#
2424
# Required ENV vars:
2525
# ------------------
2626
# JAVA_HOME - location of a JDK home dir
2727
#
2828
# Optional ENV vars
2929
# -----------------
30-
# M2_HOME - location of maven2's installed home dir
3130
# MAVEN_OPTS - parameters passed to the Java VM when running Maven
3231
# e.g. to debug Maven itself, use
3332
# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
@@ -36,6 +35,10 @@
3635

3736
if [ -z "$MAVEN_SKIP_RC" ] ; then
3837

38+
if [ -f /usr/local/etc/mavenrc ] ; then
39+
. /usr/local/etc/mavenrc
40+
fi
41+
3942
if [ -f /etc/mavenrc ] ; then
4043
. /etc/mavenrc
4144
fi
@@ -50,87 +53,56 @@ fi
5053
cygwin=false;
5154
darwin=false;
5255
mingw=false
53-
case "`uname`" in
56+
case "$(uname)" in
5457
CYGWIN*) cygwin=true ;;
5558
MINGW*) mingw=true;;
5659
Darwin*) darwin=true
5760
# Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
5861
# See https://developer.apple.com/library/mac/qa/qa1170/_index.html
5962
if [ -z "$JAVA_HOME" ]; then
6063
if [ -x "/usr/libexec/java_home" ]; then
61-
export JAVA_HOME="`/usr/libexec/java_home`"
64+
JAVA_HOME="$(/usr/libexec/java_home)"; export JAVA_HOME
6265
else
63-
export JAVA_HOME="/Library/Java/Home"
66+
JAVA_HOME="/Library/Java/Home"; export JAVA_HOME
6467
fi
6568
fi
6669
;;
6770
esac
6871

6972
if [ -z "$JAVA_HOME" ] ; then
7073
if [ -r /etc/gentoo-release ] ; then
71-
JAVA_HOME=`java-config --jre-home`
74+
JAVA_HOME=$(java-config --jre-home)
7275
fi
7376
fi
7477

75-
if [ -z "$M2_HOME" ] ; then
76-
## resolve links - $0 may be a link to maven's home
77-
PRG="$0"
78-
79-
# need this for relative symlinks
80-
while [ -h "$PRG" ] ; do
81-
ls=`ls -ld "$PRG"`
82-
link=`expr "$ls" : '.*-> \(.*\)$'`
83-
if expr "$link" : '/.*' > /dev/null; then
84-
PRG="$link"
85-
else
86-
PRG="`dirname "$PRG"`/$link"
87-
fi
88-
done
89-
90-
saveddir=`pwd`
91-
92-
M2_HOME=`dirname "$PRG"`/..
93-
94-
# make it fully qualified
95-
M2_HOME=`cd "$M2_HOME" && pwd`
96-
97-
cd "$saveddir"
98-
# echo Using m2 at $M2_HOME
99-
fi
100-
10178
# For Cygwin, ensure paths are in UNIX format before anything is touched
10279
if $cygwin ; then
103-
[ -n "$M2_HOME" ] &&
104-
M2_HOME=`cygpath --unix "$M2_HOME"`
10580
[ -n "$JAVA_HOME" ] &&
106-
JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
81+
JAVA_HOME=$(cygpath --unix "$JAVA_HOME")
10782
[ -n "$CLASSPATH" ] &&
108-
CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
83+
CLASSPATH=$(cygpath --path --unix "$CLASSPATH")
10984
fi
11085

11186
# For Mingw, ensure paths are in UNIX format before anything is touched
11287
if $mingw ; then
113-
[ -n "$M2_HOME" ] &&
114-
M2_HOME="`(cd "$M2_HOME"; pwd)`"
115-
[ -n "$JAVA_HOME" ] &&
116-
JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
117-
# TODO classpath?
88+
[ -n "$JAVA_HOME" ] && [ -d "$JAVA_HOME" ] &&
89+
JAVA_HOME="$(cd "$JAVA_HOME" || (echo "cannot cd into $JAVA_HOME."; exit 1); pwd)"
11890
fi
11991

12092
if [ -z "$JAVA_HOME" ]; then
121-
javaExecutable="`which javac`"
122-
if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
93+
javaExecutable="$(which javac)"
94+
if [ -n "$javaExecutable" ] && ! [ "$(expr "\"$javaExecutable\"" : '\([^ ]*\)')" = "no" ]; then
12395
# readlink(1) is not available as standard on Solaris 10.
124-
readLink=`which readlink`
125-
if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
96+
readLink=$(which readlink)
97+
if [ ! "$(expr "$readLink" : '\([^ ]*\)')" = "no" ]; then
12698
if $darwin ; then
127-
javaHome="`dirname \"$javaExecutable\"`"
128-
javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
99+
javaHome="$(dirname "\"$javaExecutable\"")"
100+
javaExecutable="$(cd "\"$javaHome\"" && pwd -P)/javac"
129101
else
130-
javaExecutable="`readlink -f \"$javaExecutable\"`"
102+
javaExecutable="$(readlink -f "\"$javaExecutable\"")"
131103
fi
132-
javaHome="`dirname \"$javaExecutable\"`"
133-
javaHome=`expr "$javaHome" : '\(.*\)/bin'`
104+
javaHome="$(dirname "\"$javaExecutable\"")"
105+
javaHome=$(expr "$javaHome" : '\(.*\)/bin')
134106
JAVA_HOME="$javaHome"
135107
export JAVA_HOME
136108
fi
@@ -146,7 +118,7 @@ if [ -z "$JAVACMD" ] ; then
146118
JAVACMD="$JAVA_HOME/bin/java"
147119
fi
148120
else
149-
JAVACMD="`which java`"
121+
JAVACMD="$(\unset -f command 2>/dev/null; \command -v java)"
150122
fi
151123
fi
152124

@@ -160,12 +132,9 @@ if [ -z "$JAVA_HOME" ] ; then
160132
echo "Warning: JAVA_HOME environment variable is not set."
161133
fi
162134

163-
CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
164-
165135
# traverses directory structure from process work directory to filesystem root
166136
# first directory with .mvn subdirectory is considered project base directory
167137
find_maven_basedir() {
168-
169138
if [ -z "$1" ]
170139
then
171140
echo "Path not specified to find_maven_basedir"
@@ -181,47 +150,159 @@ find_maven_basedir() {
181150
fi
182151
# workaround for JBEAP-8937 (on Solaris 10/Sparc)
183152
if [ -d "${wdir}" ]; then
184-
wdir=`cd "$wdir/.."; pwd`
153+
wdir=$(cd "$wdir/.." || exit 1; pwd)
185154
fi
186155
# end of workaround
187156
done
188-
echo "${basedir}"
157+
printf '%s' "$(cd "$basedir" || exit 1; pwd)"
189158
}
190159

191160
# concatenates all lines of a file
192161
concat_lines() {
193162
if [ -f "$1" ]; then
194-
echo "$(tr -s '\n' ' ' < "$1")"
163+
# Remove \r in case we run on Windows within Git Bash
164+
# and check out the repository with auto CRLF management
165+
# enabled. Otherwise, we may read lines that are delimited with
166+
# \r\n and produce $'-Xarg\r' rather than -Xarg due to word
167+
# splitting rules.
168+
tr -s '\r\n' ' ' < "$1"
169+
fi
170+
}
171+
172+
log() {
173+
if [ "$MVNW_VERBOSE" = true ]; then
174+
printf '%s\n' "$1"
195175
fi
196176
}
197177

198-
BASE_DIR=`find_maven_basedir "$(pwd)"`
178+
BASE_DIR=$(find_maven_basedir "$(dirname "$0")")
199179
if [ -z "$BASE_DIR" ]; then
200180
exit 1;
201181
fi
202182

203-
export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
204-
if [ "$MVNW_VERBOSE" = true ]; then
205-
echo $MAVEN_PROJECTBASEDIR
183+
MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}; export MAVEN_PROJECTBASEDIR
184+
log "$MAVEN_PROJECTBASEDIR"
185+
186+
##########################################################################################
187+
# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
188+
# This allows using the maven wrapper in projects that prohibit checking in binary data.
189+
##########################################################################################
190+
wrapperJarPath="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar"
191+
if [ -r "$wrapperJarPath" ]; then
192+
log "Found $wrapperJarPath"
193+
else
194+
log "Couldn't find $wrapperJarPath, downloading it ..."
195+
196+
if [ -n "$MVNW_REPOURL" ]; then
197+
wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar"
198+
else
199+
wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar"
200+
fi
201+
while IFS="=" read -r key value; do
202+
# Remove '\r' from value to allow usage on windows as IFS does not consider '\r' as a separator ( considers space, tab, new line ('\n'), and custom '=' )
203+
safeValue=$(echo "$value" | tr -d '\r')
204+
case "$key" in (wrapperUrl) wrapperUrl="$safeValue"; break ;;
205+
esac
206+
done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties"
207+
log "Downloading from: $wrapperUrl"
208+
209+
if $cygwin; then
210+
wrapperJarPath=$(cygpath --path --windows "$wrapperJarPath")
211+
fi
212+
213+
if command -v wget > /dev/null; then
214+
log "Found wget ... using wget"
215+
[ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--quiet"
216+
if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
217+
wget $QUIET "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
218+
else
219+
wget $QUIET --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
220+
fi
221+
elif command -v curl > /dev/null; then
222+
log "Found curl ... using curl"
223+
[ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--silent"
224+
if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
225+
curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath"
226+
else
227+
curl $QUIET --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath"
228+
fi
229+
else
230+
log "Falling back to using Java to download"
231+
javaSource="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.java"
232+
javaClass="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.class"
233+
# For Cygwin, switch paths to Windows format before running javac
234+
if $cygwin; then
235+
javaSource=$(cygpath --path --windows "$javaSource")
236+
javaClass=$(cygpath --path --windows "$javaClass")
237+
fi
238+
if [ -e "$javaSource" ]; then
239+
if [ ! -e "$javaClass" ]; then
240+
log " - Compiling MavenWrapperDownloader.java ..."
241+
("$JAVA_HOME/bin/javac" "$javaSource")
242+
fi
243+
if [ -e "$javaClass" ]; then
244+
log " - Running MavenWrapperDownloader.java ..."
245+
("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$wrapperUrl" "$wrapperJarPath") || rm -f "$wrapperJarPath"
246+
fi
247+
fi
248+
fi
206249
fi
250+
##########################################################################################
251+
# End of extension
252+
##########################################################################################
253+
254+
# If specified, validate the SHA-256 sum of the Maven wrapper jar file
255+
wrapperSha256Sum=""
256+
while IFS="=" read -r key value; do
257+
case "$key" in (wrapperSha256Sum) wrapperSha256Sum=$value; break ;;
258+
esac
259+
done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties"
260+
if [ -n "$wrapperSha256Sum" ]; then
261+
wrapperSha256Result=false
262+
if command -v sha256sum > /dev/null; then
263+
if echo "$wrapperSha256Sum $wrapperJarPath" | sha256sum -c > /dev/null 2>&1; then
264+
wrapperSha256Result=true
265+
fi
266+
elif command -v shasum > /dev/null; then
267+
if echo "$wrapperSha256Sum $wrapperJarPath" | shasum -a 256 -c > /dev/null 2>&1; then
268+
wrapperSha256Result=true
269+
fi
270+
else
271+
echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available."
272+
echo "Please install either command, or disable validation by removing 'wrapperSha256Sum' from your maven-wrapper.properties."
273+
exit 1
274+
fi
275+
if [ $wrapperSha256Result = false ]; then
276+
echo "Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised." >&2
277+
echo "Investigate or delete $wrapperJarPath to attempt a clean download." >&2
278+
echo "If you updated your Maven version, you need to update the specified wrapperSha256Sum property." >&2
279+
exit 1
280+
fi
281+
fi
282+
207283
MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
208284

209285
# For Cygwin, switch paths to Windows format before running java
210286
if $cygwin; then
211-
[ -n "$M2_HOME" ] &&
212-
M2_HOME=`cygpath --path --windows "$M2_HOME"`
213287
[ -n "$JAVA_HOME" ] &&
214-
JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
288+
JAVA_HOME=$(cygpath --path --windows "$JAVA_HOME")
215289
[ -n "$CLASSPATH" ] &&
216-
CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
290+
CLASSPATH=$(cygpath --path --windows "$CLASSPATH")
217291
[ -n "$MAVEN_PROJECTBASEDIR" ] &&
218-
MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
292+
MAVEN_PROJECTBASEDIR=$(cygpath --path --windows "$MAVEN_PROJECTBASEDIR")
219293
fi
220294

295+
# Provide a "standardized" way to retrieve the CLI args that will
296+
# work with both Windows and non-Windows executions.
297+
MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $*"
298+
export MAVEN_CMD_LINE_ARGS
299+
221300
WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
222301

302+
# shellcheck disable=SC2086 # safe args
223303
exec "$JAVACMD" \
224304
$MAVEN_OPTS \
305+
$MAVEN_DEBUG_OPTS \
225306
-classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
226-
"-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
307+
"-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
227308
${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"

0 commit comments

Comments
 (0)