From d3cb643f942f92fb2e622fa3e60468f9f04d0398 Mon Sep 17 00:00:00 2001 From: Gilbert Kwan Date: Thu, 6 Nov 2025 11:06:58 -0500 Subject: [PATCH] Dependabot Bump (#419) * Bump org.mongodb:mongodb-driver-sync from 5.6.0 to 5.6.1 in /start Bumps [org.mongodb:mongodb-driver-sync](https://github.com/mongodb/mongo-java-driver) from 5.6.0 to 5.6.1. - [Release notes](https://github.com/mongodb/mongo-java-driver/releases) - [Commits](https://github.com/mongodb/mongo-java-driver/compare/r5.6.0...r5.6.1) --- updated-dependencies: - dependency-name: org.mongodb:mongodb-driver-sync dependency-version: 5.6.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Bump com.ibm.websphere.appserver.api:com.ibm.websphere.appserver.api.ssl Bumps [com.ibm.websphere.appserver.api:com.ibm.websphere.appserver.api.ssl](https://github.com/OpenLiberty/open-liberty) from 1.8.105 to 1.8.106. - [Release notes](https://github.com/OpenLiberty/open-liberty/releases) - [Commits](https://github.com/OpenLiberty/open-liberty/commits) --- updated-dependencies: - dependency-name: com.ibm.websphere.appserver.api:com.ibm.websphere.appserver.api.ssl dependency-version: 1.8.106 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Bump org.apache.maven.plugins:maven-war-plugin in /start Bumps [org.apache.maven.plugins:maven-war-plugin](https://github.com/apache/maven-war-plugin) from 3.4.0 to 3.5.0. - [Release notes](https://github.com/apache/maven-war-plugin/releases) - [Commits](https://github.com/apache/maven-war-plugin/compare/maven-war-plugin-3.4.0...maven-war-plugin-3.5.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-war-plugin dependency-version: 3.5.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * Bump com.ibm.websphere.appserver.api:com.ibm.websphere.appserver.api.passwordUtil Bumps [com.ibm.websphere.appserver.api:com.ibm.websphere.appserver.api.passwordUtil](https://github.com/OpenLiberty/open-liberty) from 1.0.105 to 1.0.106. - [Release notes](https://github.com/OpenLiberty/open-liberty/releases) - [Commits](https://github.com/OpenLiberty/open-liberty/commits) --- updated-dependencies: - dependency-name: com.ibm.websphere.appserver.api:com.ibm.websphere.appserver.api.passwordUtil dependency-version: 1.0.106 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Bump org.apache.maven.plugins:maven-war-plugin in /finish Bumps [org.apache.maven.plugins:maven-war-plugin](https://github.com/apache/maven-war-plugin) from 3.4.0 to 3.5.0. - [Release notes](https://github.com/apache/maven-war-plugin/releases) - [Commits](https://github.com/apache/maven-war-plugin/compare/maven-war-plugin-3.4.0...maven-war-plugin-3.5.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-war-plugin dependency-version: 3.5.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * Bump com.ibm.websphere.appserver.api:com.ibm.websphere.appserver.api.passwordUtil Bumps [com.ibm.websphere.appserver.api:com.ibm.websphere.appserver.api.passwordUtil](https://github.com/OpenLiberty/open-liberty) from 1.0.105 to 1.0.106. - [Release notes](https://github.com/OpenLiberty/open-liberty/releases) - [Commits](https://github.com/OpenLiberty/open-liberty/commits) --- updated-dependencies: - dependency-name: com.ibm.websphere.appserver.api:com.ibm.websphere.appserver.api.passwordUtil dependency-version: 1.0.106 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Bump com.ibm.websphere.appserver.api:com.ibm.websphere.appserver.api.ssl Bumps [com.ibm.websphere.appserver.api:com.ibm.websphere.appserver.api.ssl](https://github.com/OpenLiberty/open-liberty) from 1.8.105 to 1.8.106. - [Release notes](https://github.com/OpenLiberty/open-liberty/releases) - [Commits](https://github.com/OpenLiberty/open-liberty/commits) --- updated-dependencies: - dependency-name: com.ibm.websphere.appserver.api:com.ibm.websphere.appserver.api.ssl dependency-version: 1.8.106 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Bump org.mongodb:mongodb-driver-sync from 5.6.0 to 5.6.1 in /finish Bumps [org.mongodb:mongodb-driver-sync](https://github.com/mongodb/mongo-java-driver) from 5.6.0 to 5.6.1. - [Release notes](https://github.com/mongodb/mongo-java-driver/releases) - [Commits](https://github.com/mongodb/mongo-java-driver/compare/r5.6.0...r5.6.1) --- updated-dependencies: - dependency-name: org.mongodb:mongodb-driver-sync dependency-version: 5.6.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Update mp, mvnw, and dependencies --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- finish/.mvn/wrapper/maven-wrapper.jar | Bin 63028 -> 63093 bytes finish/.mvn/wrapper/maven-wrapper.properties | 6 +- finish/mvnw | 483 +++++++++---------- finish/mvnw.cmd | 345 +++++++------ finish/pom.xml | 10 +- finish/src/main/liberty/config/server.xml | 2 +- start/.mvn/wrapper/maven-wrapper.jar | Bin 63028 -> 63093 bytes start/.mvn/wrapper/maven-wrapper.properties | 6 +- start/mvnw | 483 +++++++++---------- start/mvnw.cmd | 345 +++++++------ start/pom.xml | 10 +- start/src/main/liberty/config/server.xml | 2 +- 12 files changed, 794 insertions(+), 898 deletions(-) diff --git a/finish/.mvn/wrapper/maven-wrapper.jar b/finish/.mvn/wrapper/maven-wrapper.jar index 7967f30dd1d25fe1b79a4a6e50e2aaa0e425c02c..eebc3c18b4e0bce4a2a9e66be24c4a410f17a1fa 100755 GIT binary patch delta 5797 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 delta 5783 zcmaJ_1yoeq_nsLVNf~O8kPs>96a+*XBqXH-B&7tULHOALV!LLiTQYK&sY z*oaQ=ZGu`h`7u%#kpskm0(2qkA+Op`U<^fOt2cvKxYjRoU~b%g(e~W=GU6L3r;f z-LF=am&*$#eP zu}a-Gylippn4vswChPKbVnaPIOCN`nZ28Y?`$BA8KxUIWm%I%W({M)6sP`hiSr>g`9SBVh4 zN_D7mDhUFNZ{HDdFv?Tk*3OA=3cw(cuecD%EkIE80-(V{iE3uF#yk!rfD5;fLLf{R zAP|Am$0!Y!ucVkj`L7&e#IEpf;bAOxQDYp8^+bY#5@W@y#=tNZw?-lfx=x1n_x*B# zZX+0aTyDTYUJT;(5UY7;6RGvOxzu3Phrh`C(rhk{9``6 z$mt;2Oxa>@yYmsw`|^Gb%yw%Hi(ir(8jp7wT6tEy-L&0x_H^Xq`z2^;S)VEj5q}9= z6zV1#W{WTUouutpLmx0YB)y@si7#6(00SLll^CL#{=$%8}jpWb;g%C zEqQk%{So2y1=Xe{ZV4qK7wZ*nK2oC^IW!Q_ad6AGawrN@vL9BSDjXf;cT^j7r5>iS zT!m&$YKFyXub13N|9C0uQwHu|3ijhZ_}6&={#N&E2J|zUCrB@;`FCu|C!}LXVz*bb ziI7B0hTFF}yE`8-4<$dFmv;CP>+3Lzdtw%=G8K(CmmFCT{0hksU+L*;B)xdf^C!84 zeTvCKp~IKB$3$;4vf4bOQGE+Rl@(t8fl`NwZdVBsjefOcB5o&_-C@WMB`l$vg|any zAVxMRDq|e9#DoIL-ZOZ=d`>i)ic(u7m~@p9?=7K;a&DJwsJ2%b7>nkO&YE5Olw~d#6s)-+{4xq(QLN;n4e6Nf!{{vk zn^nI0LqeatM~oc^Ya2b`JVJsr9OqbTRYs8!5Czikj95(@qlI8k+|TNb5uWT;xJA8V z-CnBpZ^Wu?E;~GyUpA?R_r7$l!HpE{4sc3zBVXgd4=ty%ZntzR$8DWv44F=NHCrgA zUeA1$PRx~%az7)Ml2_qDVlYAfn`sXPMN|5~Z;X6m7vlOOw5u$yv{Dcz=#|PdjN?5( zsyw|z9`xEMSY7~rON)=} z;LNmm<3OTa89Add-h$iKuh063*5zuJ9dhG&fIN``o$YgCagv}Uc7GY)>s413KZWU} zQ43tU7V}MgSpZ;YvP=4>+ogq zM)$baoL|W?J*Fh0-Mp+&lN_B|9wR4kyPJ4_MUY5{pM>eV$#O=_^J)FIM~bo?PuBI2 zE!TJ~pM8i(SYvsrUBpH5P-~A=OY7~yyLYqDbyUlzaDN>*wVvv$93S zrMo^4oaQww`s$y4zwDyv4 z!Z5F>X0)SH*M=2*LqcKh9VD&0xG4B~KC--(ZI&zh!@i=Ou!XnM8cuasX3;(C?z3xQ9> zn(8B^s*>?}h*FQBD%UhyrQq>5mrzbPV3cF-FR}!%)X5T*)+3MIS70lUKRcbI^ zbR{4tctVXoh!?waq|{cYL~eH1{>mU? zDq!j8(ql#YyCMdm?ssIzvRwz7y3HrU>z4T>VcrDmgPrkTJ>m~lQyBK|f7AX+OL&j) z;SHh(g}wuUjw`h>uxBqL-`a_aN%@49Tv@Qlz1Z(92sf8^CQA*w?kp)n7B=24iJY8T z{`O)2TO|-WRYGW(*>#WnMf~qR^Tod7H?qzp5;smtTxL7M8e<8oz2iI;nvPp27qNnLT<@y{>wng-PKNZ0WmRw7} z8^Yu>yF=6}tOa|z;zxANRB3tpoI6Op7+#ghy(;;*_4T>o#YL3sl>-srqZl zcfXZxe5$pXT&7y5K+C1tDLwY25^06E_{{k=8Q02KOW--#Hw@;rB_7eg93s91Afu;N z?5PD#CT*{1|88l07<)W8aKKbBqf=vF9%ZF zV6Mb`{@;8R>SSs6xjO*$-2))lZyE8nzmFo}C}n$ix^FUIX56GDyrU?!UMRku>X_4T zL!?W36`5|%<1HALc-(o&l(`akMUi+o?no+1$Lww8IV!wT-|bT0%^F66HJSTG6KW@~ ztB!urd>x~-)Qe_qQQm!h_D!ODx$F}he3Mv{0J2fcK+7^Cs?m}OAJZ&M+KE6h7Tm!F z7h{Dw)03jRma;MmG6)U?q6aphvVdR=3##9j7t?uE`^(~?IYCm{ceSAqh#lD7oN{7;3Flk+xJpAh3MV=fz3=0<@M)_PW~inS)ns4y*-*6R-<&7hBTU?$`NodOBq zXp;n`Q27okNQ%0Q9U@t4jm0wS%`txQCuY6$ri4ItxF8S_&@VxhT=P?GtAdpxj99 zr>w_<=c_BvMHH)M3AgwZN}|X>W>ik04p$<85M@Woyy)f3aJ|!YZbzuxgi~$G4aExi z+^@1rq8`y+9W{|#3c1p$Ek&IECXLGkpQB7HVvz@@no@5$!Z6Okg-6BZ5u!2r`+42R z48~qN1o57*wARlC{1W6hXBeT)I$lUo-;-1izA^k@5$$`E9eAb%M)X#yaoxq!8o5gk zshxAEYFy258w8?Sd-NghlEF~nbb_5aq5MXY_IwA}f<3S5`%ZzBLkP}9 zza!F!rSwB^0`s`(m$tv!{pI0}kd=-q*zVGVp$L9TrjcvMw_7ywKXV4; zl5?~@%;WW9?JV<5BF)e1b9vuZt6-S4#i3Qi9`l)3xs#)}zH&%Ai@TwAb?7Z$&T-;o zeayg@5?@%~zQX|z$7^fH08d5aQi%?yPnWqiiQCp_hhHw0%RP=z1uHOef)PEzdr*bJ& z!qZEq-VT*Rt^diz(n{P$r~Iy&W_8l+9@n^EbT;L6>JXXi4q=<0v3a2+NWKuV#X6lF zH;BDVW0#0$VsD!e|LCA7 zCfbm@V?_02)QaK)r8IgiYh|8>N!r_y=3K6lRT?v6GSr_{xTwY4Cu) zZ@p$Z^cs(gxn}P*K2wyG^k`-=4uLks$`7Uvp+icdnJ@P+aslFoi*<9(ssOa zoq4afWO_fkXae>MDcCI4>~L8+@;PLapoi*8d8Jed>4>~M1sN&r=^x5SBeqb}^@=YcaNj zAItT&b@=DBx8K}P;NxW{CcsgsYcif-BK*-ZL2JEogmZSkUNVK|#?C~+>F+}!+Uigk z9Ousw0FXH&{O1e+n4FOmJN@}m41mNU zCpttUL%{-S@cqn90Dk@n5dz75LM@6WYKl?FWH?-&^rz4fOaweF_BfXTeURVY9?|w~Rdv`mv0FMcSb;*6#>R6ms7Yuy%Vi zR^dzl_Wsyyfz|KW)E|Mkt}j@D@&M^B7IXZ8fK@yOF;1ZDhX7{$42W$7 z0y;tRz_k@D@8${umJtkM+`!5>`RRCc0CCS$7xnQVklk}&mvANlGNEX4>F|HkyTw*C zS_P7!VCK$7Js$}OuHHb`JFG&kD+o;Mdr(>RjPf!duqp)jL?eLdRjhX#s|eW8b8xI6 zAhU)oR*N+RY!g6ZrE8etiS`n;bq5lPz=w%Bb1OsgIP)iVJb zTi6A81maaqAT9vNHRA)l+gN-G#2@vZZh}DSFeSjXgZ)9u?jT@{!&sd0KR-zC+`oDw zz`#Ypf>1f*kM$^e(CiNO_>^%M0lPJh#*B8w&{;#bpTz;}wwnZZgx*{%k9w>y0S Y0nj}fSlKkVQAz{)dkB23nN#xr0ccu%S^xk5 diff --git a/finish/.mvn/wrapper/maven-wrapper.properties b/finish/.mvn/wrapper/maven-wrapper.properties index 308007b..2931e98 100755 --- a/finish/.mvn/wrapper/maven-wrapper.properties +++ b/finish/.mvn/wrapper/maven-wrapper.properties @@ -1,2 +1,4 @@ -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip -wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar +wrapperVersion=3.3.4 +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.4/maven-wrapper-3.3.4.jar + diff --git a/finish/mvnw b/finish/mvnw index 5e9618c..bd8896b 100755 --- a/finish/mvnw +++ b/finish/mvnw @@ -19,314 +19,277 @@ # ---------------------------------------------------------------------------- # ---------------------------------------------------------------------------- -# Apache Maven Wrapper startup batch script, version 3.3.2 -# -# Required ENV vars: -# ------------------ -# JAVA_HOME - location of a JDK home dir +# Apache Maven Wrapper startup batch script, version 3.3.4 # # Optional ENV vars # ----------------- -# MAVEN_OPTS - parameters passed to the Java VM when running Maven -# e.g. to debug Maven itself, use -# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# JAVA_HOME - location of a JDK home dir, required when download maven via java source +# MVNW_REPOURL - repo url base for downloading maven distribution +# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output # ---------------------------------------------------------------------------- -if [ -z "$MAVEN_SKIP_RC" ]; then - - if [ -f /usr/local/etc/mavenrc ]; then - . /usr/local/etc/mavenrc - fi - - if [ -f /etc/mavenrc ]; then - . /etc/mavenrc - fi - - if [ -f "$HOME/.mavenrc" ]; then - . "$HOME/.mavenrc" - fi - -fi +set -euf +[ "${MVNW_VERBOSE-}" != debug ] || set -x -# OS specific support. $var _must_ be set to either true or false. -cygwin=false -darwin=false -mingw=false +# OS specific support. +native_path() { printf %s\\n "$1"; } case "$(uname)" in -CYGWIN*) cygwin=true ;; -MINGW*) mingw=true ;; -Darwin*) - darwin=true - # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home - # See https://developer.apple.com/library/mac/qa/qa1170/_index.html - if [ -z "$JAVA_HOME" ]; then - if [ -x "/usr/libexec/java_home" ]; then - JAVA_HOME="$(/usr/libexec/java_home)" - export JAVA_HOME - else - JAVA_HOME="/Library/Java/Home" - export JAVA_HOME - fi - fi +CYGWIN* | MINGW*) + [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")" + native_path() { cygpath --path --windows "$1"; } ;; esac -if [ -z "$JAVA_HOME" ]; then - if [ -r /etc/gentoo-release ]; then - JAVA_HOME=$(java-config --jre-home) - fi -fi - -# For Cygwin, ensure paths are in UNIX format before anything is touched -if $cygwin; then - [ -n "$JAVA_HOME" ] \ - && JAVA_HOME=$(cygpath --unix "$JAVA_HOME") - [ -n "$CLASSPATH" ] \ - && CLASSPATH=$(cygpath --path --unix "$CLASSPATH") -fi - -# For Mingw, ensure paths are in UNIX format before anything is touched -if $mingw; then - [ -n "$JAVA_HOME" ] && [ -d "$JAVA_HOME" ] \ - && JAVA_HOME="$( - cd "$JAVA_HOME" || ( - echo "cannot cd into $JAVA_HOME." >&2 - exit 1 - ) - pwd - )" -fi - -if [ -z "$JAVA_HOME" ]; then - javaExecutable="$(which javac)" - if [ -n "$javaExecutable" ] && ! [ "$(expr "$javaExecutable" : '\([^ ]*\)')" = "no" ]; then - # readlink(1) is not available as standard on Solaris 10. - readLink=$(which readlink) - if [ ! "$(expr "$readLink" : '\([^ ]*\)')" = "no" ]; then - if $darwin; then - javaHome="$(dirname "$javaExecutable")" - javaExecutable="$(cd "$javaHome" && pwd -P)/javac" - else - javaExecutable="$(readlink -f "$javaExecutable")" - fi - javaHome="$(dirname "$javaExecutable")" - javaHome=$(expr "$javaHome" : '\(.*\)/bin') - JAVA_HOME="$javaHome" - export JAVA_HOME - fi - fi -fi - -if [ -z "$JAVACMD" ]; then - if [ -n "$JAVA_HOME" ]; then +# set JAVACMD and JAVACCMD +set_java_home() { + # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched + if [ -n "${JAVA_HOME-}" ]; then if [ -x "$JAVA_HOME/jre/sh/java" ]; then # IBM's JDK on AIX uses strange locations for the executables JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACCMD="$JAVA_HOME/jre/sh/javac" else JAVACMD="$JAVA_HOME/bin/java" + JAVACCMD="$JAVA_HOME/bin/javac" + + if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then + echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2 + echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2 + return 1 + fi fi else JAVACMD="$( - \unset -f command 2>/dev/null - \command -v java - )" - fi -fi + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v java + )" || : + JAVACCMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v javac + )" || : -if [ ! -x "$JAVACMD" ]; then - echo "Error: JAVA_HOME is not defined correctly." >&2 - echo " We cannot execute $JAVACMD" >&2 - exit 1 -fi - -if [ -z "$JAVA_HOME" ]; then - echo "Warning: JAVA_HOME environment variable is not set." >&2 -fi - -# traverses directory structure from process work directory to filesystem root -# first directory with .mvn subdirectory is considered project base directory -find_maven_basedir() { - if [ -z "$1" ]; then - echo "Path not specified to find_maven_basedir" >&2 - return 1 + if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then + echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2 + return 1 + fi fi +} - basedir="$1" - wdir="$1" - while [ "$wdir" != '/' ]; do - if [ -d "$wdir"/.mvn ]; then - basedir=$wdir - break - fi - # workaround for JBEAP-8937 (on Solaris 10/Sparc) - if [ -d "${wdir}" ]; then - wdir=$( - cd "$wdir/.." || exit 1 - pwd - ) - fi - # end of workaround +# hash string like Java String::hashCode +hash_string() { + str="${1:-}" h=0 + while [ -n "$str" ]; do + char="${str%"${str#?}"}" + h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296)) + str="${str#?}" done - printf '%s' "$( - cd "$basedir" || exit 1 - pwd - )" + printf %x\\n $h } -# concatenates all lines of a file -concat_lines() { - if [ -f "$1" ]; then - # Remove \r in case we run on Windows within Git Bash - # and check out the repository with auto CRLF management - # enabled. Otherwise, we may read lines that are delimited with - # \r\n and produce $'-Xarg\r' rather than -Xarg due to word - # splitting rules. - tr -s '\r\n' ' ' <"$1" - fi +verbose() { :; } +[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; } + +die() { + printf %s\\n "$1" >&2 + exit 1 } -log() { - if [ "$MVNW_VERBOSE" = true ]; then - printf '%s\n' "$1" - fi +trim() { + # MWRAPPER-139: + # Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds. + # Needed for removing poorly interpreted newline sequences when running in more + # exotic environments such as mingw bash on Windows. + printf "%s" "${1}" | tr -d '[:space:]' } -BASE_DIR=$(find_maven_basedir "$(dirname "$0")") -if [ -z "$BASE_DIR" ]; then - exit 1 +scriptDir="$(dirname "$0")" +scriptName="$(basename "$0")" + +# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties +while IFS="=" read -r key value; do + case "${key-}" in + distributionUrl) distributionUrl=$(trim "${value-}") ;; + distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;; + esac +done <"$scriptDir/.mvn/wrapper/maven-wrapper.properties" +[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" + +case "${distributionUrl##*/}" in +maven-mvnd-*bin.*) + MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ + case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in + *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;; + :Darwin*x86_64) distributionPlatform=darwin-amd64 ;; + :Darwin*arm64) distributionPlatform=darwin-aarch64 ;; + :Linux*x86_64*) distributionPlatform=linux-amd64 ;; + *) + echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2 + distributionPlatform=linux-amd64 + ;; + esac + distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip" + ;; +maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;; +*) MVN_CMD="mvn${scriptName#mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; +esac + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}" +distributionUrlName="${distributionUrl##*/}" +distributionUrlNameMain="${distributionUrlName%.*}" +distributionUrlNameMain="${distributionUrlNameMain%-bin}" +MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}" +MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")" + +exec_maven() { + unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || : + exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD" +} + +if [ -d "$MAVEN_HOME" ]; then + verbose "found existing MAVEN_HOME at $MAVEN_HOME" + exec_maven "$@" fi -MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} -export MAVEN_PROJECTBASEDIR -log "$MAVEN_PROJECTBASEDIR" - -########################################################################################## -# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central -# This allows using the maven wrapper in projects that prohibit checking in binary data. -########################################################################################## -wrapperJarPath="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" -if [ -r "$wrapperJarPath" ]; then - log "Found $wrapperJarPath" +case "${distributionUrl-}" in +*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;; +*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;; +esac + +# prepare tmp dir +if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then + clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; } + trap clean HUP INT TERM EXIT else - log "Couldn't find $wrapperJarPath, downloading it ..." + die "cannot create temp dir" +fi - if [ -n "$MVNW_REPOURL" ]; then - wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar" - else - wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar" - fi - while IFS="=" read -r key value; do - # 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 '=' ) - safeValue=$(echo "$value" | tr -d '\r') - case "$key" in wrapperUrl) - wrapperUrl="$safeValue" - break - ;; - esac - done <"$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" - log "Downloading from: $wrapperUrl" - - if $cygwin; then - wrapperJarPath=$(cygpath --path --windows "$wrapperJarPath") - fi +mkdir -p -- "${MAVEN_HOME%/*}" - if command -v wget >/dev/null; then - log "Found wget ... using wget" - [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--quiet" - if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then - wget $QUIET "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" - else - wget $QUIET --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" - fi - elif command -v curl >/dev/null; then - log "Found curl ... using curl" - [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--silent" - if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then - curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" - else - curl $QUIET --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" - fi - else - log "Falling back to using Java to download" - javaSource="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.java" - javaClass="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.class" - # For Cygwin, switch paths to Windows format before running javac - if $cygwin; then - javaSource=$(cygpath --path --windows "$javaSource") - javaClass=$(cygpath --path --windows "$javaClass") - fi - if [ -e "$javaSource" ]; then - if [ ! -e "$javaClass" ]; then - log " - Compiling MavenWrapperDownloader.java ..." - ("$JAVA_HOME/bin/javac" "$javaSource") - fi - if [ -e "$javaClass" ]; then - log " - Running MavenWrapperDownloader.java ..." - ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$wrapperUrl" "$wrapperJarPath") || rm -f "$wrapperJarPath" - fi - fi - fi +# Download and Install Apache Maven +verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +verbose "Downloading from: $distributionUrl" +verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +# select .zip or .tar.gz +if ! command -v unzip >/dev/null; then + distributionUrl="${distributionUrl%.zip}.tar.gz" + distributionUrlName="${distributionUrl##*/}" fi -########################################################################################## -# End of extension -########################################################################################## -# If specified, validate the SHA-256 sum of the Maven wrapper jar file -wrapperSha256Sum="" -while IFS="=" read -r key value; do - case "$key" in wrapperSha256Sum) - wrapperSha256Sum=$value - break - ;; - esac -done <"$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" -if [ -n "$wrapperSha256Sum" ]; then - wrapperSha256Result=false - if command -v sha256sum >/dev/null; then - if echo "$wrapperSha256Sum $wrapperJarPath" | sha256sum -c >/dev/null 2>&1; then - wrapperSha256Result=true +# verbose opt +__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR='' +[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v + +# normalize http auth +case "${MVNW_PASSWORD:+has-password}" in +'') MVNW_USERNAME='' MVNW_PASSWORD='' ;; +has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;; +esac + +if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then + verbose "Found wget ... using wget" + wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl" +elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then + verbose "Found curl ... using curl" + curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl" +elif set_java_home; then + verbose "Falling back to use Java to download" + javaSource="$TMP_DOWNLOAD_DIR/Downloader.java" + targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName" + cat >"$javaSource" <<-END + public class Downloader extends java.net.Authenticator + { + protected java.net.PasswordAuthentication getPasswordAuthentication() + { + return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() ); + } + public static void main( String[] args ) throws Exception + { + setDefault( new Downloader() ); + java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() ); + } + } + END + # For Cygwin/MinGW, switch paths to Windows format before running javac and java + verbose " - Compiling Downloader.java ..." + "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java" + verbose " - Running Downloader.java ..." + "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")" +fi + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +if [ -n "${distributionSha256Sum-}" ]; then + distributionSha256Result=false + if [ "$MVN_CMD" = mvnd.sh ]; then + echo "Checksum validation is not supported for maven-mvnd." >&2 + echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + elif command -v sha256sum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c - >/dev/null 2>&1; then + distributionSha256Result=true fi elif command -v shasum >/dev/null; then - if echo "$wrapperSha256Sum $wrapperJarPath" | shasum -a 256 -c >/dev/null 2>&1; then - wrapperSha256Result=true + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then + distributionSha256Result=true fi else echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2 - echo "Please install either command, or disable validation by removing 'wrapperSha256Sum' from your maven-wrapper.properties." >&2 + echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 exit 1 fi - if [ $wrapperSha256Result = false ]; then - echo "Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised." >&2 - echo "Investigate or delete $wrapperJarPath to attempt a clean download." >&2 - echo "If you updated your Maven version, you need to update the specified wrapperSha256Sum property." >&2 + if [ $distributionSha256Result = false ]; then + echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2 + echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2 exit 1 fi fi -MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" +# unzip and move +if command -v unzip >/dev/null; then + unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip" +else + tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar" +fi + +# Find the actual extracted directory name (handles snapshots where filename != directory name) +actualDistributionDir="" -# For Cygwin, switch paths to Windows format before running java -if $cygwin; then - [ -n "$JAVA_HOME" ] \ - && JAVA_HOME=$(cygpath --path --windows "$JAVA_HOME") - [ -n "$CLASSPATH" ] \ - && CLASSPATH=$(cygpath --path --windows "$CLASSPATH") - [ -n "$MAVEN_PROJECTBASEDIR" ] \ - && MAVEN_PROJECTBASEDIR=$(cygpath --path --windows "$MAVEN_PROJECTBASEDIR") +# First try the expected directory name (for regular distributions) +if [ -d "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" ]; then + if [ -f "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/bin/$MVN_CMD" ]; then + actualDistributionDir="$distributionUrlNameMain" + fi 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 +# If not found, search for any directory with the Maven executable (for snapshots) +if [ -z "$actualDistributionDir" ]; then + # enable globbing to iterate over items + set +f + for dir in "$TMP_DOWNLOAD_DIR"/*; do + if [ -d "$dir" ]; then + if [ -f "$dir/bin/$MVN_CMD" ]; then + actualDistributionDir="$(basename "$dir")" + break + fi + fi + done + set -f +fi + +if [ -z "$actualDistributionDir" ]; then + verbose "Contents of $TMP_DOWNLOAD_DIR:" + verbose "$(ls -la "$TMP_DOWNLOAD_DIR")" + die "Could not find Maven distribution directory in extracted archive" +fi -WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain +verbose "Found extracted Maven distribution directory: $actualDistributionDir" +printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$actualDistributionDir/mvnw.url" +mv -- "$TMP_DOWNLOAD_DIR/$actualDistributionDir" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" -# shellcheck disable=SC2086 # safe args -exec "$JAVACMD" \ - $MAVEN_OPTS \ - $MAVEN_DEBUG_OPTS \ - -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ - "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ - ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" +clean || : +exec_maven "$@" diff --git a/finish/mvnw.cmd b/finish/mvnw.cmd index 1204076..5761d94 100755 --- a/finish/mvnw.cmd +++ b/finish/mvnw.cmd @@ -1,3 +1,4 @@ +<# : batch portion @REM ---------------------------------------------------------------------------- @REM Licensed to the Apache Software Foundation (ASF) under one @REM or more contributor license agreements. See the NOTICE file @@ -18,189 +19,171 @@ @REM ---------------------------------------------------------------------------- @REM ---------------------------------------------------------------------------- -@REM Apache Maven Wrapper startup batch script, version 3.3.2 -@REM -@REM Required ENV vars: -@REM JAVA_HOME - location of a JDK home dir +@REM Apache Maven Wrapper startup batch script, version 3.3.4 @REM @REM Optional ENV vars -@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands -@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending -@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven -@REM e.g. to debug Maven itself, use -@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM MVNW_REPOURL - repo url base for downloading maven distribution +@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output @REM ---------------------------------------------------------------------------- -@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' -@echo off -@REM set title of command window -title %0 -@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 -if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") - -@REM Execute a user defined script before this one -if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre -@REM check for pre script, once with legacy .bat ending and once with .cmd ending -if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* -if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %* -:skipRcPre - -@setlocal - -set ERROR_CODE=0 - -@REM To isolate internal variables from possible post scripts, we use another setlocal -@setlocal - -@REM ==== START VALIDATION ==== -if not "%JAVA_HOME%" == "" goto OkJHome - -echo. >&2 -echo Error: JAVA_HOME not found in your environment. >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. >&2 -goto error - -:OkJHome -if exist "%JAVA_HOME%\bin\java.exe" goto init - -echo. >&2 -echo Error: JAVA_HOME is set to an invalid directory. >&2 -echo JAVA_HOME = "%JAVA_HOME%" >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. >&2 -goto error - -@REM ==== END VALIDATION ==== - -:init - -@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". -@REM Fallback to current working directory if not found. - -set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% -IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir - -set EXEC_DIR=%CD% -set WDIR=%EXEC_DIR% -:findBaseDir -IF EXIST "%WDIR%"\.mvn goto baseDirFound -cd .. -IF "%WDIR%"=="%CD%" goto baseDirNotFound -set WDIR=%CD% -goto findBaseDir - -:baseDirFound -set MAVEN_PROJECTBASEDIR=%WDIR% -cd "%EXEC_DIR%" -goto endDetectBaseDir - -:baseDirNotFound -set MAVEN_PROJECTBASEDIR=%EXEC_DIR% -cd "%EXEC_DIR%" - -:endDetectBaseDir - -IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig - -@setlocal EnableExtensions EnableDelayedExpansion -for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a -@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% - -:endReadAdditionalConfig - -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 WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar" - -FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( - IF "%%A"=="wrapperUrl" SET WRAPPER_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% ( - if "%MVNW_VERBOSE%" == "true" ( - echo Found %WRAPPER_JAR% - ) -) else ( - if not "%MVNW_REPOURL%" == "" ( - SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar" - ) - if "%MVNW_VERBOSE%" == "true" ( - echo Couldn't find %WRAPPER_JAR%, downloading it ... - echo Downloading from: %WRAPPER_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('%WRAPPER_URL%', '%WRAPPER_JAR%')"^ - "}" - if "%MVNW_VERBOSE%" == "true" ( - echo Finished downloading %WRAPPER_JAR% - ) -) -@REM End of extension - -@REM If specified, validate the SHA-256 sum of the Maven wrapper jar file -SET WRAPPER_SHA_256_SUM="" -FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( - IF "%%A"=="wrapperSha256Sum" SET WRAPPER_SHA_256_SUM=%%B +@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0) +@SET __MVNW_CMD__= +@SET __MVNW_ERROR__= +@SET __MVNW_PSMODULEP_SAVE=%PSModulePath% +@SET PSModulePath= +@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @( + IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B) ) -IF NOT %WRAPPER_SHA_256_SUM%=="" ( - powershell -Command "&{"^ - "Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash;"^ - "$hash = (Get-FileHash \"%WRAPPER_JAR%\" -Algorithm SHA256).Hash.ToLower();"^ - "If('%WRAPPER_SHA_256_SUM%' -ne $hash){"^ - " Write-Error 'Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised.';"^ - " Write-Error 'Investigate or delete %WRAPPER_JAR% to attempt a clean download.';"^ - " Write-Error 'If you updated your Maven version, you need to update the specified wrapperSha256Sum property.';"^ - " exit 1;"^ - "}"^ - "}" - if ERRORLEVEL 1 goto error -) - -@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 - -:error -set ERROR_CODE=1 - -:end -@endlocal & set ERROR_CODE=%ERROR_CODE% - -if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost -@REM check for post script, once with legacy .bat ending and once with .cmd ending -if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" -if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd" -:skipRcPost - -@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' -if "%MAVEN_BATCH_PAUSE%"=="on" pause - -if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE% - -cmd /C exit /B %ERROR_CODE% +@SET PSModulePath=%__MVNW_PSMODULEP_SAVE% +@SET __MVNW_PSMODULEP_SAVE= +@SET __MVNW_ARG0_NAME__= +@SET MVNW_USERNAME= +@SET MVNW_PASSWORD= +@IF NOT "%__MVNW_CMD__%"=="" ("%__MVNW_CMD__%" %*) +@echo Cannot start maven from wrapper >&2 && exit /b 1 +@GOTO :EOF +: end batch / begin powershell #> + +$ErrorActionPreference = "Stop" +if ($env:MVNW_VERBOSE -eq "true") { + $VerbosePreference = "Continue" +} + +# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties +$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl +if (!$distributionUrl) { + Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" +} + +switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) { + "maven-mvnd-*" { + $USE_MVND = $true + $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip" + $MVN_CMD = "mvnd.cmd" + break + } + default { + $USE_MVND = $false + $MVN_CMD = $script -replace '^mvnw','mvn' + break + } +} + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +if ($env:MVNW_REPOURL) { + $MVNW_REPO_PATTERN = if ($USE_MVND -eq $False) { "/org/apache/maven/" } else { "/maven/mvnd/" } + $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace "^.*$MVNW_REPO_PATTERN",'')" +} +$distributionUrlName = $distributionUrl -replace '^.*/','' +$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$','' + +$MAVEN_M2_PATH = "$HOME/.m2" +if ($env:MAVEN_USER_HOME) { + $MAVEN_M2_PATH = "$env:MAVEN_USER_HOME" +} + +if (-not (Test-Path -Path $MAVEN_M2_PATH)) { + New-Item -Path $MAVEN_M2_PATH -ItemType Directory | Out-Null +} + +$MAVEN_WRAPPER_DISTS = $null +if ((Get-Item $MAVEN_M2_PATH).Target[0] -eq $null) { + $MAVEN_WRAPPER_DISTS = "$MAVEN_M2_PATH/wrapper/dists" +} else { + $MAVEN_WRAPPER_DISTS = (Get-Item $MAVEN_M2_PATH).Target[0] + "/wrapper/dists" +} + +$MAVEN_HOME_PARENT = "$MAVEN_WRAPPER_DISTS/$distributionUrlNameMain" +$MAVEN_HOME_NAME = ([System.Security.Cryptography.SHA256]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join '' +$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME" + +if (Test-Path -Path "$MAVEN_HOME" -PathType Container) { + Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME" + Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" + exit $? +} + +if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) { + Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl" +} + +# prepare tmp dir +$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile +$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir" +$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null +trap { + if ($TMP_DOWNLOAD_DIR.Exists) { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } + } +} + +New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null + +# Download and Install Apache Maven +Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +Write-Verbose "Downloading from: $distributionUrl" +Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +$webclient = New-Object System.Net.WebClient +if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) { + $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD) +} +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 +$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum +if ($distributionSha256Sum) { + if ($USE_MVND) { + Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." + } + Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash + if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) { + Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property." + } +} + +# unzip and move +Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null + +# Find the actual extracted directory name (handles snapshots where filename != directory name) +$actualDistributionDir = "" + +# First try the expected directory name (for regular distributions) +$expectedPath = Join-Path "$TMP_DOWNLOAD_DIR" "$distributionUrlNameMain" +$expectedMvnPath = Join-Path "$expectedPath" "bin/$MVN_CMD" +if ((Test-Path -Path $expectedPath -PathType Container) -and (Test-Path -Path $expectedMvnPath -PathType Leaf)) { + $actualDistributionDir = $distributionUrlNameMain +} + +# If not found, search for any directory with the Maven executable (for snapshots) +if (!$actualDistributionDir) { + Get-ChildItem -Path "$TMP_DOWNLOAD_DIR" -Directory | ForEach-Object { + $testPath = Join-Path $_.FullName "bin/$MVN_CMD" + if (Test-Path -Path $testPath -PathType Leaf) { + $actualDistributionDir = $_.Name + } + } +} + +if (!$actualDistributionDir) { + Write-Error "Could not find Maven distribution directory in extracted archive" +} + +Write-Verbose "Found extracted Maven distribution directory: $actualDistributionDir" +Rename-Item -Path "$TMP_DOWNLOAD_DIR/$actualDistributionDir" -NewName $MAVEN_HOME_NAME | Out-Null +try { + Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null +} catch { + if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) { + Write-Error "fail to move MAVEN_HOME" + } +} finally { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } +} + +Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" diff --git a/finish/pom.xml b/finish/pom.xml index 2830c12..7b2627f 100644 --- a/finish/pom.xml +++ b/finish/pom.xml @@ -37,7 +37,7 @@ org.eclipse.microprofile microprofile - 7.0 + 7.1 pom provided @@ -45,7 +45,7 @@ com.ibm.websphere.appserver.api com.ibm.websphere.appserver.api.passwordUtil - 1.0.105 + 1.0.106 provided @@ -53,7 +53,7 @@ com.ibm.websphere.appserver.api com.ibm.websphere.appserver.api.ssl - 1.8.105 + 1.8.106 provided @@ -62,7 +62,7 @@ org.mongodb mongodb-driver-sync - 5.6.0 + 5.6.1 @@ -99,7 +99,7 @@ org.apache.maven.plugins maven-war-plugin - 3.4.0 + 3.5.0 diff --git a/finish/src/main/liberty/config/server.xml b/finish/src/main/liberty/config/server.xml index a599b43..79ccc8b 100755 --- a/finish/src/main/liberty/config/server.xml +++ b/finish/src/main/liberty/config/server.xml @@ -2,7 +2,7 @@ jakartaee-10.0 - microprofile-7.0 + microprofile-7.1 beanValidation cdi diff --git a/start/.mvn/wrapper/maven-wrapper.jar b/start/.mvn/wrapper/maven-wrapper.jar index 7967f30dd1d25fe1b79a4a6e50e2aaa0e425c02c..eebc3c18b4e0bce4a2a9e66be24c4a410f17a1fa 100755 GIT binary patch delta 5797 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 delta 5783 zcmaJ_1yoeq_nsLVNf~O8kPs>96a+*XBqXH-B&7tULHOALV!LLiTQYK&sY z*oaQ=ZGu`h`7u%#kpskm0(2qkA+Op`U<^fOt2cvKxYjRoU~b%g(e~W=GU6L3r;f z-LF=am&*$#eP zu}a-Gylippn4vswChPKbVnaPIOCN`nZ28Y?`$BA8KxUIWm%I%W({M)6sP`hiSr>g`9SBVh4 zN_D7mDhUFNZ{HDdFv?Tk*3OA=3cw(cuecD%EkIE80-(V{iE3uF#yk!rfD5;fLLf{R zAP|Am$0!Y!ucVkj`L7&e#IEpf;bAOxQDYp8^+bY#5@W@y#=tNZw?-lfx=x1n_x*B# zZX+0aTyDTYUJT;(5UY7;6RGvOxzu3Phrh`C(rhk{9``6 z$mt;2Oxa>@yYmsw`|^Gb%yw%Hi(ir(8jp7wT6tEy-L&0x_H^Xq`z2^;S)VEj5q}9= z6zV1#W{WTUouutpLmx0YB)y@si7#6(00SLll^CL#{=$%8}jpWb;g%C zEqQk%{So2y1=Xe{ZV4qK7wZ*nK2oC^IW!Q_ad6AGawrN@vL9BSDjXf;cT^j7r5>iS zT!m&$YKFyXub13N|9C0uQwHu|3ijhZ_}6&={#N&E2J|zUCrB@;`FCu|C!}LXVz*bb ziI7B0hTFF}yE`8-4<$dFmv;CP>+3Lzdtw%=G8K(CmmFCT{0hksU+L*;B)xdf^C!84 zeTvCKp~IKB$3$;4vf4bOQGE+Rl@(t8fl`NwZdVBsjefOcB5o&_-C@WMB`l$vg|any zAVxMRDq|e9#DoIL-ZOZ=d`>i)ic(u7m~@p9?=7K;a&DJwsJ2%b7>nkO&YE5Olw~d#6s)-+{4xq(QLN;n4e6Nf!{{vk zn^nI0LqeatM~oc^Ya2b`JVJsr9OqbTRYs8!5Czikj95(@qlI8k+|TNb5uWT;xJA8V z-CnBpZ^Wu?E;~GyUpA?R_r7$l!HpE{4sc3zBVXgd4=ty%ZntzR$8DWv44F=NHCrgA zUeA1$PRx~%az7)Ml2_qDVlYAfn`sXPMN|5~Z;X6m7vlOOw5u$yv{Dcz=#|PdjN?5( zsyw|z9`xEMSY7~rON)=} z;LNmm<3OTa89Add-h$iKuh063*5zuJ9dhG&fIN``o$YgCagv}Uc7GY)>s413KZWU} zQ43tU7V}MgSpZ;YvP=4>+ogq zM)$baoL|W?J*Fh0-Mp+&lN_B|9wR4kyPJ4_MUY5{pM>eV$#O=_^J)FIM~bo?PuBI2 zE!TJ~pM8i(SYvsrUBpH5P-~A=OY7~yyLYqDbyUlzaDN>*wVvv$93S zrMo^4oaQww`s$y4zwDyv4 z!Z5F>X0)SH*M=2*LqcKh9VD&0xG4B~KC--(ZI&zh!@i=Ou!XnM8cuasX3;(C?z3xQ9> zn(8B^s*>?}h*FQBD%UhyrQq>5mrzbPV3cF-FR}!%)X5T*)+3MIS70lUKRcbI^ zbR{4tctVXoh!?waq|{cYL~eH1{>mU? zDq!j8(ql#YyCMdm?ssIzvRwz7y3HrU>z4T>VcrDmgPrkTJ>m~lQyBK|f7AX+OL&j) z;SHh(g}wuUjw`h>uxBqL-`a_aN%@49Tv@Qlz1Z(92sf8^CQA*w?kp)n7B=24iJY8T z{`O)2TO|-WRYGW(*>#WnMf~qR^Tod7H?qzp5;smtTxL7M8e<8oz2iI;nvPp27qNnLT<@y{>wng-PKNZ0WmRw7} z8^Yu>yF=6}tOa|z;zxANRB3tpoI6Op7+#ghy(;;*_4T>o#YL3sl>-srqZl zcfXZxe5$pXT&7y5K+C1tDLwY25^06E_{{k=8Q02KOW--#Hw@;rB_7eg93s91Afu;N z?5PD#CT*{1|88l07<)W8aKKbBqf=vF9%ZF zV6Mb`{@;8R>SSs6xjO*$-2))lZyE8nzmFo}C}n$ix^FUIX56GDyrU?!UMRku>X_4T zL!?W36`5|%<1HALc-(o&l(`akMUi+o?no+1$Lww8IV!wT-|bT0%^F66HJSTG6KW@~ ztB!urd>x~-)Qe_qQQm!h_D!ODx$F}he3Mv{0J2fcK+7^Cs?m}OAJZ&M+KE6h7Tm!F z7h{Dw)03jRma;MmG6)U?q6aphvVdR=3##9j7t?uE`^(~?IYCm{ceSAqh#lD7oN{7;3Flk+xJpAh3MV=fz3=0<@M)_PW~inS)ns4y*-*6R-<&7hBTU?$`NodOBq zXp;n`Q27okNQ%0Q9U@t4jm0wS%`txQCuY6$ri4ItxF8S_&@VxhT=P?GtAdpxj99 zr>w_<=c_BvMHH)M3AgwZN}|X>W>ik04p$<85M@Woyy)f3aJ|!YZbzuxgi~$G4aExi z+^@1rq8`y+9W{|#3c1p$Ek&IECXLGkpQB7HVvz@@no@5$!Z6Okg-6BZ5u!2r`+42R z48~qN1o57*wARlC{1W6hXBeT)I$lUo-;-1izA^k@5$$`E9eAb%M)X#yaoxq!8o5gk zshxAEYFy258w8?Sd-NghlEF~nbb_5aq5MXY_IwA}f<3S5`%ZzBLkP}9 zza!F!rSwB^0`s`(m$tv!{pI0}kd=-q*zVGVp$L9TrjcvMw_7ywKXV4; zl5?~@%;WW9?JV<5BF)e1b9vuZt6-S4#i3Qi9`l)3xs#)}zH&%Ai@TwAb?7Z$&T-;o zeayg@5?@%~zQX|z$7^fH08d5aQi%?yPnWqiiQCp_hhHw0%RP=z1uHOef)PEzdr*bJ& z!qZEq-VT*Rt^diz(n{P$r~Iy&W_8l+9@n^EbT;L6>JXXi4q=<0v3a2+NWKuV#X6lF zH;BDVW0#0$VsD!e|LCA7 zCfbm@V?_02)QaK)r8IgiYh|8>N!r_y=3K6lRT?v6GSr_{xTwY4Cu) zZ@p$Z^cs(gxn}P*K2wyG^k`-=4uLks$`7Uvp+icdnJ@P+aslFoi*<9(ssOa zoq4afWO_fkXae>MDcCI4>~L8+@;PLapoi*8d8Jed>4>~M1sN&r=^x5SBeqb}^@=YcaNj zAItT&b@=DBx8K}P;NxW{CcsgsYcif-BK*-ZL2JEogmZSkUNVK|#?C~+>F+}!+Uigk z9Ousw0FXH&{O1e+n4FOmJN@}m41mNU zCpttUL%{-S@cqn90Dk@n5dz75LM@6WYKl?FWH?-&^rz4fOaweF_BfXTeURVY9?|w~Rdv`mv0FMcSb;*6#>R6ms7Yuy%Vi zR^dzl_Wsyyfz|KW)E|Mkt}j@D@&M^B7IXZ8fK@yOF;1ZDhX7{$42W$7 z0y;tRz_k@D@8${umJtkM+`!5>`RRCc0CCS$7xnQVklk}&mvANlGNEX4>F|HkyTw*C zS_P7!VCK$7Js$}OuHHb`JFG&kD+o;Mdr(>RjPf!duqp)jL?eLdRjhX#s|eW8b8xI6 zAhU)oR*N+RY!g6ZrE8etiS`n;bq5lPz=w%Bb1OsgIP)iVJb zTi6A81maaqAT9vNHRA)l+gN-G#2@vZZh}DSFeSjXgZ)9u?jT@{!&sd0KR-zC+`oDw zz`#Ypf>1f*kM$^e(CiNO_>^%M0lPJh#*B8w&{;#bpTz;}wwnZZgx*{%k9w>y0S Y0nj}fSlKkVQAz{)dkB23nN#xr0ccu%S^xk5 diff --git a/start/.mvn/wrapper/maven-wrapper.properties b/start/.mvn/wrapper/maven-wrapper.properties index 308007b..2931e98 100755 --- a/start/.mvn/wrapper/maven-wrapper.properties +++ b/start/.mvn/wrapper/maven-wrapper.properties @@ -1,2 +1,4 @@ -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip -wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar +wrapperVersion=3.3.4 +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.4/maven-wrapper-3.3.4.jar + diff --git a/start/mvnw b/start/mvnw index 5e9618c..bd8896b 100755 --- a/start/mvnw +++ b/start/mvnw @@ -19,314 +19,277 @@ # ---------------------------------------------------------------------------- # ---------------------------------------------------------------------------- -# Apache Maven Wrapper startup batch script, version 3.3.2 -# -# Required ENV vars: -# ------------------ -# JAVA_HOME - location of a JDK home dir +# Apache Maven Wrapper startup batch script, version 3.3.4 # # Optional ENV vars # ----------------- -# MAVEN_OPTS - parameters passed to the Java VM when running Maven -# e.g. to debug Maven itself, use -# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# JAVA_HOME - location of a JDK home dir, required when download maven via java source +# MVNW_REPOURL - repo url base for downloading maven distribution +# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output # ---------------------------------------------------------------------------- -if [ -z "$MAVEN_SKIP_RC" ]; then - - if [ -f /usr/local/etc/mavenrc ]; then - . /usr/local/etc/mavenrc - fi - - if [ -f /etc/mavenrc ]; then - . /etc/mavenrc - fi - - if [ -f "$HOME/.mavenrc" ]; then - . "$HOME/.mavenrc" - fi - -fi +set -euf +[ "${MVNW_VERBOSE-}" != debug ] || set -x -# OS specific support. $var _must_ be set to either true or false. -cygwin=false -darwin=false -mingw=false +# OS specific support. +native_path() { printf %s\\n "$1"; } case "$(uname)" in -CYGWIN*) cygwin=true ;; -MINGW*) mingw=true ;; -Darwin*) - darwin=true - # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home - # See https://developer.apple.com/library/mac/qa/qa1170/_index.html - if [ -z "$JAVA_HOME" ]; then - if [ -x "/usr/libexec/java_home" ]; then - JAVA_HOME="$(/usr/libexec/java_home)" - export JAVA_HOME - else - JAVA_HOME="/Library/Java/Home" - export JAVA_HOME - fi - fi +CYGWIN* | MINGW*) + [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")" + native_path() { cygpath --path --windows "$1"; } ;; esac -if [ -z "$JAVA_HOME" ]; then - if [ -r /etc/gentoo-release ]; then - JAVA_HOME=$(java-config --jre-home) - fi -fi - -# For Cygwin, ensure paths are in UNIX format before anything is touched -if $cygwin; then - [ -n "$JAVA_HOME" ] \ - && JAVA_HOME=$(cygpath --unix "$JAVA_HOME") - [ -n "$CLASSPATH" ] \ - && CLASSPATH=$(cygpath --path --unix "$CLASSPATH") -fi - -# For Mingw, ensure paths are in UNIX format before anything is touched -if $mingw; then - [ -n "$JAVA_HOME" ] && [ -d "$JAVA_HOME" ] \ - && JAVA_HOME="$( - cd "$JAVA_HOME" || ( - echo "cannot cd into $JAVA_HOME." >&2 - exit 1 - ) - pwd - )" -fi - -if [ -z "$JAVA_HOME" ]; then - javaExecutable="$(which javac)" - if [ -n "$javaExecutable" ] && ! [ "$(expr "$javaExecutable" : '\([^ ]*\)')" = "no" ]; then - # readlink(1) is not available as standard on Solaris 10. - readLink=$(which readlink) - if [ ! "$(expr "$readLink" : '\([^ ]*\)')" = "no" ]; then - if $darwin; then - javaHome="$(dirname "$javaExecutable")" - javaExecutable="$(cd "$javaHome" && pwd -P)/javac" - else - javaExecutable="$(readlink -f "$javaExecutable")" - fi - javaHome="$(dirname "$javaExecutable")" - javaHome=$(expr "$javaHome" : '\(.*\)/bin') - JAVA_HOME="$javaHome" - export JAVA_HOME - fi - fi -fi - -if [ -z "$JAVACMD" ]; then - if [ -n "$JAVA_HOME" ]; then +# set JAVACMD and JAVACCMD +set_java_home() { + # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched + if [ -n "${JAVA_HOME-}" ]; then if [ -x "$JAVA_HOME/jre/sh/java" ]; then # IBM's JDK on AIX uses strange locations for the executables JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACCMD="$JAVA_HOME/jre/sh/javac" else JAVACMD="$JAVA_HOME/bin/java" + JAVACCMD="$JAVA_HOME/bin/javac" + + if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then + echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2 + echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2 + return 1 + fi fi else JAVACMD="$( - \unset -f command 2>/dev/null - \command -v java - )" - fi -fi + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v java + )" || : + JAVACCMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v javac + )" || : -if [ ! -x "$JAVACMD" ]; then - echo "Error: JAVA_HOME is not defined correctly." >&2 - echo " We cannot execute $JAVACMD" >&2 - exit 1 -fi - -if [ -z "$JAVA_HOME" ]; then - echo "Warning: JAVA_HOME environment variable is not set." >&2 -fi - -# traverses directory structure from process work directory to filesystem root -# first directory with .mvn subdirectory is considered project base directory -find_maven_basedir() { - if [ -z "$1" ]; then - echo "Path not specified to find_maven_basedir" >&2 - return 1 + if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then + echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2 + return 1 + fi fi +} - basedir="$1" - wdir="$1" - while [ "$wdir" != '/' ]; do - if [ -d "$wdir"/.mvn ]; then - basedir=$wdir - break - fi - # workaround for JBEAP-8937 (on Solaris 10/Sparc) - if [ -d "${wdir}" ]; then - wdir=$( - cd "$wdir/.." || exit 1 - pwd - ) - fi - # end of workaround +# hash string like Java String::hashCode +hash_string() { + str="${1:-}" h=0 + while [ -n "$str" ]; do + char="${str%"${str#?}"}" + h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296)) + str="${str#?}" done - printf '%s' "$( - cd "$basedir" || exit 1 - pwd - )" + printf %x\\n $h } -# concatenates all lines of a file -concat_lines() { - if [ -f "$1" ]; then - # Remove \r in case we run on Windows within Git Bash - # and check out the repository with auto CRLF management - # enabled. Otherwise, we may read lines that are delimited with - # \r\n and produce $'-Xarg\r' rather than -Xarg due to word - # splitting rules. - tr -s '\r\n' ' ' <"$1" - fi +verbose() { :; } +[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; } + +die() { + printf %s\\n "$1" >&2 + exit 1 } -log() { - if [ "$MVNW_VERBOSE" = true ]; then - printf '%s\n' "$1" - fi +trim() { + # MWRAPPER-139: + # Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds. + # Needed for removing poorly interpreted newline sequences when running in more + # exotic environments such as mingw bash on Windows. + printf "%s" "${1}" | tr -d '[:space:]' } -BASE_DIR=$(find_maven_basedir "$(dirname "$0")") -if [ -z "$BASE_DIR" ]; then - exit 1 +scriptDir="$(dirname "$0")" +scriptName="$(basename "$0")" + +# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties +while IFS="=" read -r key value; do + case "${key-}" in + distributionUrl) distributionUrl=$(trim "${value-}") ;; + distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;; + esac +done <"$scriptDir/.mvn/wrapper/maven-wrapper.properties" +[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" + +case "${distributionUrl##*/}" in +maven-mvnd-*bin.*) + MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ + case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in + *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;; + :Darwin*x86_64) distributionPlatform=darwin-amd64 ;; + :Darwin*arm64) distributionPlatform=darwin-aarch64 ;; + :Linux*x86_64*) distributionPlatform=linux-amd64 ;; + *) + echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2 + distributionPlatform=linux-amd64 + ;; + esac + distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip" + ;; +maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;; +*) MVN_CMD="mvn${scriptName#mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; +esac + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}" +distributionUrlName="${distributionUrl##*/}" +distributionUrlNameMain="${distributionUrlName%.*}" +distributionUrlNameMain="${distributionUrlNameMain%-bin}" +MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}" +MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")" + +exec_maven() { + unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || : + exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD" +} + +if [ -d "$MAVEN_HOME" ]; then + verbose "found existing MAVEN_HOME at $MAVEN_HOME" + exec_maven "$@" fi -MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} -export MAVEN_PROJECTBASEDIR -log "$MAVEN_PROJECTBASEDIR" - -########################################################################################## -# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central -# This allows using the maven wrapper in projects that prohibit checking in binary data. -########################################################################################## -wrapperJarPath="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" -if [ -r "$wrapperJarPath" ]; then - log "Found $wrapperJarPath" +case "${distributionUrl-}" in +*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;; +*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;; +esac + +# prepare tmp dir +if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then + clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; } + trap clean HUP INT TERM EXIT else - log "Couldn't find $wrapperJarPath, downloading it ..." + die "cannot create temp dir" +fi - if [ -n "$MVNW_REPOURL" ]; then - wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar" - else - wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar" - fi - while IFS="=" read -r key value; do - # 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 '=' ) - safeValue=$(echo "$value" | tr -d '\r') - case "$key" in wrapperUrl) - wrapperUrl="$safeValue" - break - ;; - esac - done <"$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" - log "Downloading from: $wrapperUrl" - - if $cygwin; then - wrapperJarPath=$(cygpath --path --windows "$wrapperJarPath") - fi +mkdir -p -- "${MAVEN_HOME%/*}" - if command -v wget >/dev/null; then - log "Found wget ... using wget" - [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--quiet" - if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then - wget $QUIET "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" - else - wget $QUIET --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" - fi - elif command -v curl >/dev/null; then - log "Found curl ... using curl" - [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--silent" - if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then - curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" - else - curl $QUIET --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" - fi - else - log "Falling back to using Java to download" - javaSource="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.java" - javaClass="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.class" - # For Cygwin, switch paths to Windows format before running javac - if $cygwin; then - javaSource=$(cygpath --path --windows "$javaSource") - javaClass=$(cygpath --path --windows "$javaClass") - fi - if [ -e "$javaSource" ]; then - if [ ! -e "$javaClass" ]; then - log " - Compiling MavenWrapperDownloader.java ..." - ("$JAVA_HOME/bin/javac" "$javaSource") - fi - if [ -e "$javaClass" ]; then - log " - Running MavenWrapperDownloader.java ..." - ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$wrapperUrl" "$wrapperJarPath") || rm -f "$wrapperJarPath" - fi - fi - fi +# Download and Install Apache Maven +verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +verbose "Downloading from: $distributionUrl" +verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +# select .zip or .tar.gz +if ! command -v unzip >/dev/null; then + distributionUrl="${distributionUrl%.zip}.tar.gz" + distributionUrlName="${distributionUrl##*/}" fi -########################################################################################## -# End of extension -########################################################################################## -# If specified, validate the SHA-256 sum of the Maven wrapper jar file -wrapperSha256Sum="" -while IFS="=" read -r key value; do - case "$key" in wrapperSha256Sum) - wrapperSha256Sum=$value - break - ;; - esac -done <"$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" -if [ -n "$wrapperSha256Sum" ]; then - wrapperSha256Result=false - if command -v sha256sum >/dev/null; then - if echo "$wrapperSha256Sum $wrapperJarPath" | sha256sum -c >/dev/null 2>&1; then - wrapperSha256Result=true +# verbose opt +__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR='' +[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v + +# normalize http auth +case "${MVNW_PASSWORD:+has-password}" in +'') MVNW_USERNAME='' MVNW_PASSWORD='' ;; +has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;; +esac + +if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then + verbose "Found wget ... using wget" + wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl" +elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then + verbose "Found curl ... using curl" + curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl" +elif set_java_home; then + verbose "Falling back to use Java to download" + javaSource="$TMP_DOWNLOAD_DIR/Downloader.java" + targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName" + cat >"$javaSource" <<-END + public class Downloader extends java.net.Authenticator + { + protected java.net.PasswordAuthentication getPasswordAuthentication() + { + return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() ); + } + public static void main( String[] args ) throws Exception + { + setDefault( new Downloader() ); + java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() ); + } + } + END + # For Cygwin/MinGW, switch paths to Windows format before running javac and java + verbose " - Compiling Downloader.java ..." + "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java" + verbose " - Running Downloader.java ..." + "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")" +fi + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +if [ -n "${distributionSha256Sum-}" ]; then + distributionSha256Result=false + if [ "$MVN_CMD" = mvnd.sh ]; then + echo "Checksum validation is not supported for maven-mvnd." >&2 + echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + elif command -v sha256sum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c - >/dev/null 2>&1; then + distributionSha256Result=true fi elif command -v shasum >/dev/null; then - if echo "$wrapperSha256Sum $wrapperJarPath" | shasum -a 256 -c >/dev/null 2>&1; then - wrapperSha256Result=true + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then + distributionSha256Result=true fi else echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2 - echo "Please install either command, or disable validation by removing 'wrapperSha256Sum' from your maven-wrapper.properties." >&2 + echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 exit 1 fi - if [ $wrapperSha256Result = false ]; then - echo "Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised." >&2 - echo "Investigate or delete $wrapperJarPath to attempt a clean download." >&2 - echo "If you updated your Maven version, you need to update the specified wrapperSha256Sum property." >&2 + if [ $distributionSha256Result = false ]; then + echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2 + echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2 exit 1 fi fi -MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" +# unzip and move +if command -v unzip >/dev/null; then + unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip" +else + tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar" +fi + +# Find the actual extracted directory name (handles snapshots where filename != directory name) +actualDistributionDir="" -# For Cygwin, switch paths to Windows format before running java -if $cygwin; then - [ -n "$JAVA_HOME" ] \ - && JAVA_HOME=$(cygpath --path --windows "$JAVA_HOME") - [ -n "$CLASSPATH" ] \ - && CLASSPATH=$(cygpath --path --windows "$CLASSPATH") - [ -n "$MAVEN_PROJECTBASEDIR" ] \ - && MAVEN_PROJECTBASEDIR=$(cygpath --path --windows "$MAVEN_PROJECTBASEDIR") +# First try the expected directory name (for regular distributions) +if [ -d "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" ]; then + if [ -f "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/bin/$MVN_CMD" ]; then + actualDistributionDir="$distributionUrlNameMain" + fi 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 +# If not found, search for any directory with the Maven executable (for snapshots) +if [ -z "$actualDistributionDir" ]; then + # enable globbing to iterate over items + set +f + for dir in "$TMP_DOWNLOAD_DIR"/*; do + if [ -d "$dir" ]; then + if [ -f "$dir/bin/$MVN_CMD" ]; then + actualDistributionDir="$(basename "$dir")" + break + fi + fi + done + set -f +fi + +if [ -z "$actualDistributionDir" ]; then + verbose "Contents of $TMP_DOWNLOAD_DIR:" + verbose "$(ls -la "$TMP_DOWNLOAD_DIR")" + die "Could not find Maven distribution directory in extracted archive" +fi -WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain +verbose "Found extracted Maven distribution directory: $actualDistributionDir" +printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$actualDistributionDir/mvnw.url" +mv -- "$TMP_DOWNLOAD_DIR/$actualDistributionDir" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" -# shellcheck disable=SC2086 # safe args -exec "$JAVACMD" \ - $MAVEN_OPTS \ - $MAVEN_DEBUG_OPTS \ - -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ - "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ - ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" +clean || : +exec_maven "$@" diff --git a/start/mvnw.cmd b/start/mvnw.cmd index 1204076..5761d94 100755 --- a/start/mvnw.cmd +++ b/start/mvnw.cmd @@ -1,3 +1,4 @@ +<# : batch portion @REM ---------------------------------------------------------------------------- @REM Licensed to the Apache Software Foundation (ASF) under one @REM or more contributor license agreements. See the NOTICE file @@ -18,189 +19,171 @@ @REM ---------------------------------------------------------------------------- @REM ---------------------------------------------------------------------------- -@REM Apache Maven Wrapper startup batch script, version 3.3.2 -@REM -@REM Required ENV vars: -@REM JAVA_HOME - location of a JDK home dir +@REM Apache Maven Wrapper startup batch script, version 3.3.4 @REM @REM Optional ENV vars -@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands -@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending -@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven -@REM e.g. to debug Maven itself, use -@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM MVNW_REPOURL - repo url base for downloading maven distribution +@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output @REM ---------------------------------------------------------------------------- -@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' -@echo off -@REM set title of command window -title %0 -@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 -if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") - -@REM Execute a user defined script before this one -if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre -@REM check for pre script, once with legacy .bat ending and once with .cmd ending -if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* -if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %* -:skipRcPre - -@setlocal - -set ERROR_CODE=0 - -@REM To isolate internal variables from possible post scripts, we use another setlocal -@setlocal - -@REM ==== START VALIDATION ==== -if not "%JAVA_HOME%" == "" goto OkJHome - -echo. >&2 -echo Error: JAVA_HOME not found in your environment. >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. >&2 -goto error - -:OkJHome -if exist "%JAVA_HOME%\bin\java.exe" goto init - -echo. >&2 -echo Error: JAVA_HOME is set to an invalid directory. >&2 -echo JAVA_HOME = "%JAVA_HOME%" >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. >&2 -goto error - -@REM ==== END VALIDATION ==== - -:init - -@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". -@REM Fallback to current working directory if not found. - -set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% -IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir - -set EXEC_DIR=%CD% -set WDIR=%EXEC_DIR% -:findBaseDir -IF EXIST "%WDIR%"\.mvn goto baseDirFound -cd .. -IF "%WDIR%"=="%CD%" goto baseDirNotFound -set WDIR=%CD% -goto findBaseDir - -:baseDirFound -set MAVEN_PROJECTBASEDIR=%WDIR% -cd "%EXEC_DIR%" -goto endDetectBaseDir - -:baseDirNotFound -set MAVEN_PROJECTBASEDIR=%EXEC_DIR% -cd "%EXEC_DIR%" - -:endDetectBaseDir - -IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig - -@setlocal EnableExtensions EnableDelayedExpansion -for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a -@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% - -:endReadAdditionalConfig - -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 WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar" - -FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( - IF "%%A"=="wrapperUrl" SET WRAPPER_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% ( - if "%MVNW_VERBOSE%" == "true" ( - echo Found %WRAPPER_JAR% - ) -) else ( - if not "%MVNW_REPOURL%" == "" ( - SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar" - ) - if "%MVNW_VERBOSE%" == "true" ( - echo Couldn't find %WRAPPER_JAR%, downloading it ... - echo Downloading from: %WRAPPER_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('%WRAPPER_URL%', '%WRAPPER_JAR%')"^ - "}" - if "%MVNW_VERBOSE%" == "true" ( - echo Finished downloading %WRAPPER_JAR% - ) -) -@REM End of extension - -@REM If specified, validate the SHA-256 sum of the Maven wrapper jar file -SET WRAPPER_SHA_256_SUM="" -FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( - IF "%%A"=="wrapperSha256Sum" SET WRAPPER_SHA_256_SUM=%%B +@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0) +@SET __MVNW_CMD__= +@SET __MVNW_ERROR__= +@SET __MVNW_PSMODULEP_SAVE=%PSModulePath% +@SET PSModulePath= +@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @( + IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B) ) -IF NOT %WRAPPER_SHA_256_SUM%=="" ( - powershell -Command "&{"^ - "Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash;"^ - "$hash = (Get-FileHash \"%WRAPPER_JAR%\" -Algorithm SHA256).Hash.ToLower();"^ - "If('%WRAPPER_SHA_256_SUM%' -ne $hash){"^ - " Write-Error 'Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised.';"^ - " Write-Error 'Investigate or delete %WRAPPER_JAR% to attempt a clean download.';"^ - " Write-Error 'If you updated your Maven version, you need to update the specified wrapperSha256Sum property.';"^ - " exit 1;"^ - "}"^ - "}" - if ERRORLEVEL 1 goto error -) - -@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 - -:error -set ERROR_CODE=1 - -:end -@endlocal & set ERROR_CODE=%ERROR_CODE% - -if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost -@REM check for post script, once with legacy .bat ending and once with .cmd ending -if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" -if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd" -:skipRcPost - -@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' -if "%MAVEN_BATCH_PAUSE%"=="on" pause - -if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE% - -cmd /C exit /B %ERROR_CODE% +@SET PSModulePath=%__MVNW_PSMODULEP_SAVE% +@SET __MVNW_PSMODULEP_SAVE= +@SET __MVNW_ARG0_NAME__= +@SET MVNW_USERNAME= +@SET MVNW_PASSWORD= +@IF NOT "%__MVNW_CMD__%"=="" ("%__MVNW_CMD__%" %*) +@echo Cannot start maven from wrapper >&2 && exit /b 1 +@GOTO :EOF +: end batch / begin powershell #> + +$ErrorActionPreference = "Stop" +if ($env:MVNW_VERBOSE -eq "true") { + $VerbosePreference = "Continue" +} + +# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties +$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl +if (!$distributionUrl) { + Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" +} + +switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) { + "maven-mvnd-*" { + $USE_MVND = $true + $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip" + $MVN_CMD = "mvnd.cmd" + break + } + default { + $USE_MVND = $false + $MVN_CMD = $script -replace '^mvnw','mvn' + break + } +} + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +if ($env:MVNW_REPOURL) { + $MVNW_REPO_PATTERN = if ($USE_MVND -eq $False) { "/org/apache/maven/" } else { "/maven/mvnd/" } + $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace "^.*$MVNW_REPO_PATTERN",'')" +} +$distributionUrlName = $distributionUrl -replace '^.*/','' +$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$','' + +$MAVEN_M2_PATH = "$HOME/.m2" +if ($env:MAVEN_USER_HOME) { + $MAVEN_M2_PATH = "$env:MAVEN_USER_HOME" +} + +if (-not (Test-Path -Path $MAVEN_M2_PATH)) { + New-Item -Path $MAVEN_M2_PATH -ItemType Directory | Out-Null +} + +$MAVEN_WRAPPER_DISTS = $null +if ((Get-Item $MAVEN_M2_PATH).Target[0] -eq $null) { + $MAVEN_WRAPPER_DISTS = "$MAVEN_M2_PATH/wrapper/dists" +} else { + $MAVEN_WRAPPER_DISTS = (Get-Item $MAVEN_M2_PATH).Target[0] + "/wrapper/dists" +} + +$MAVEN_HOME_PARENT = "$MAVEN_WRAPPER_DISTS/$distributionUrlNameMain" +$MAVEN_HOME_NAME = ([System.Security.Cryptography.SHA256]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join '' +$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME" + +if (Test-Path -Path "$MAVEN_HOME" -PathType Container) { + Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME" + Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" + exit $? +} + +if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) { + Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl" +} + +# prepare tmp dir +$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile +$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir" +$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null +trap { + if ($TMP_DOWNLOAD_DIR.Exists) { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } + } +} + +New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null + +# Download and Install Apache Maven +Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +Write-Verbose "Downloading from: $distributionUrl" +Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +$webclient = New-Object System.Net.WebClient +if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) { + $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD) +} +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 +$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum +if ($distributionSha256Sum) { + if ($USE_MVND) { + Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." + } + Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash + if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) { + Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property." + } +} + +# unzip and move +Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null + +# Find the actual extracted directory name (handles snapshots where filename != directory name) +$actualDistributionDir = "" + +# First try the expected directory name (for regular distributions) +$expectedPath = Join-Path "$TMP_DOWNLOAD_DIR" "$distributionUrlNameMain" +$expectedMvnPath = Join-Path "$expectedPath" "bin/$MVN_CMD" +if ((Test-Path -Path $expectedPath -PathType Container) -and (Test-Path -Path $expectedMvnPath -PathType Leaf)) { + $actualDistributionDir = $distributionUrlNameMain +} + +# If not found, search for any directory with the Maven executable (for snapshots) +if (!$actualDistributionDir) { + Get-ChildItem -Path "$TMP_DOWNLOAD_DIR" -Directory | ForEach-Object { + $testPath = Join-Path $_.FullName "bin/$MVN_CMD" + if (Test-Path -Path $testPath -PathType Leaf) { + $actualDistributionDir = $_.Name + } + } +} + +if (!$actualDistributionDir) { + Write-Error "Could not find Maven distribution directory in extracted archive" +} + +Write-Verbose "Found extracted Maven distribution directory: $actualDistributionDir" +Rename-Item -Path "$TMP_DOWNLOAD_DIR/$actualDistributionDir" -NewName $MAVEN_HOME_NAME | Out-Null +try { + Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null +} catch { + if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) { + Write-Error "fail to move MAVEN_HOME" + } +} finally { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } +} + +Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" diff --git a/start/pom.xml b/start/pom.xml index 2830c12..7b2627f 100644 --- a/start/pom.xml +++ b/start/pom.xml @@ -37,7 +37,7 @@ org.eclipse.microprofile microprofile - 7.0 + 7.1 pom provided @@ -45,7 +45,7 @@ com.ibm.websphere.appserver.api com.ibm.websphere.appserver.api.passwordUtil - 1.0.105 + 1.0.106 provided @@ -53,7 +53,7 @@ com.ibm.websphere.appserver.api com.ibm.websphere.appserver.api.ssl - 1.8.105 + 1.8.106 provided @@ -62,7 +62,7 @@ org.mongodb mongodb-driver-sync - 5.6.0 + 5.6.1 @@ -99,7 +99,7 @@ org.apache.maven.plugins maven-war-plugin - 3.4.0 + 3.5.0 diff --git a/start/src/main/liberty/config/server.xml b/start/src/main/liberty/config/server.xml index ccb8bf8..192d2b6 100755 --- a/start/src/main/liberty/config/server.xml +++ b/start/src/main/liberty/config/server.xml @@ -1,7 +1,7 @@ jakartaee-10.0 - microprofile-7.0 + microprofile-7.1 mpConfig