From f71fb51fcda39b61ceb98820a4f603f7e1bd0fbe Mon Sep 17 00:00:00 2001 From: JUnit Team Date: Sat, 25 May 2024 00:29:11 +0000 Subject: [PATCH 1/7] Bump Maven Wrapper from 3.9.6 to 3.9.6 in /junit5-jupiter-starter-maven-kotlin --- .../.mvn/wrapper/maven-wrapper.properties | 3 ++- junit5-jupiter-starter-maven-kotlin/mvnw | 17 +++++++++++++---- junit5-jupiter-starter-maven-kotlin/mvnw.cmd | 5 ++++- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/junit5-jupiter-starter-maven-kotlin/.mvn/wrapper/maven-wrapper.properties b/junit5-jupiter-starter-maven-kotlin/.mvn/wrapper/maven-wrapper.properties index fe378a15..48a56c99 100644 --- a/junit5-jupiter-starter-maven-kotlin/.mvn/wrapper/maven-wrapper.properties +++ b/junit5-jupiter-starter-maven-kotlin/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,6 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -wrapperVersion=3.3.1 +wrapperVersion=3.3.2 +distributionType=only-script distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip diff --git a/junit5-jupiter-starter-maven-kotlin/mvnw b/junit5-jupiter-starter-maven-kotlin/mvnw index ac8e247e..19529ddf 100755 --- a/junit5-jupiter-starter-maven-kotlin/mvnw +++ b/junit5-jupiter-starter-maven-kotlin/mvnw @@ -19,7 +19,7 @@ # ---------------------------------------------------------------------------- # ---------------------------------------------------------------------------- -# Apache Maven Wrapper startup batch script, version 3.3.1 +# Apache Maven Wrapper startup batch script, version 3.3.2 # # Optional ENV vars # ----------------- @@ -97,11 +97,19 @@ die() { exit 1 } +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:]' +} + # 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-}" ;; + distributionUrl) distributionUrl=$(trim "${value-}") ;; + distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;; esac done <"${0%/*}/.mvn/wrapper/maven-wrapper.properties" [ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.mvn/wrapper/maven-wrapper.properties" @@ -131,7 +139,8 @@ esac distributionUrlName="${distributionUrl##*/}" distributionUrlNameMain="${distributionUrlName%.*}" distributionUrlNameMain="${distributionUrlNameMain%-bin}" -MAVEN_HOME="$HOME/.m2/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")" +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 || : diff --git a/junit5-jupiter-starter-maven-kotlin/mvnw.cmd b/junit5-jupiter-starter-maven-kotlin/mvnw.cmd index 7b0c0943..249bdf38 100644 --- a/junit5-jupiter-starter-maven-kotlin/mvnw.cmd +++ b/junit5-jupiter-starter-maven-kotlin/mvnw.cmd @@ -19,7 +19,7 @@ @REM ---------------------------------------------------------------------------- @REM ---------------------------------------------------------------------------- -@REM Apache Maven Wrapper startup batch script, version 3.3.1 +@REM Apache Maven Wrapper startup batch script, version 3.3.2 @REM @REM Optional ENV vars @REM MVNW_REPOURL - repo url base for downloading maven distribution @@ -79,6 +79,9 @@ if ($env:MVNW_REPOURL) { $distributionUrlName = $distributionUrl -replace '^.*/','' $distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$','' $MAVEN_HOME_PARENT = "$HOME/.m2/wrapper/dists/$distributionUrlNameMain" +if ($env:MAVEN_USER_HOME) { + $MAVEN_HOME_PARENT = "$env:MAVEN_USER_HOME/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" From b63ea99cb2cc5646480dbb25640fa605b74169ba Mon Sep 17 00:00:00 2001 From: JUnit Team Date: Sat, 25 May 2024 00:29:17 +0000 Subject: [PATCH 2/7] Bump Maven Wrapper from 3.9.6 to 3.9.6 in /junit5-jupiter-starter-maven --- .../.mvn/wrapper/maven-wrapper.properties | 3 ++- junit5-jupiter-starter-maven/mvnw | 17 +++++++++++++---- junit5-jupiter-starter-maven/mvnw.cmd | 5 ++++- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/junit5-jupiter-starter-maven/.mvn/wrapper/maven-wrapper.properties b/junit5-jupiter-starter-maven/.mvn/wrapper/maven-wrapper.properties index fe378a15..48a56c99 100644 --- a/junit5-jupiter-starter-maven/.mvn/wrapper/maven-wrapper.properties +++ b/junit5-jupiter-starter-maven/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,6 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -wrapperVersion=3.3.1 +wrapperVersion=3.3.2 +distributionType=only-script distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip diff --git a/junit5-jupiter-starter-maven/mvnw b/junit5-jupiter-starter-maven/mvnw index ac8e247e..19529ddf 100755 --- a/junit5-jupiter-starter-maven/mvnw +++ b/junit5-jupiter-starter-maven/mvnw @@ -19,7 +19,7 @@ # ---------------------------------------------------------------------------- # ---------------------------------------------------------------------------- -# Apache Maven Wrapper startup batch script, version 3.3.1 +# Apache Maven Wrapper startup batch script, version 3.3.2 # # Optional ENV vars # ----------------- @@ -97,11 +97,19 @@ die() { exit 1 } +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:]' +} + # 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-}" ;; + distributionUrl) distributionUrl=$(trim "${value-}") ;; + distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;; esac done <"${0%/*}/.mvn/wrapper/maven-wrapper.properties" [ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.mvn/wrapper/maven-wrapper.properties" @@ -131,7 +139,8 @@ esac distributionUrlName="${distributionUrl##*/}" distributionUrlNameMain="${distributionUrlName%.*}" distributionUrlNameMain="${distributionUrlNameMain%-bin}" -MAVEN_HOME="$HOME/.m2/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")" +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 || : diff --git a/junit5-jupiter-starter-maven/mvnw.cmd b/junit5-jupiter-starter-maven/mvnw.cmd index 7b0c0943..249bdf38 100644 --- a/junit5-jupiter-starter-maven/mvnw.cmd +++ b/junit5-jupiter-starter-maven/mvnw.cmd @@ -19,7 +19,7 @@ @REM ---------------------------------------------------------------------------- @REM ---------------------------------------------------------------------------- -@REM Apache Maven Wrapper startup batch script, version 3.3.1 +@REM Apache Maven Wrapper startup batch script, version 3.3.2 @REM @REM Optional ENV vars @REM MVNW_REPOURL - repo url base for downloading maven distribution @@ -79,6 +79,9 @@ if ($env:MVNW_REPOURL) { $distributionUrlName = $distributionUrl -replace '^.*/','' $distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$','' $MAVEN_HOME_PARENT = "$HOME/.m2/wrapper/dists/$distributionUrlNameMain" +if ($env:MAVEN_USER_HOME) { + $MAVEN_HOME_PARENT = "$env:MAVEN_USER_HOME/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" From 017a0dfbaff7121b304402d861b3972dbc997ab7 Mon Sep 17 00:00:00 2001 From: JUnit Team Date: Sat, 25 May 2024 00:29:24 +0000 Subject: [PATCH 3/7] Bump Maven Wrapper from 3.9.6 to 3.9.6 in /junit5-migration-maven --- .../.mvn/wrapper/maven-wrapper.properties | 3 ++- junit5-migration-maven/mvnw | 17 +++++++++++++---- junit5-migration-maven/mvnw.cmd | 5 ++++- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/junit5-migration-maven/.mvn/wrapper/maven-wrapper.properties b/junit5-migration-maven/.mvn/wrapper/maven-wrapper.properties index fe378a15..48a56c99 100644 --- a/junit5-migration-maven/.mvn/wrapper/maven-wrapper.properties +++ b/junit5-migration-maven/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,6 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -wrapperVersion=3.3.1 +wrapperVersion=3.3.2 +distributionType=only-script distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip diff --git a/junit5-migration-maven/mvnw b/junit5-migration-maven/mvnw index ac8e247e..19529ddf 100755 --- a/junit5-migration-maven/mvnw +++ b/junit5-migration-maven/mvnw @@ -19,7 +19,7 @@ # ---------------------------------------------------------------------------- # ---------------------------------------------------------------------------- -# Apache Maven Wrapper startup batch script, version 3.3.1 +# Apache Maven Wrapper startup batch script, version 3.3.2 # # Optional ENV vars # ----------------- @@ -97,11 +97,19 @@ die() { exit 1 } +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:]' +} + # 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-}" ;; + distributionUrl) distributionUrl=$(trim "${value-}") ;; + distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;; esac done <"${0%/*}/.mvn/wrapper/maven-wrapper.properties" [ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.mvn/wrapper/maven-wrapper.properties" @@ -131,7 +139,8 @@ esac distributionUrlName="${distributionUrl##*/}" distributionUrlNameMain="${distributionUrlName%.*}" distributionUrlNameMain="${distributionUrlNameMain%-bin}" -MAVEN_HOME="$HOME/.m2/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")" +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 || : diff --git a/junit5-migration-maven/mvnw.cmd b/junit5-migration-maven/mvnw.cmd index 7b0c0943..249bdf38 100644 --- a/junit5-migration-maven/mvnw.cmd +++ b/junit5-migration-maven/mvnw.cmd @@ -19,7 +19,7 @@ @REM ---------------------------------------------------------------------------- @REM ---------------------------------------------------------------------------- -@REM Apache Maven Wrapper startup batch script, version 3.3.1 +@REM Apache Maven Wrapper startup batch script, version 3.3.2 @REM @REM Optional ENV vars @REM MVNW_REPOURL - repo url base for downloading maven distribution @@ -79,6 +79,9 @@ if ($env:MVNW_REPOURL) { $distributionUrlName = $distributionUrl -replace '^.*/','' $distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$','' $MAVEN_HOME_PARENT = "$HOME/.m2/wrapper/dists/$distributionUrlNameMain" +if ($env:MAVEN_USER_HOME) { + $MAVEN_HOME_PARENT = "$env:MAVEN_USER_HOME/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" From 0c0ce03136a5004d8f820ec0385d301d004030dd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 May 2024 07:16:45 +0000 Subject: [PATCH 4/7] Bump kotlin.version in /junit5-jupiter-starter-maven-kotlin Bumps `kotlin.version` from 1.9.24 to 2.0.0. Updates `org.jetbrains.kotlin:kotlin-stdlib` from 1.9.24 to 2.0.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v2.0.0/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.9.24...v2.0.0) Updates `org.jetbrains.kotlin:kotlin-test-junit5` from 1.9.24 to 2.0.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v2.0.0/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.9.24...v2.0.0) Updates `org.jetbrains.kotlin:kotlin-maven-plugin` from 1.9.24 to 2.0.0 --- updated-dependencies: - dependency-name: org.jetbrains.kotlin:kotlin-stdlib dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.jetbrains.kotlin:kotlin-test-junit5 dependency-type: direct:development update-type: version-update:semver-major - dependency-name: org.jetbrains.kotlin:kotlin-maven-plugin dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- junit5-jupiter-starter-maven-kotlin/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/junit5-jupiter-starter-maven-kotlin/pom.xml b/junit5-jupiter-starter-maven-kotlin/pom.xml index aab59065..0e040243 100644 --- a/junit5-jupiter-starter-maven-kotlin/pom.xml +++ b/junit5-jupiter-starter-maven-kotlin/pom.xml @@ -10,7 +10,7 @@ UTF-8 - 1.9.24 + 2.0.0 1.8 ${maven.compiler.source} From 239846c43d63d0787154a5b9b80fdcbd191351ab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 May 2024 07:41:58 +0000 Subject: [PATCH 5/7] Bump jvm from 1.9.24 to 2.0.0 in /junit5-jupiter-starter-gradle-kotlin Bumps jvm from 1.9.24 to 2.0.0. --- updated-dependencies: - dependency-name: jvm dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- junit5-jupiter-starter-gradle-kotlin/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/junit5-jupiter-starter-gradle-kotlin/build.gradle.kts b/junit5-jupiter-starter-gradle-kotlin/build.gradle.kts index 03147ab9..efd07b28 100644 --- a/junit5-jupiter-starter-gradle-kotlin/build.gradle.kts +++ b/junit5-jupiter-starter-gradle-kotlin/build.gradle.kts @@ -1,7 +1,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - kotlin("jvm") version "1.9.24" + kotlin("jvm") version "2.0.0" } repositories { From 6fe9887c22cd3120067f9dcd28778db435deffb5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 May 2024 07:51:55 +0000 Subject: [PATCH 6/7] Bump net.jqwik:jqwik from 1.8.4 to 1.8.5 in /junit5-multiple-engines Bumps [net.jqwik:jqwik](https://github.com/jqwik-team/jqwik) from 1.8.4 to 1.8.5. - [Release notes](https://github.com/jqwik-team/jqwik/releases) - [Commits](https://github.com/jqwik-team/jqwik/compare/1.8.4...1.8.5) --- updated-dependencies: - dependency-name: net.jqwik:jqwik dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- junit5-multiple-engines/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/junit5-multiple-engines/build.gradle.kts b/junit5-multiple-engines/build.gradle.kts index c62d34a3..e5e1f70b 100644 --- a/junit5-multiple-engines/build.gradle.kts +++ b/junit5-multiple-engines/build.gradle.kts @@ -48,7 +48,7 @@ dependencies { } // jqwik - testImplementation("net.jqwik:jqwik:1.8.4") { + testImplementation("net.jqwik:jqwik:1.8.5") { because("allows jqwik properties to run") } From 82cbcc8121c3b0c1d3e09fea46d476c2345fe222 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 May 2024 07:52:00 +0000 Subject: [PATCH 7/7] Bump jvm from 1.9.24 to 2.0.0 in /junit5-multiple-engines Bumps jvm from 1.9.24 to 2.0.0. --- updated-dependencies: - dependency-name: jvm dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- junit5-multiple-engines/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/junit5-multiple-engines/build.gradle.kts b/junit5-multiple-engines/build.gradle.kts index c62d34a3..b7ef7ba4 100644 --- a/junit5-multiple-engines/build.gradle.kts +++ b/junit5-multiple-engines/build.gradle.kts @@ -5,7 +5,7 @@ plugins { groovy eclipse // optional (to generate Eclipse project files) idea // optional (to generate IntelliJ IDEA project files) - kotlin("jvm") version "1.9.24" + kotlin("jvm") version "2.0.0" } repositories {