Skip to content

Commit ebf58ee

Browse files
jchrysJohnNiang
jchrys
and
JohnNiang
authored
Upgrade to Maven Wrapper 3.2.0 (#134)
Motivation: Ensure up-to-date with Maven Wrapper Modification: Use Maven Wrapper 3.2.0 Result: Up-to-date Co-authored-by: John Niang <johnniang@fastmail.com>
1 parent 0fc486a commit ebf58ee

File tree

3 files changed

+317
-296
lines changed

3 files changed

+317
-296
lines changed

‎.mvn/wrapper/maven-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@
1515
# specific language governing permissions and limitations
1616
# under the License.
1717
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.3/apache-maven-3.9.3-bin.zip
18-
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar
18+
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar

‎mvnw‎

Lines changed: 111 additions & 113 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,14 @@
1919
# ----------------------------------------------------------------------------
2020

2121
# ----------------------------------------------------------------------------
22-
# Maven 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,86 +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)`"
88+
[ -n "$JAVA_HOME" ] && [ -d "$JAVA_HOME" ] &&
89+
JAVA_HOME="$(cd "$JAVA_HOME" || (echo "cannot cd into $JAVA_HOME."; exit 1); pwd)"
11790
fi
11891

11992
if [ -z "$JAVA_HOME" ]; then
120-
javaExecutable="`which javac`"
121-
if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
93+
javaExecutable="$(which javac)"
94+
if [ -n "$javaExecutable" ] && ! [ "$(expr "\"$javaExecutable\"" : '\([^ ]*\)')" = "no" ]; then
12295
# readlink(1) is not available as standard on Solaris 10.
123-
readLink=`which readlink`
124-
if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
96+
readLink=$(which readlink)
97+
if [ ! "$(expr "$readLink" : '\([^ ]*\)')" = "no" ]; then
12598
if $darwin ; then
126-
javaHome="`dirname \"$javaExecutable\"`"
127-
javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
99+
javaHome="$(dirname "\"$javaExecutable\"")"
100+
javaExecutable="$(cd "\"$javaHome\"" && pwd -P)/javac"
128101
else
129-
javaExecutable="`readlink -f \"$javaExecutable\"`"
102+
javaExecutable="$(readlink -f "\"$javaExecutable\"")"
130103
fi
131-
javaHome="`dirname \"$javaExecutable\"`"
132-
javaHome=`expr "$javaHome" : '\(.*\)/bin'`
104+
javaHome="$(dirname "\"$javaExecutable\"")"
105+
javaHome=$(expr "$javaHome" : '\(.*\)/bin')
133106
JAVA_HOME="$javaHome"
134107
export JAVA_HOME
135108
fi
@@ -145,7 +118,7 @@ if [ -z "$JAVACMD" ] ; then
145118
JAVACMD="$JAVA_HOME/bin/java"
146119
fi
147120
else
148-
JAVACMD="`which java`"
121+
JAVACMD="$(\unset -f command 2>/dev/null; \command -v java)"
149122
fi
150123
fi
151124

@@ -159,12 +132,9 @@ if [ -z "$JAVA_HOME" ] ; then
159132
echo "Warning: JAVA_HOME environment variable is not set."
160133
fi
161134

162-
CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
163-
164135
# traverses directory structure from process work directory to filesystem root
165136
# first directory with .mvn subdirectory is considered project base directory
166137
find_maven_basedir() {
167-
168138
if [ -z "$1" ]
169139
then
170140
echo "Path not specified to find_maven_basedir"
@@ -180,96 +150,99 @@ find_maven_basedir() {
180150
fi
181151
# workaround for JBEAP-8937 (on Solaris 10/Sparc)
182152
if [ -d "${wdir}" ]; then
183-
wdir=`cd "$wdir/.."; pwd`
153+
wdir=$(cd "$wdir/.." || exit 1; pwd)
184154
fi
185155
# end of workaround
186156
done
187-
echo "${basedir}"
157+
printf '%s' "$(cd "$basedir" || exit 1; pwd)"
188158
}
189159

190160
# concatenates all lines of a file
191161
concat_lines() {
192162
if [ -f "$1" ]; then
193-
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"
194175
fi
195176
}
196177

197-
BASE_DIR=`find_maven_basedir "$(pwd)"`
178+
BASE_DIR=$(find_maven_basedir "$(dirname "$0")")
198179
if [ -z "$BASE_DIR" ]; then
199180
exit 1;
200181
fi
201182

183+
MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}; export MAVEN_PROJECTBASEDIR
184+
log "$MAVEN_PROJECTBASEDIR"
185+
202186
##########################################################################################
203187
# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
204188
# This allows using the maven wrapper in projects that prohibit checking in binary data.
205189
##########################################################################################
206-
if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
207-
if [ "$MVNW_VERBOSE" = true ]; then
208-
echo "Found .mvn/wrapper/maven-wrapper.jar"
209-
fi
190+
wrapperJarPath="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar"
191+
if [ -r "$wrapperJarPath" ]; then
192+
log "Found $wrapperJarPath"
210193
else
211-
if [ "$MVNW_VERBOSE" = true ]; then
212-
echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
213-
fi
194+
log "Couldn't find $wrapperJarPath, downloading it ..."
195+
214196
if [ -n "$MVNW_REPOURL" ]; then
215-
jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
197+
wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar"
216198
else
217-
jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
199+
wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar"
218200
fi
219-
while IFS="=" read key value; do
220-
case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
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 ;;
221205
esac
222-
done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
223-
if [ "$MVNW_VERBOSE" = true ]; then
224-
echo "Downloading from: $jarUrl"
225-
fi
226-
wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
206+
done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties"
207+
log "Downloading from: $wrapperUrl"
208+
227209
if $cygwin; then
228-
wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"`
210+
wrapperJarPath=$(cygpath --path --windows "$wrapperJarPath")
229211
fi
230212

231213
if command -v wget > /dev/null; then
232-
if [ "$MVNW_VERBOSE" = true ]; then
233-
echo "Found wget ... using wget"
234-
fi
214+
log "Found wget ... using wget"
215+
[ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--quiet"
235216
if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
236-
wget "$jarUrl" -O "$wrapperJarPath"
217+
wget $QUIET "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
237218
else
238-
wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath"
219+
wget $QUIET --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
239220
fi
240221
elif command -v curl > /dev/null; then
241-
if [ "$MVNW_VERBOSE" = true ]; then
242-
echo "Found curl ... using curl"
243-
fi
222+
log "Found curl ... using curl"
223+
[ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--silent"
244224
if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
245-
curl -o "$wrapperJarPath" "$jarUrl" -f
225+
curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath"
246226
else
247-
curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f
227+
curl $QUIET --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath"
248228
fi
249-
250229
else
251-
if [ "$MVNW_VERBOSE" = true ]; then
252-
echo "Falling back to using Java to download"
253-
fi
254-
javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
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"
255233
# For Cygwin, switch paths to Windows format before running javac
256234
if $cygwin; then
257-
javaClass=`cygpath --path --windows "$javaClass"`
235+
javaSource=$(cygpath --path --windows "$javaSource")
236+
javaClass=$(cygpath --path --windows "$javaClass")
258237
fi
259-
if [ -e "$javaClass" ]; then
260-
if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
261-
if [ "$MVNW_VERBOSE" = true ]; then
262-
echo " - Compiling MavenWrapperDownloader.java ..."
263-
fi
264-
# Compiling the Java class
265-
("$JAVA_HOME/bin/javac" "$javaClass")
238+
if [ -e "$javaSource" ]; then
239+
if [ ! -e "$javaClass" ]; then
240+
log " - Compiling MavenWrapperDownloader.java ..."
241+
("$JAVA_HOME/bin/javac" "$javaSource")
266242
fi
267-
if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
268-
# Running the downloader
269-
if [ "$MVNW_VERBOSE" = true ]; then
270-
echo " - Running MavenWrapperDownloader.java ..."
271-
fi
272-
("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
243+
if [ -e "$javaClass" ]; then
244+
log " - Running MavenWrapperDownloader.java ..."
245+
("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$wrapperUrl" "$wrapperJarPath") || rm -f "$wrapperJarPath"
273246
fi
274247
fi
275248
fi
@@ -278,33 +251,58 @@ fi
278251
# End of extension
279252
##########################################################################################
280253

281-
export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
282-
if [ "$MVNW_VERBOSE" = true ]; then
283-
echo $MAVEN_PROJECTBASEDIR
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
284281
fi
282+
285283
MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
286284

287285
# For Cygwin, switch paths to Windows format before running java
288286
if $cygwin; then
289-
[ -n "$M2_HOME" ] &&
290-
M2_HOME=`cygpath --path --windows "$M2_HOME"`
291287
[ -n "$JAVA_HOME" ] &&
292-
JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
288+
JAVA_HOME=$(cygpath --path --windows "$JAVA_HOME")
293289
[ -n "$CLASSPATH" ] &&
294-
CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
290+
CLASSPATH=$(cygpath --path --windows "$CLASSPATH")
295291
[ -n "$MAVEN_PROJECTBASEDIR" ] &&
296-
MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
292+
MAVEN_PROJECTBASEDIR=$(cygpath --path --windows "$MAVEN_PROJECTBASEDIR")
297293
fi
298294

299295
# Provide a "standardized" way to retrieve the CLI args that will
300296
# work with both Windows and non-Windows executions.
301-
MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
297+
MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $*"
302298
export MAVEN_CMD_LINE_ARGS
303299

304300
WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
305301

302+
# shellcheck disable=SC2086 # safe args
306303
exec "$JAVACMD" \
307304
$MAVEN_OPTS \
305+
$MAVEN_DEBUG_OPTS \
308306
-classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
309-
"-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
307+
"-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
310308
${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"

0 commit comments

Comments
 (0)