From 6e7b907d9dbcd32ac42f4b3cee259dcaad2a167f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Apr 2024 01:11:28 +0000 Subject: [PATCH 001/184] build(deps): bump hazelcast/management-center Bumps hazelcast/management-center from 5.4.0 to 5.4.1. --- updated-dependencies: - dependency-name: hazelcast/management-center dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/server/resources/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/server/resources/Dockerfile b/generators/server/resources/Dockerfile index 892b35780f08..58963260a703 100644 --- a/generators/server/resources/Dockerfile +++ b/generators/server/resources/Dockerfile @@ -33,7 +33,7 @@ LABEL ALIAS=mssql FROM neo4j:5.19.0 -FROM hazelcast/management-center:5.4.0 +FROM hazelcast/management-center:5.4.1 LABEL ALIAS=hazelcast FROM memcached:1.6.26-alpine From b6343d237cdbe2ed1e77d6ac2a90e32cdc733d93 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Apr 2024 02:17:00 +0000 Subject: [PATCH 002/184] build(deps): bump vue-i18n in /generators/vue/resources Bumps [vue-i18n](https://github.com/intlify/vue-i18n-next/tree/HEAD/packages/vue-i18n) from 9.13.0 to 9.13.1. - [Release notes](https://github.com/intlify/vue-i18n-next/releases) - [Changelog](https://github.com/intlify/vue-i18n-next/blob/master/CHANGELOG.md) - [Commits](https://github.com/intlify/vue-i18n-next/commits/v9.13.1/packages/vue-i18n) --- updated-dependencies: - dependency-name: vue-i18n dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/vue/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/vue/resources/package.json b/generators/vue/resources/package.json index b57d3ced60ba..7f3c36c11439 100644 --- a/generators/vue/resources/package.json +++ b/generators/vue/resources/package.json @@ -17,7 +17,7 @@ "rxjs": "7.8.1", "sockjs-client": "1.6.1", "vue": "3.4.21", - "vue-i18n": "9.13.0", + "vue-i18n": "9.13.1", "vue-router": "4.3.2" }, "devDependencies": { From 1d5d4902dd4aa981142517efcb9ef318c0241361 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Apr 2024 02:17:16 +0000 Subject: [PATCH 003/184] build(deps-dev): bump vue-tsc in /generators/vue/resources Bumps [vue-tsc](https://github.com/vuejs/language-tools/tree/HEAD/packages/tsc) from 2.0.13 to 2.0.14. - [Release notes](https://github.com/vuejs/language-tools/releases) - [Changelog](https://github.com/vuejs/language-tools/blob/master/CHANGELOG.md) - [Commits](https://github.com/vuejs/language-tools/commits/v2.0.14/packages/tsc) --- updated-dependencies: - dependency-name: vue-tsc dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/vue/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/vue/resources/package.json b/generators/vue/resources/package.json index b57d3ced60ba..3915de267bde 100644 --- a/generators/vue/resources/package.json +++ b/generators/vue/resources/package.json @@ -64,7 +64,7 @@ "vitest-sonar-reporter": "2.0.0", "vue-loader": "17.4.2", "vue-style-loader": "4.1.3", - "vue-tsc": "2.0.13", + "vue-tsc": "2.0.14", "webpack": "5.91.0", "webpack-bundle-analyzer": "4.10.2", "webpack-cli": "5.1.4", From 1ec50423db9956d22616a1410abca450848ecf8f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Apr 2024 02:18:12 +0000 Subject: [PATCH 004/184] build(deps-dev): bump vite-plugin-static-copy Bumps [vite-plugin-static-copy](https://github.com/sapphi-red/vite-plugin-static-copy) from 1.0.2 to 1.0.3. - [Release notes](https://github.com/sapphi-red/vite-plugin-static-copy/releases) - [Changelog](https://github.com/sapphi-red/vite-plugin-static-copy/blob/main/CHANGELOG.md) - [Commits](https://github.com/sapphi-red/vite-plugin-static-copy/compare/vite-plugin-static-copy@1.0.2...vite-plugin-static-copy@1.0.3) --- updated-dependencies: - dependency-name: vite-plugin-static-copy dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/vue/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/vue/resources/package.json b/generators/vue/resources/package.json index b57d3ced60ba..14f7ed068a15 100644 --- a/generators/vue/resources/package.json +++ b/generators/vue/resources/package.json @@ -59,7 +59,7 @@ "ts-loader": "9.5.1", "typescript": "5.4.5", "vite": "5.2.9", - "vite-plugin-static-copy": "1.0.2", + "vite-plugin-static-copy": "1.0.3", "vitest": "1.5.0", "vitest-sonar-reporter": "2.0.0", "vue-loader": "17.4.2", From 2e599d4848c98a39cbabb23d62e3297feb8c7fdb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Apr 2024 02:44:11 +0000 Subject: [PATCH 005/184] build(deps-dev): bump vite in /generators/vue/resources Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 5.2.9 to 5.2.10. - [Release notes](https://github.com/vitejs/vite/releases) - [Changelog](https://github.com/vitejs/vite/blob/main/packages/vite/CHANGELOG.md) - [Commits](https://github.com/vitejs/vite/commits/v5.2.10/packages/vite) --- updated-dependencies: - dependency-name: vite dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/vue/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/vue/resources/package.json b/generators/vue/resources/package.json index 6a8d585d252b..775745cd74ff 100644 --- a/generators/vue/resources/package.json +++ b/generators/vue/resources/package.json @@ -58,7 +58,7 @@ "terser-webpack-plugin": "5.3.10", "ts-loader": "9.5.1", "typescript": "5.4.5", - "vite": "5.2.9", + "vite": "5.2.10", "vite-plugin-static-copy": "1.0.3", "vitest": "1.5.0", "vitest-sonar-reporter": "2.0.0", From 1082c9b093837266f8cc425e22bf80328e1c193a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Apr 2024 03:23:17 +0000 Subject: [PATCH 006/184] build(deps-dev): bump jest-date-mock in /generators/angular/resources Bumps [jest-date-mock](https://github.com/hustcc/jest-date-mock) from 1.0.9 to 1.0.10. - [Release notes](https://github.com/hustcc/jest-date-mock/releases) - [Commits](https://github.com/hustcc/jest-date-mock/compare/v1.0.9...v1.0.10) --- updated-dependencies: - dependency-name: jest-date-mock dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/angular/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/angular/resources/package.json b/generators/angular/resources/package.json index 066b7da16929..717edb2087fc 100644 --- a/generators/angular/resources/package.json +++ b/generators/angular/resources/package.json @@ -38,7 +38,7 @@ "eslint-webpack-plugin": "4.1.0", "folder-hash": "4.0.4", "jest": "29.7.0", - "jest-date-mock": "1.0.9", + "jest-date-mock": "1.0.10", "jest-junit": "16.0.0", "jest-preset-angular": "14.0.3", "jest-sonar": "0.2.16", From 5da6f9656a53a4cdfe84b7617fc4296aeebb6fd0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Apr 2024 05:56:09 +0000 Subject: [PATCH 007/184] build(deps): bump org.apache.maven.plugins:maven-jar-plugin Bumps [org.apache.maven.plugins:maven-jar-plugin](https://github.com/apache/maven-jar-plugin) from 3.4.0 to 3.4.1. - [Release notes](https://github.com/apache/maven-jar-plugin/releases) - [Commits](https://github.com/apache/maven-jar-plugin/compare/maven-jar-plugin-3.4.0...maven-jar-plugin-3.4.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-jar-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/server/resources/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/server/resources/pom.xml b/generators/server/resources/pom.xml index 7b18ccfceeb5..358bfbb97d84 100644 --- a/generators/server/resources/pom.xml +++ b/generators/server/resources/pom.xml @@ -32,7 +32,7 @@ 3.13.0 3.4.1 3.2.5 - 3.4.0 + 3.4.1 3.6.3 3.3.1 3.12.1 From b938491068b24c744e87e61f84e916cde30755bd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Apr 2024 08:33:45 +0000 Subject: [PATCH 008/184] build(deps): bump org.redisson:redisson Bumps [org.redisson:redisson](https://github.com/redisson/redisson) from 3.28.0 to 3.29.0. - [Release notes](https://github.com/redisson/redisson/releases) - [Changelog](https://github.com/redisson/redisson/blob/master/CHANGELOG.md) - [Commits](https://github.com/redisson/redisson/compare/redisson-3.28.0...redisson-3.29.0) --- updated-dependencies: - dependency-name: org.redisson:redisson dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- generators/spring-cache/resources/gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/spring-cache/resources/gradle/libs.versions.toml b/generators/spring-cache/resources/gradle/libs.versions.toml index 5b0765d42b27..eeab67b9932a 100644 --- a/generators/spring-cache/resources/gradle/libs.versions.toml +++ b/generators/spring-cache/resources/gradle/libs.versions.toml @@ -12,4 +12,4 @@ xmemcached-provider = { module = 'com.google.code.simple-spring-memcached:xmemca xmemcached = { module = 'com.googlecode.xmemcached:xmemcached', version = '2.4.8' } -redisson = { module = 'org.redisson:redisson', version = '3.28.0' } +redisson = { module = 'org.redisson:redisson', version = '3.29.0' } From af45d684d413919cc1bdb332bcf3f146dbbf6ffa Mon Sep 17 00:00:00 2001 From: Daniel Franco Date: Mon, 22 Apr 2024 19:33:41 +0100 Subject: [PATCH 009/184] Revert "chore(deps): update dependency maven-wrapper to v3.3.0" --- .../.mvn/wrapper/maven-wrapper.properties | 1 + generators/maven/templates/mvnw | 428 ++++++++++-------- generators/maven/templates/mvnw.cmd | 301 +++++++----- 3 files changed, 424 insertions(+), 306 deletions(-) diff --git a/generators/maven/templates/.mvn/wrapper/maven-wrapper.properties b/generators/maven/templates/.mvn/wrapper/maven-wrapper.properties index 7f1562129a4a..346d645fd06f 100644 --- a/generators/maven/templates/.mvn/wrapper/maven-wrapper.properties +++ b/generators/maven/templates/.mvn/wrapper/maven-wrapper.properties @@ -15,3 +15,4 @@ # specific language governing permissions and limitations # under the License. distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar diff --git a/generators/maven/templates/mvnw b/generators/maven/templates/mvnw index 08303327cbc7..8d937f4c14f1 100755 --- a/generators/maven/templates/mvnw +++ b/generators/maven/templates/mvnw @@ -19,232 +19,290 @@ # ---------------------------------------------------------------------------- # ---------------------------------------------------------------------------- -# Apache Maven Wrapper startup batch script, version 3.3.0 +# Apache Maven Wrapper startup batch script, version 3.2.0 +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir # # Optional ENV vars # ----------------- -# 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 +# 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 # ---------------------------------------------------------------------------- -set -euf -[ "${MVNW_VERBOSE-}" != debug ] || set -x +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 -# OS specific support. -native_path() { printf %s\\n "$1"; } +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false case "$(uname)" in -CYGWIN* | MINGW*) - [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")" - native_path() { cygpath --path --windows "$1"; } - ;; + 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 + ;; esac -# 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 +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."; 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 + 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="$( - '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-}" ] || [ ! -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 + JAVACMD="$(\unset -f command 2>/dev/null; \command -v java)" fi -} +fi -# 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 %x\\n $h -} +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi -verbose() { :; } -[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; } +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi -die() { - printf %s\\n "$1" >&2 - exit 1 +# 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" + return 1 + 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 + done + printf '%s' "$(cd "$basedir" || exit 1; pwd)" } -# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties -while IFS="=" read -r key value; do - case "${key-}" in - distributionUrl) distributionUrl="${value-}" ;; - distributionSha256Sum) distributionSha256Sum="${value-}" ;; - esac -done <"${0%/*}/.mvn/wrapper/maven-wrapper.properties" -[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.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${0##*/mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; -esac +# 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 +} -# 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_HOME="$HOME/.m2/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" +log() { + if [ "$MVNW_VERBOSE" = true ]; then + printf '%s\n' "$1" + fi } -if [ -d "$MAVEN_HOME" ]; then - verbose "found existing MAVEN_HOME at $MAVEN_HOME" - exec_maven "$@" +BASE_DIR=$(find_maven_basedir "$(dirname "$0")") +if [ -z "$BASE_DIR" ]; then + exit 1; fi -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 +MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}; export MAVEN_PROJECTBASEDIR +log "$MAVEN_PROJECTBASEDIR" -# 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 +########################################################################################## +# 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" else - die "cannot create temp dir" -fi - -mkdir -p -- "${MAVEN_HOME%/*}" + log "Couldn't find $wrapperJarPath, downloading it ..." -# 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 - -# 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 + if [ -n "$MVNW_REPOURL" ]; then + wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + else + wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.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" -# normalize http auth -case "${MVNW_PASSWORD:+has-password}" in -'') MVNW_USERNAME='' MVNW_PASSWORD='' ;; -has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;; -esac + if $cygwin; then + wrapperJarPath=$(cygpath --path --windows "$wrapperJarPath") + fi -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( new java.net.URL( args[0] ).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")" + 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 fi +########################################################################################## +# End of extension +########################################################################################## -# 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 +# 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 fi - elif command -v shasum >/dev/null; then - if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then - distributionSha256Result=true + elif command -v shasum > /dev/null; then + if echo "$wrapperSha256Sum $wrapperJarPath" | shasum -a 256 -c > /dev/null 2>&1; then + wrapperSha256Result=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 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." + echo "Please install either command, or disable validation by removing 'wrapperSha256Sum' from your maven-wrapper.properties." exit 1 fi - 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 + 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 exit 1 fi fi -# 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" +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# 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") fi -printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/mvnw.url" -mv -- "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" -clean || : -exec_maven "$@" +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $*" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +# 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 "$@" diff --git a/generators/maven/templates/mvnw.cmd b/generators/maven/templates/mvnw.cmd index 136e686a896d..c4586b564e6f 100644 --- a/generators/maven/templates/mvnw.cmd +++ b/generators/maven/templates/mvnw.cmd @@ -1,4 +1,3 @@ -<# : batch portion @REM ---------------------------------------------------------------------------- @REM Licensed to the Apache Software Foundation (ASF) under one @REM or more contributor license agreements. See the NOTICE file @@ -19,128 +18,188 @@ @REM ---------------------------------------------------------------------------- @REM ---------------------------------------------------------------------------- -@REM Apache Maven Wrapper startup batch script, version 3.3.0 +@REM Apache Maven Wrapper startup batch script, version 3.2.0 +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir @REM @REM Optional ENV vars -@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 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 ---------------------------------------------------------------------------- -@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) +@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. +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. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +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. +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.2.0/maven-wrapper-3.2.0.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.2.0/maven-wrapper-3.2.0.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 ) -@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) { "/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_HOME_PARENT = "$HOME/.m2/wrapper/dists/$distributionUrlNameMain" -$MAVEN_HOME_NAME = ([System.Security.Cryptography.MD5]::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 -Rename-Item -Path "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" -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" +IF NOT %WRAPPER_SHA_256_SUM%=="" ( + powershell -Command "&{"^ + "$hash = (Get-FileHash \"%WRAPPER_JAR%\" -Algorithm SHA256).Hash.ToLower();"^ + "If('%WRAPPER_SHA_256_SUM%' -ne $hash){"^ + " Write-Output 'Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised.';"^ + " Write-Output 'Investigate or delete %WRAPPER_JAR% to attempt a clean download.';"^ + " Write-Output '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% From 1042f9ca5ebbe951a2f542b274364fb180bf275c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Apr 2024 23:50:24 +0000 Subject: [PATCH 010/184] build(deps): bump the typescript-eslint group with 2 updates Bumps the typescript-eslint group with 2 updates: [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) and [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser). Updates `@typescript-eslint/eslint-plugin` from 7.7.0 to 7.7.1 - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v7.7.1/packages/eslint-plugin) Updates `@typescript-eslint/parser` from 7.7.0 to 7.7.1 - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v7.7.1/packages/parser) --- updated-dependencies: - dependency-name: "@typescript-eslint/eslint-plugin" dependency-type: direct:production update-type: version-update:semver-patch dependency-group: typescript-eslint - dependency-name: "@typescript-eslint/parser" dependency-type: direct:production update-type: version-update:semver-patch dependency-group: typescript-eslint ... Signed-off-by: dependabot[bot] --- package-lock.json | 90 +++++++++++++++++++++++------------------------ package.json | 4 +-- 2 files changed, 47 insertions(+), 47 deletions(-) diff --git a/package-lock.json b/package-lock.json index f9df902ee263..e8b0932b3f79 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,8 +13,8 @@ "@iarna/toml": "3.0.0", "@types/ejs": "3.1.5", "@types/lodash": "4.17.0", - "@typescript-eslint/eslint-plugin": "7.7.0", - "@typescript-eslint/parser": "7.7.0", + "@typescript-eslint/eslint-plugin": "7.7.1", + "@typescript-eslint/parser": "7.7.1", "@yeoman/adapter": "1.4.0", "@yeoman/conflicter": "2.0.0", "@yeoman/namespace": "1.0.0", @@ -3533,15 +3533,15 @@ "dev": true }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.7.0.tgz", - "integrity": "sha512-GJWR0YnfrKnsRoluVO3PRb9r5aMZriiMMM/RHj5nnTrBy1/wIgk76XCtCKcnXGjpZQJQRFtGV9/0JJ6n30uwpQ==", + "version": "7.7.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.7.1.tgz", + "integrity": "sha512-KwfdWXJBOviaBVhxO3p5TJiLpNuh2iyXyjmWN0f1nU87pwyvfS0EmjC6ukQVYVFJd/K1+0NWGPDXiyEyQorn0Q==", "dependencies": { "@eslint-community/regexpp": "^4.10.0", - "@typescript-eslint/scope-manager": "7.7.0", - "@typescript-eslint/type-utils": "7.7.0", - "@typescript-eslint/utils": "7.7.0", - "@typescript-eslint/visitor-keys": "7.7.0", + "@typescript-eslint/scope-manager": "7.7.1", + "@typescript-eslint/type-utils": "7.7.1", + "@typescript-eslint/utils": "7.7.1", + "@typescript-eslint/visitor-keys": "7.7.1", "debug": "^4.3.4", "graphemer": "^1.4.0", "ignore": "^5.3.1", @@ -3567,14 +3567,14 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.7.0.tgz", - "integrity": "sha512-fNcDm3wSwVM8QYL4HKVBggdIPAy9Q41vcvC/GtDobw3c4ndVT3K6cqudUmjHPw8EAp4ufax0o58/xvWaP2FmTg==", - "dependencies": { - "@typescript-eslint/scope-manager": "7.7.0", - "@typescript-eslint/types": "7.7.0", - "@typescript-eslint/typescript-estree": "7.7.0", - "@typescript-eslint/visitor-keys": "7.7.0", + "version": "7.7.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.7.1.tgz", + "integrity": "sha512-vmPzBOOtz48F6JAGVS/kZYk4EkXao6iGrD838sp1w3NQQC0W8ry/q641KU4PrG7AKNAf56NOcR8GOpH8l9FPCw==", + "dependencies": { + "@typescript-eslint/scope-manager": "7.7.1", + "@typescript-eslint/types": "7.7.1", + "@typescript-eslint/typescript-estree": "7.7.1", + "@typescript-eslint/visitor-keys": "7.7.1", "debug": "^4.3.4" }, "engines": { @@ -3594,12 +3594,12 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.7.0.tgz", - "integrity": "sha512-/8INDn0YLInbe9Wt7dK4cXLDYp0fNHP5xKLHvZl3mOT5X17rK/YShXaiNmorl+/U4VKCVIjJnx4Ri5b0y+HClw==", + "version": "7.7.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.7.1.tgz", + "integrity": "sha512-PytBif2SF+9SpEUKynYn5g1RHFddJUcyynGpztX3l/ik7KmZEv19WCMhUBkHXPU9es/VWGD3/zg3wg90+Dh2rA==", "dependencies": { - "@typescript-eslint/types": "7.7.0", - "@typescript-eslint/visitor-keys": "7.7.0" + "@typescript-eslint/types": "7.7.1", + "@typescript-eslint/visitor-keys": "7.7.1" }, "engines": { "node": "^18.18.0 || >=20.0.0" @@ -3610,12 +3610,12 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.7.0.tgz", - "integrity": "sha512-bOp3ejoRYrhAlnT/bozNQi3nio9tIgv3U5C0mVDdZC7cpcQEDZXvq8inrHYghLVwuNABRqrMW5tzAv88Vy77Sg==", + "version": "7.7.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.7.1.tgz", + "integrity": "sha512-ZksJLW3WF7o75zaBPScdW1Gbkwhd/lyeXGf1kQCxJaOeITscoSl0MjynVvCzuV5boUz/3fOI06Lz8La55mu29Q==", "dependencies": { - "@typescript-eslint/typescript-estree": "7.7.0", - "@typescript-eslint/utils": "7.7.0", + "@typescript-eslint/typescript-estree": "7.7.1", + "@typescript-eslint/utils": "7.7.1", "debug": "^4.3.4", "ts-api-utils": "^1.3.0" }, @@ -3636,9 +3636,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.7.0.tgz", - "integrity": "sha512-G01YPZ1Bd2hn+KPpIbrAhEWOn5lQBrjxkzHkWvP6NucMXFtfXoevK82hzQdpfuQYuhkvFDeQYbzXCjR1z9Z03w==", + "version": "7.7.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.7.1.tgz", + "integrity": "sha512-AmPmnGW1ZLTpWa+/2omPrPfR7BcbUU4oha5VIbSbS1a1Tv966bklvLNXxp3mrbc+P2j4MNOTfDffNsk4o0c6/w==", "engines": { "node": "^18.18.0 || >=20.0.0" }, @@ -3648,12 +3648,12 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.7.0.tgz", - "integrity": "sha512-8p71HQPE6CbxIBy2kWHqM1KGrC07pk6RJn40n0DSc6bMOBBREZxSDJ+BmRzc8B5OdaMh1ty3mkuWRg4sCFiDQQ==", + "version": "7.7.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.7.1.tgz", + "integrity": "sha512-CXe0JHCXru8Fa36dteXqmH2YxngKJjkQLjxzoj6LYwzZ7qZvgsLSc+eqItCrqIop8Vl2UKoAi0StVWu97FQZIQ==", "dependencies": { - "@typescript-eslint/types": "7.7.0", - "@typescript-eslint/visitor-keys": "7.7.0", + "@typescript-eslint/types": "7.7.1", + "@typescript-eslint/visitor-keys": "7.7.1", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -3675,16 +3675,16 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.7.0.tgz", - "integrity": "sha512-LKGAXMPQs8U/zMRFXDZOzmMKgFv3COlxUQ+2NMPhbqgVm6R1w+nU1i4836Pmxu9jZAuIeyySNrN/6Rc657ggig==", + "version": "7.7.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.7.1.tgz", + "integrity": "sha512-QUvBxPEaBXf41ZBbaidKICgVL8Hin0p6prQDu6bbetWo39BKbWJxRsErOzMNT1rXvTll+J7ChrbmMCXM9rsvOQ==", "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", "@types/json-schema": "^7.0.15", "@types/semver": "^7.5.8", - "@typescript-eslint/scope-manager": "7.7.0", - "@typescript-eslint/types": "7.7.0", - "@typescript-eslint/typescript-estree": "7.7.0", + "@typescript-eslint/scope-manager": "7.7.1", + "@typescript-eslint/types": "7.7.1", + "@typescript-eslint/typescript-estree": "7.7.1", "semver": "^7.6.0" }, "engines": { @@ -3699,11 +3699,11 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.7.0.tgz", - "integrity": "sha512-h0WHOj8MhdhY8YWkzIF30R379y0NqyOHExI9N9KCzvmu05EgG4FumeYa3ccfKUSphyWkWQE1ybVrgz/Pbam6YA==", + "version": "7.7.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.7.1.tgz", + "integrity": "sha512-gBL3Eq25uADw1LQ9kVpf3hRM+DWzs0uZknHYK3hq4jcTPqVCClHGDnB6UUUV2SFeBeA4KWHWbbLqmbGcZ4FYbw==", "dependencies": { - "@typescript-eslint/types": "7.7.0", + "@typescript-eslint/types": "7.7.1", "eslint-visitor-keys": "^3.4.3" }, "engines": { diff --git a/package.json b/package.json index 33b0cb67b7c0..330e8814610f 100644 --- a/package.json +++ b/package.json @@ -116,8 +116,8 @@ "@iarna/toml": "3.0.0", "@types/ejs": "3.1.5", "@types/lodash": "4.17.0", - "@typescript-eslint/eslint-plugin": "7.7.0", - "@typescript-eslint/parser": "7.7.0", + "@typescript-eslint/eslint-plugin": "7.7.1", + "@typescript-eslint/parser": "7.7.1", "@yeoman/adapter": "1.4.0", "@yeoman/conflicter": "2.0.0", "@yeoman/namespace": "1.0.0", From cae7327a2b7fecd0f8a4cbc550da239176becad1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Apr 2024 23:51:16 +0000 Subject: [PATCH 011/184] build(deps): bump type-fest from 4.15.0 to 4.16.0 Bumps [type-fest](https://github.com/sindresorhus/type-fest) from 4.15.0 to 4.16.0. - [Release notes](https://github.com/sindresorhus/type-fest/releases) - [Commits](https://github.com/sindresorhus/type-fest/compare/v4.15.0...v4.16.0) --- updated-dependencies: - dependency-name: type-fest dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index f9df902ee263..754fd4b904d2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -58,7 +58,7 @@ "semver": "7.6.0", "simple-git": "3.24.0", "sort-keys": "5.0.0", - "type-fest": "4.15.0", + "type-fest": "4.16.0", "typescript": "5.4.5", "winston": "3.13.0", "yaml": "2.4.1", @@ -13373,9 +13373,9 @@ } }, "node_modules/type-fest": { - "version": "4.15.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.15.0.tgz", - "integrity": "sha512-tB9lu0pQpX5KJq54g+oHOLumOx+pMep4RaM6liXh2PKmVRFF+/vAtUP0ZaJ0kOySfVNjF6doBWPHhBhISKdlIA==", + "version": "4.16.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.16.0.tgz", + "integrity": "sha512-z7Rf5PXxIhbI6eJBTwdqe5bO02nUUmctq4WqviFSstBAWV0YNtEQRhEnZw73WJ8sZOqgFG6Jdl8gYZu7NBJZnA==", "engines": { "node": ">=16" }, diff --git a/package.json b/package.json index 33b0cb67b7c0..01d765cd1a8e 100644 --- a/package.json +++ b/package.json @@ -161,7 +161,7 @@ "semver": "7.6.0", "simple-git": "3.24.0", "sort-keys": "5.0.0", - "type-fest": "4.15.0", + "type-fest": "4.16.0", "typescript": "5.4.5", "winston": "3.13.0", "yaml": "2.4.1", From 6b893dea108fb3dd9a747b73563cf4928772d1da Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Apr 2024 01:53:41 +0000 Subject: [PATCH 012/184] build(deps-dev): bump the typescript-eslint group Bumps the typescript-eslint group in /generators/react/resources with 2 updates: [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) and [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser). Updates `@typescript-eslint/eslint-plugin` from 7.7.0 to 7.7.1 - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v7.7.1/packages/eslint-plugin) Updates `@typescript-eslint/parser` from 7.7.0 to 7.7.1 - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v7.7.1/packages/parser) --- updated-dependencies: - dependency-name: "@typescript-eslint/eslint-plugin" dependency-type: direct:development update-type: version-update:semver-patch dependency-group: typescript-eslint - dependency-name: "@typescript-eslint/parser" dependency-type: direct:development update-type: version-update:semver-patch dependency-group: typescript-eslint ... Signed-off-by: dependabot[bot] --- generators/react/resources/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/generators/react/resources/package.json b/generators/react/resources/package.json index d37b94cd09b3..439ccc9f97df 100644 --- a/generators/react/resources/package.json +++ b/generators/react/resources/package.json @@ -39,8 +39,8 @@ "@types/react-redux": "7.1.33", "@types/redux": "3.6.31", "@types/webpack-env": "1.18.4", - "@typescript-eslint/eslint-plugin": "7.7.0", - "@typescript-eslint/parser": "7.7.0", + "@typescript-eslint/eslint-plugin": "7.7.1", + "@typescript-eslint/parser": "7.7.1", "autoprefixer": "10.4.19", "browser-sync": "2.29.3", "browser-sync-webpack-plugin": "2.3.0", From 678c3b66e3e4a5915ea2e0f47ae2e0d6a5779eea Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Apr 2024 03:38:04 +0000 Subject: [PATCH 013/184] build(deps-dev): bump @typescript-eslint/eslint-plugin Bumps the typescript-eslint group in /generators/angular/resources with 1 update: [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin). Updates `@typescript-eslint/eslint-plugin` from 7.7.0 to 7.7.1 - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v7.7.1/packages/eslint-plugin) --- updated-dependencies: - dependency-name: "@typescript-eslint/eslint-plugin" dependency-type: direct:development update-type: version-update:semver-patch dependency-group: typescript-eslint ... Signed-off-by: dependabot[bot] --- generators/angular/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/angular/resources/package.json b/generators/angular/resources/package.json index 717edb2087fc..5532fb1e4fb6 100644 --- a/generators/angular/resources/package.json +++ b/generators/angular/resources/package.json @@ -28,7 +28,7 @@ "@types/jest": "29.5.12", "@types/node": "20.11.25", "@types/sockjs-client": "1.5.4", - "@typescript-eslint/eslint-plugin": "7.7.0", + "@typescript-eslint/eslint-plugin": "7.7.1", "browser-sync": "3.0.2", "browser-sync-webpack-plugin": "2.3.0", "buffer": "6.0.3", From 53ae27e26ac18c4b1a07bf4610c7861ffef97626 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Apr 2024 07:27:44 +0000 Subject: [PATCH 014/184] build(deps-dev): bump swagger-ui-dist in /generators/client/resources Bumps [swagger-ui-dist](https://github.com/swagger-api/swagger-ui) from 5.16.2 to 5.17.0. - [Release notes](https://github.com/swagger-api/swagger-ui/releases) - [Changelog](https://github.com/swagger-api/swagger-ui/blob/master/.releaserc) - [Commits](https://github.com/swagger-api/swagger-ui/compare/v5.16.2...v5.17.0) --- updated-dependencies: - dependency-name: swagger-ui-dist dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- generators/client/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/client/resources/package.json b/generators/client/resources/package.json index 84e2e83ee772..9b988e1275b0 100644 --- a/generators/client/resources/package.json +++ b/generators/client/resources/package.json @@ -11,6 +11,6 @@ "eslint-plugin-cypress": "2.15.2", "lighthouse": "11.7.1", "nyc": "15.1.0", - "swagger-ui-dist": "5.16.2" + "swagger-ui-dist": "5.17.0" } } From 11330b51106a91981cacda2dbe7934c99fdb2054 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Apr 2024 07:28:03 +0000 Subject: [PATCH 015/184] build(deps-dev): bump @cypress/code-coverage Bumps [@cypress/code-coverage](https://github.com/cypress-io/code-coverage) from 3.12.35 to 3.12.36. - [Release notes](https://github.com/cypress-io/code-coverage/releases) - [Changelog](https://github.com/cypress-io/code-coverage/blob/master/.releaserc) - [Commits](https://github.com/cypress-io/code-coverage/compare/v3.12.35...v3.12.36) --- updated-dependencies: - dependency-name: "@cypress/code-coverage" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/client/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/client/resources/package.json b/generators/client/resources/package.json index 84e2e83ee772..721e746332e9 100644 --- a/generators/client/resources/package.json +++ b/generators/client/resources/package.json @@ -3,7 +3,7 @@ "dayjs": "1.11.10" }, "devDependencies": { - "@cypress/code-coverage": "3.12.35", + "@cypress/code-coverage": "3.12.36", "babel-loader": "9.1.3", "babel-plugin-istanbul": "6.1.1", "cypress": "13.8.0", From c8a3cf7527ea56a01c0a0e59e143982da442b22a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Apr 2024 08:12:20 +0000 Subject: [PATCH 016/184] build(deps): bump io.mongock:mongock-bom in /generators/server/resources Bumps [io.mongock:mongock-bom](https://github.com/mongock/mongock-bom) from 5.4.1 to 5.4.2. - [Commits](https://github.com/mongock/mongock-bom/commits) --- updated-dependencies: - dependency-name: io.mongock:mongock-bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/server/resources/gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/server/resources/gradle/libs.versions.toml b/generators/server/resources/gradle/libs.versions.toml index 3569bc66cba9..d65c295cd0bc 100644 --- a/generators/server/resources/gradle/libs.versions.toml +++ b/generators/server/resources/gradle/libs.versions.toml @@ -9,7 +9,7 @@ feign-reactor-bom = { module = 'com.playtika.reactivefeign:feign-reactor-bom', v testng = { module = 'org.testng:testng', version = '7.10.1' } cucumber-bom = { module = 'io.cucumber:cucumber-bom', version = '7.17.0' } -mongock-bom = { module = 'io.mongock:mongock-bom', version = '5.4.1' } +mongock-bom = { module = 'io.mongock:mongock-bom', version = '5.4.2' } neo4j-migrations-spring-boot-starter = { module = 'eu.michael-simons.neo4j:neo4j-migrations-spring-boot-starter', version = '2.10.0' } From 5b733cdaa7128c3cee2473a45075b9f867b2504f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Apr 2024 08:27:20 +0000 Subject: [PATCH 017/184] build(deps-dev): bump lighthouse in /generators/client/resources Bumps [lighthouse](https://github.com/GoogleChrome/lighthouse) from 11.7.1 to 12.0.0. - [Release notes](https://github.com/GoogleChrome/lighthouse/releases) - [Changelog](https://github.com/GoogleChrome/lighthouse/blob/main/changelog.md) - [Commits](https://github.com/GoogleChrome/lighthouse/compare/v11.7.1...v12.0.0) --- updated-dependencies: - dependency-name: lighthouse dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- generators/client/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/client/resources/package.json b/generators/client/resources/package.json index 9b988e1275b0..ded5b241e83d 100644 --- a/generators/client/resources/package.json +++ b/generators/client/resources/package.json @@ -9,7 +9,7 @@ "cypress": "13.8.0", "cypress-audit": "1.1.0", "eslint-plugin-cypress": "2.15.2", - "lighthouse": "11.7.1", + "lighthouse": "12.0.0", "nyc": "15.1.0", "swagger-ui-dist": "5.17.0" } From 8e2ab2d3e076cc60d15d6917577e5bc0159ff324 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Apr 2024 09:28:14 +0000 Subject: [PATCH 018/184] build(deps-dev): bump eslint-plugin-cypress Bumps [eslint-plugin-cypress](https://github.com/cypress-io/eslint-plugin-cypress) from 2.15.2 to 3.0.0. - [Release notes](https://github.com/cypress-io/eslint-plugin-cypress/releases) - [Commits](https://github.com/cypress-io/eslint-plugin-cypress/compare/v2.15.2...v3.0.0) --- updated-dependencies: - dependency-name: eslint-plugin-cypress dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- generators/client/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/client/resources/package.json b/generators/client/resources/package.json index 9771919824c8..ec52e30dcf5b 100644 --- a/generators/client/resources/package.json +++ b/generators/client/resources/package.json @@ -8,7 +8,7 @@ "babel-plugin-istanbul": "6.1.1", "cypress": "13.8.0", "cypress-audit": "1.1.0", - "eslint-plugin-cypress": "2.15.2", + "eslint-plugin-cypress": "3.0.0", "lighthouse": "12.0.0", "nyc": "15.1.0", "swagger-ui-dist": "5.17.0" From 9e6182defdc118ee304928697c99cf864561bf9f Mon Sep 17 00:00:00 2001 From: Hao Date: Tue, 23 Apr 2024 20:27:13 +0800 Subject: [PATCH 019/184] use customized `SpaCsrfTokenRequestHandler` to handle CSRF token (#25907) * use customized SpaCsrfTokenRequestHandler to handle CSRF token * update based on review comments --- .../SecurityConfiguration_imperative.java.ejs | 62 +++++++++++++++++-- 1 file changed, 56 insertions(+), 6 deletions(-) diff --git a/generators/server/templates/src/main/java/_package_/config/SecurityConfiguration_imperative.java.ejs b/generators/server/templates/src/main/java/_package_/config/SecurityConfiguration_imperative.java.ejs index c2c7310cf3e4..bf0067080bda 100644 --- a/generators/server/templates/src/main/java/_package_/config/SecurityConfiguration_imperative.java.ejs +++ b/generators/server/templates/src/main/java/_package_/config/SecurityConfiguration_imperative.java.ejs @@ -54,6 +54,10 @@ import tech.jhipster.web.filter.CookieCsrfFilter; <%_ if (!skipClient) { _%> import <%= packageName %>.web.filter.SpaWebFilter; <%_ } _%> +<%_ if (authenticationUsesCsrf && !applicationTypeMicroservice) { _%> +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +<%_ } _%> <%_ if (authenticationTypeJwt || (authenticationTypeOauth2 && applicationTypeMicroservice)) { _%> import org.springframework.security.config.http.SessionCreationPolicy; <%_ } _%> @@ -84,6 +88,9 @@ import org.springframework.security.oauth2.core.oidc.user.OidcUserAuthority; <%_ } _%> import java.util.*; <%_ } _%> +<%_ if (authenticationUsesCsrf && !applicationTypeMicroservice) { _%> +import java.util.function.Supplier; +<%_ } _%> <%_ if (authenticationTypeSession) { _%> import org.springframework.http.HttpStatus; import org.springframework.security.web.authentication.HttpStatusEntryPoint; @@ -94,8 +101,7 @@ import org.springframework.security.web.authentication.RememberMeServices; <%_ } _%> <%_ } _%> <%_ if (authenticationUsesCsrf && !applicationTypeMicroservice) { _%> -import org.springframework.security.web.csrf.CookieCsrfTokenRepository; -import org.springframework.security.web.csrf.CsrfTokenRequestAttributeHandler; +import org.springframework.security.web.csrf.*; <%_ } _%> <%_ if (authenticationTypeOauth2) { _%> import <%= packageName %>.security.oauth2.JwtGrantedAuthorityConverter; @@ -112,6 +118,9 @@ import <%= packageName %>.security.oauth2.CustomClaimConverter; <%_ if(!skipClient) { _%> import org.springframework.security.web.header.writers.ReferrerPolicyHeaderWriter; <%_ } _%> +<%_ if (authenticationUsesCsrf && !applicationTypeMicroservice) { _%> +import org.springframework.util.StringUtils; +<%_ } _%> import org.springframework.security.web.servlet.util.matcher.MvcRequestMatcher; import org.springframework.web.servlet.handler.HandlerMappingIntrospector; @@ -126,7 +135,7 @@ public class SecurityConfiguration { private final Environment env; <%_ } _%> - + private final JHipsterProperties jHipsterProperties; <%_ if (authenticationTypeSession && generateUserManagement) { _%> @@ -141,7 +150,7 @@ public class SecurityConfiguration { public SecurityConfiguration(<% if (devDatabaseTypeH2Any) { %>Environment env, <% } %><% if (authenticationTypeSession && generateUserManagement) { %>RememberMeServices rememberMeServices, <% } %> JHipsterProperties jHipsterProperties) { <%_ if (devDatabaseTypeH2Any) { _%> this.env = env; -<%_ } _%> +<%_ } _%> <%_ if (authenticationTypeSession && generateUserManagement) { _%> this.rememberMeServices = rememberMeServices; <%_ } _%> @@ -164,8 +173,7 @@ public class SecurityConfiguration { .csrf(csrf -> csrf <%_ if (authenticationUsesCsrf && !applicationTypeMicroservice) { _%> .csrfTokenRepository(CookieCsrfTokenRepository.withHttpOnlyFalse()) - // See https://stackoverflow.com/q/74447118/65681 - .csrfTokenRequestHandler(new CsrfTokenRequestAttributeHandler())) + .csrfTokenRequestHandler(new SpaCsrfTokenRequestHandler())) <%_ } else { _%> .disable()) <%_ } _%> @@ -364,4 +372,46 @@ public class SecurityConfiguration { return jwtDecoder; } <%_ } _%> +<%_ if (authenticationUsesCsrf && !applicationTypeMicroservice) { _%> + + /** + * Custom CSRF handler to provide BREACH protection. + * + * @see Spring Security Documentation - Integrating with CSRF Protection + * @see JHipster - use customized SpaCsrfTokenRequestHandler to handle CSRF token + * @see CSRF protection not working with Spring Security 6 + */ + static final class SpaCsrfTokenRequestHandler extends CsrfTokenRequestAttributeHandler { + private final CsrfTokenRequestHandler delegate = new XorCsrfTokenRequestAttributeHandler(); + + @Override + public void handle(HttpServletRequest request, HttpServletResponse response, Supplier csrfToken) { + /* + * Always use XorCsrfTokenRequestAttributeHandler to provide BREACH protection of + * the CsrfToken when it is rendered in the response body. + */ + this.delegate.handle(request, response, csrfToken); + } + + @Override + public String resolveCsrfTokenValue(HttpServletRequest request, CsrfToken csrfToken) { + /* + * If the request contains a request header, use CsrfTokenRequestAttributeHandler + * to resolve the CsrfToken. This applies when a single-page application includes + * the header value automatically, which was obtained via a cookie containing the + * raw CsrfToken. + */ + if (StringUtils.hasText(request.getHeader(csrfToken.getHeaderName()))) { + return super.resolveCsrfTokenValue(request, csrfToken); + } + /* + * In all other cases (e.g. if the request contains a request parameter), use + * XorCsrfTokenRequestAttributeHandler to resolve the CsrfToken. This applies + * when a server-side rendered form includes the _csrf request parameter as a + * hidden input. + */ + return this.delegate.resolveCsrfTokenValue(request, csrfToken); + } + } +<%_ } _%> } From e27507078adb483833941a8b88389cd178641805 Mon Sep 17 00:00:00 2001 From: Marcelo Boveto Shima Date: Tue, 23 Apr 2024 09:22:05 -0300 Subject: [PATCH 020/184] add liquibaseGenerateFakeData property --- generators/bootstrap-application/generator.spec.ts | 10 ++++++++++ generators/liquibase/support/prepare-field.js | 1 + generators/liquibase/support/relationship.ts | 1 + .../config/liquibase/fake-data/table_entity.csv.ejs | 6 +++--- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/generators/bootstrap-application/generator.spec.ts b/generators/bootstrap-application/generator.spec.ts index 9498a487a7b3..ca818357a5ae 100644 --- a/generators/bootstrap-application/generator.spec.ts +++ b/generators/bootstrap-application/generator.spec.ts @@ -333,6 +333,7 @@ describe(`generator - ${generator}`, () => { "jpaGeneratedValueSequence": false, "liquibaseDefaultValueAttributeName": undefined, "liquibaseDefaultValueAttributeValue": undefined, + "liquibaseGenerateFakeData": true, "loadColumnType": "\${uuidType}", "nullable": true, "path": [ @@ -422,6 +423,7 @@ describe(`generator - ${generator}`, () => { "javaValueSample2": ""login2"", "liquibaseDefaultValueAttributeName": undefined, "liquibaseDefaultValueAttributeValue": undefined, + "liquibaseGenerateFakeData": true, "loadColumnType": "string", "maxlength": 50, "nullable": false, @@ -507,6 +509,7 @@ describe(`generator - ${generator}`, () => { "javaValueSample2": ""firstName2"", "liquibaseDefaultValueAttributeName": undefined, "liquibaseDefaultValueAttributeValue": undefined, + "liquibaseGenerateFakeData": true, "loadColumnType": "string", "maxlength": 50, "nullable": true, @@ -591,6 +594,7 @@ describe(`generator - ${generator}`, () => { "javaValueSample2": ""lastName2"", "liquibaseDefaultValueAttributeName": undefined, "liquibaseDefaultValueAttributeValue": undefined, + "liquibaseGenerateFakeData": true, "loadColumnType": "string", "maxlength": 50, "nullable": true, @@ -679,6 +683,7 @@ describe(`generator - ${generator}`, () => { "javaValueSample2": ""email2"", "liquibaseDefaultValueAttributeName": undefined, "liquibaseDefaultValueAttributeValue": undefined, + "liquibaseGenerateFakeData": true, "loadColumnType": "string", "maxlength": 191, "nullable": false, @@ -764,6 +769,7 @@ describe(`generator - ${generator}`, () => { "javaValueSample2": ""imageUrl2"", "liquibaseDefaultValueAttributeName": undefined, "liquibaseDefaultValueAttributeValue": undefined, + "liquibaseGenerateFakeData": true, "loadColumnType": "string", "maxlength": 256, "nullable": true, @@ -842,6 +848,7 @@ describe(`generator - ${generator}`, () => { "javaFieldType": "Boolean", "liquibaseDefaultValueAttributeName": undefined, "liquibaseDefaultValueAttributeValue": undefined, + "liquibaseGenerateFakeData": true, "loadColumnType": "boolean", "nullable": true, "path": [ @@ -925,6 +932,7 @@ describe(`generator - ${generator}`, () => { "javaValueSample2": ""langKey2"", "liquibaseDefaultValueAttributeName": undefined, "liquibaseDefaultValueAttributeValue": undefined, + "liquibaseGenerateFakeData": true, "loadColumnType": "string", "maxlength": 10, "nullable": true, @@ -1213,6 +1221,7 @@ describe(`generator - ${generator}`, () => { "jpaGeneratedValueSequence": false, "liquibaseDefaultValueAttributeName": undefined, "liquibaseDefaultValueAttributeValue": undefined, + "liquibaseGenerateFakeData": true, "loadColumnType": "\${uuidType}", "nullable": true, "path": [ @@ -1554,6 +1563,7 @@ describe(`generator - ${generator}`, () => { "jpaGeneratedValueSequence": false, "liquibaseDefaultValueAttributeName": undefined, "liquibaseDefaultValueAttributeValue": undefined, + "liquibaseGenerateFakeData": true, "loadColumnType": "\${uuidType}", "nullable": true, "path": [ diff --git a/generators/liquibase/support/prepare-field.js b/generators/liquibase/support/prepare-field.js index 9f19bb17100b..e081cc00b52f 100644 --- a/generators/liquibase/support/prepare-field.js +++ b/generators/liquibase/support/prepare-field.js @@ -157,6 +157,7 @@ export default function prepareField(entity, field) { columnRequired: data => data.nullable === false || (data.fieldValidate === true && data.fieldValidateRules.includes('required')), nullable: data => !data.columnRequired, loadColumnType: data => parseLiquibaseLoadColumnType(entity, data), + liquibaseGenerateFakeData: true, }); return field; diff --git a/generators/liquibase/support/relationship.ts b/generators/liquibase/support/relationship.ts index 0478f991870d..ef16b2195aa3 100644 --- a/generators/liquibase/support/relationship.ts +++ b/generators/liquibase/support/relationship.ts @@ -76,6 +76,7 @@ export function prepareRelationshipForLiquibase(entity, relationship) { __override__: false, columnDataType: data => data.otherEntity.columnType, columnRequired: data => data.nullable === false || data.relationshipRequired, + liquibaseGenerateFakeData: data => data.columnRequired && data.persistableRelationship && !data.collection, }); return relationship; diff --git a/generators/liquibase/templates/src/main/resources/config/liquibase/fake-data/table_entity.csv.ejs b/generators/liquibase/templates/src/main/resources/config/liquibase/fake-data/table_entity.csv.ejs index 6e68e1170acd..c1521e8a0c38 100644 --- a/generators/liquibase/templates/src/main/resources/config/liquibase/fake-data/table_entity.csv.ejs +++ b/generators/liquibase/templates/src/main/resources/config/liquibase/fake-data/table_entity.csv.ejs @@ -21,14 +21,14 @@ let table = []; // Generate CSV header let header = []; -const fieldsToGenerate = [...allFields.filter(f => f.id), ...fields.filter(f => !f.id)]; +const fieldsToGenerate = [...allFields.filter(f => f.id), ...fields.filter(f => !f.id)].filter(field => field.liquibaseGenerateFakeData); for (field of fieldsToGenerate) { header.push(field.columnName); if (field.shouldCreateContentType) { header.push(field.columnName + '_content_type'); } } -for (relationship of relationships.filter(relationship => relationship.columnRequired && relationship.persistableRelationship && !relationship.collection)) { +for (relationship of relationships.filter(relationship => relationship.liquibaseGenerateFakeData)) { const { joinColumnNames } = relationship; header.push(joinColumnNames[0]); } @@ -57,7 +57,7 @@ for (lineNb = 0; lineNb < entity.fakeDataCount; lineNb++) { } } - for (relationship of relationships.filter(relationship => relationship.columnRequired && relationship.persistableRelationship && !relationship.collection)) { + for (relationship of relationships.filter(relationship => relationship.liquibaseGenerateFakeData)) { const relationshipType = relationship.relationshipType; const otherLiquibaseFakeData = relationship.otherEntity.liquibaseFakeData; let relationshipRow = lineNb; From 024dbc5a9ffa77b00557486a65567902fbe6088f Mon Sep 17 00:00:00 2001 From: Marcelo Boveto Shima Date: Tue, 23 Apr 2024 21:53:29 -0300 Subject: [PATCH 021/184] fix project version --- .blueprint/generate-sample/generator.mjs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.blueprint/generate-sample/generator.mjs b/.blueprint/generate-sample/generator.mjs index 8d2037f36e5d..e03987f9ccfd 100644 --- a/.blueprint/generate-sample/generator.mjs +++ b/.blueprint/generate-sample/generator.mjs @@ -1,6 +1,7 @@ import { extname } from 'path'; import { transform } from '@yeoman/transform'; import BaseGenerator from '../../generators/base/index.js'; +import { packageJson } from '../../lib/index.js'; import { generateSample } from './support/generate-sample.js'; import { promptSamplesFolder } from '../support.mjs'; import { GENERATOR_APP, GENERATOR_JDL } from '../../generators/generator-list.js'; @@ -9,12 +10,16 @@ export default class extends BaseGenerator { sampleName; global; projectFolder; + projectVersion; get [BaseGenerator.INITIALIZING]() { return this.asInitializingTaskGroup({ async parseCommand() { await this.parseCurrentJHipsterCommand(); }, + projectVersion() { + this.projectVersion = `${packageJson.version}-git`; + } }); } @@ -35,6 +40,7 @@ export default class extends BaseGenerator { await this.composeWithJHipster(GENERATOR_JDL, { generatorArgs: [this.templatePath('samples', this.sampleName)], + generatorOptions: { projectVersion: this.projectVersion }, }); }, async generateSample() { @@ -52,7 +58,7 @@ export default class extends BaseGenerator { transform(() => {}), ); - let generatorOptions = { ...sample.sample.generatorOptions }; + let generatorOptions = { projectVersion: this.projectVersion, ...sample.sample.generatorOptions }; if (sample.sample.workspaces && sample.sample.workspaces !== 'false') { generatorOptions = { ...generatorOptions, workspaces: true, monorepository: true }; } From 4e4a2712b452277d215e75bde1c794955e3434b7 Mon Sep 17 00:00:00 2001 From: Marcelo Boveto Shima Date: Tue, 23 Apr 2024 21:54:37 -0300 Subject: [PATCH 022/184] drop role="form" --- .../finish/password-reset-finish.component.html.ejs | 2 +- .../password-reset/init/password-reset-init.component.html.ejs | 2 +- .../webapp/app/account/password/password.component.html.ejs | 2 +- .../webapp/app/account/register/register.component.html.ejs | 2 +- .../webapp/app/account/settings/settings.component.html.ejs | 2 +- .../update/user-management-update.component.html.ejs | 2 +- .../update/_entityFile_-update.component.html.ejs | 2 +- .../src/main/webapp/app/login/login.component.html.ejs | 2 +- .../webapp/app/account/change-password/change-password.vue.ejs | 2 +- .../src/main/webapp/app/account/login-form/login-form.vue.ejs | 2 +- .../src/main/webapp/app/account/register/register.vue.ejs | 2 +- .../account/reset-password/finish/reset-password-finish.vue.ejs | 2 +- .../app/account/reset-password/init/reset-password-init.vue.ejs | 2 +- .../src/main/webapp/app/account/settings/settings.vue.ejs | 2 +- .../app/admin/user-management/user-management-edit.vue.ejs | 2 +- .../app/entities/_entityFolder_/_entityFile_-update.vue.ejs | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/generators/angular/templates/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.html.ejs b/generators/angular/templates/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.html.ejs index 8966bff18ccd..c89af466f2ff 100644 --- a/generators/angular/templates/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.html.ejs +++ b/generators/angular/templates/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.html.ejs @@ -50,7 +50,7 @@ @if (key() && !success()) {
-
+
__jhiTranslateTag__('reset.request.messages.info')
- +
__jhiTranslateTag__('global.messages.error.dontmatch')
} - +
@if (!success()) { - +
-alert-error>-alert-error> @if (settingsForm.value.login) { - +
- +

__jhiTranslateTag__('userManagement.home.createOrEditLabel')

<<%= jhiPrefixDashed %>-alert-error>-alert-error> diff --git a/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/update/_entityFile_-update.component.html.ejs b/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/update/_entityFile_-update.component.html.ejs index 298dda222b51..b5901aa57bd1 100644 --- a/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/update/_entityFile_-update.component.html.ejs +++ b/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/update/_entityFile_-update.component.html.ejs @@ -18,7 +18,7 @@ -%>
- +

__jhiTranslateTag__('<%- i18nKeyPrefix %>.home.createOrEditLabel')

diff --git a/generators/angular/templates/src/main/webapp/app/login/login.component.html.ejs b/generators/angular/templates/src/main/webapp/app/login/login.component.html.ejs index e02487a957e6..4ea47544f938 100644 --- a/generators/angular/templates/src/main/webapp/app/login/login.component.html.ejs +++ b/generators/angular/templates/src/main/webapp/app/login/login.component.html.ejs @@ -25,7 +25,7 @@ data-cy="loginError" >__jhiTranslateTag__('login.messages.error.authentication')
} - +
- +
diff --git a/generators/vue/templates/src/main/webapp/app/account/login-form/login-form.vue.ejs b/generators/vue/templates/src/main/webapp/app/account/login-form/login-form.vue.ejs index 0b608f69daf8..db7b673d2bdf 100644 --- a/generators/vue/templates/src/main/webapp/app/account/login-form/login-form.vue.ejs +++ b/generators/vue/templates/src/main/webapp/app/account/login-form/login-form.vue.ejs @@ -7,7 +7,7 @@
- +
-