Skip to content

Commit 8bebdae

Browse files
rjrudinrjrudin
committed
MLE-12345 Updated JUnit to 5.13.4
Brought back fix for Gradle deprecation warning as well. Updated Gradle wrapper to latest version too - 8.14.3. And gave up on trying to ignore Spring dependencies from marklogic-junit5 - just cloned the one class we need.
1 parent 56de795 commit 8bebdae

File tree

9 files changed

+217
-119
lines changed

9 files changed

+217
-119
lines changed

‎gradle/wrapper/gradle-wrapper.jar

-16.6 KB
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
46
zipStoreBase=GRADLE_USER_HOME
57
zipStorePath=wrapper/dists

‎gradlew

Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
# See the License for the specific language governing permissions and
1616
# limitations under the License.
1717
#
18+
# SPDX-License-Identifier: Apache-2.0
19+
#
1820

1921
##############################################################################
2022
#
@@ -55,7 +57,7 @@
5557
# Darwin, MinGW, and NonStop.
5658
#
5759
# (3) This script is generated from the Groovy template
58-
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
60+
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
5961
# within the Gradle project.
6062
#
6163
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +82,11 @@ do
8082
esac
8183
done
8284

83-
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
84-
85-
APP_NAME="Gradle"
85+
# This is normally unused
86+
# shellcheck disable=SC2034
8687
APP_BASE_NAME=${0##*/}
87-
88-
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
89-
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
88+
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
9090

9191
# Use the maximum available, or set MAX_FD != -1 to use that value.
9292
MAX_FD=maximum
@@ -114,7 +114,7 @@ case "$( uname )" in #(
114114
NONSTOP* ) nonstop=true ;;
115115
esac
116116

117-
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
117+
CLASSPATH="\\\"\\\""
118118

119119

120120
# Determine the Java command to use to start the JVM.
@@ -133,22 +133,29 @@ location of your Java installation."
133133
fi
134134
else
135135
JAVACMD=java
136-
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
136+
if ! command -v java >/dev/null 2>&1
137+
then
138+
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
137139
138140
Please set the JAVA_HOME variable in your environment to match the
139141
location of your Java installation."
142+
fi
140143
fi
141144

142145
# Increase the maximum file descriptors if we can.
143146
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
144147
case $MAX_FD in #(
145148
max*)
149+
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
150+
# shellcheck disable=SC2039,SC3045
146151
MAX_FD=$( ulimit -H -n ) ||
147152
warn "Could not query maximum file descriptor limit"
148153
esac
149154
case $MAX_FD in #(
150155
'' | soft) :;; #(
151156
*)
157+
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
158+
# shellcheck disable=SC2039,SC3045
152159
ulimit -n "$MAX_FD" ||
153160
warn "Could not set maximum file descriptor limit to $MAX_FD"
154161
esac
@@ -193,16 +200,20 @@ if "$cygwin" || "$msys" ; then
193200
done
194201
fi
195202

196-
# Collect all arguments for the java command;
197-
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
198-
# shell script including quotes and variable substitutions, so put them in
199-
# double quotes to make sure that they get re-expanded; and
200-
# * put everything else in single quotes, so that it's not re-expanded.
203+
204+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
205+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
206+
207+
# Collect all arguments for the java command:
208+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
209+
# and any embedded shellness will be escaped.
210+
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
211+
# treated as '${Hostname}' itself on the command line.
201212

202213
set -- \
203214
"-Dorg.gradle.appname=$APP_BASE_NAME" \
204215
-classpath "$CLASSPATH" \
205-
org.gradle.wrapper.GradleWrapperMain \
216+
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
206217
"$@"
207218

208219
# Stop when "xargs" is not available.

‎gradlew.bat

Lines changed: 94 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -1,91 +1,94 @@
1-
@rem
2-
@rem Copyright 2015 the original author or authors.
3-
@rem
4-
@rem Licensed under the Apache License, Version 2.0 (the "License");
5-
@rem you may not use this file except in compliance with the License.
6-
@rem You may obtain a copy of the License at
7-
@rem
8-
@rem https://www.apache.org/licenses/LICENSE-2.0
9-
@rem
10-
@rem Unless required by applicable law or agreed to in writing, software
11-
@rem distributed under the License is distributed on an "AS IS" BASIS,
12-
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
@rem See the License for the specific language governing permissions and
14-
@rem limitations under the License.
15-
@rem
16-
17-
@if "%DEBUG%"=="" @echo off
18-
@rem ##########################################################################
19-
@rem
20-
@rem Gradle startup script for Windows
21-
@rem
22-
@rem ##########################################################################
23-
24-
@rem Set local scope for the variables with windows NT shell
25-
if "%OS%"=="Windows_NT" setlocal
26-
27-
set DIRNAME=%~dp0
28-
if "%DIRNAME%"=="" set DIRNAME=.
29-
set APP_BASE_NAME=%~n0
30-
set APP_HOME=%DIRNAME%
31-
32-
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
33-
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
34-
35-
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
36-
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
37-
38-
@rem Find java.exe
39-
if defined JAVA_HOME goto findJavaFromJavaHome
40-
41-
set JAVA_EXE=java.exe
42-
%JAVA_EXE% -version >NUL 2>&1
43-
if %ERRORLEVEL% equ 0 goto execute
44-
45-
echo.
46-
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
47-
echo.
48-
echo Please set the JAVA_HOME variable in your environment to match the
49-
echo location of your Java installation.
50-
51-
goto fail
52-
53-
:findJavaFromJavaHome
54-
set JAVA_HOME=%JAVA_HOME:"=%
55-
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
56-
57-
if exist "%JAVA_EXE%" goto execute
58-
59-
echo.
60-
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
61-
echo.
62-
echo Please set the JAVA_HOME variable in your environment to match the
63-
echo location of your Java installation.
64-
65-
goto fail
66-
67-
:execute
68-
@rem Setup the command line
69-
70-
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
71-
72-
73-
@rem Execute Gradle
74-
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
75-
76-
:end
77-
@rem End local scope for the variables with windows NT shell
78-
if %ERRORLEVEL% equ 0 goto mainEnd
79-
80-
:fail
81-
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
82-
rem the _cmd.exe /c_ return code!
83-
set EXIT_CODE=%ERRORLEVEL%
84-
if %EXIT_CODE% equ 0 set EXIT_CODE=1
85-
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
86-
exit /b %EXIT_CODE%
87-
88-
:mainEnd
89-
if "%OS%"=="Windows_NT" endlocal
90-
91-
:omega
1+
@rem
2+
@rem Copyright 2015 the original author or authors.
3+
@rem
4+
@rem Licensed under the Apache License, Version 2.0 (the "License");
5+
@rem you may not use this file except in compliance with the License.
6+
@rem You may obtain a copy of the License at
7+
@rem
8+
@rem https://www.apache.org/licenses/LICENSE-2.0
9+
@rem
10+
@rem Unless required by applicable law or agreed to in writing, software
11+
@rem distributed under the License is distributed on an "AS IS" BASIS,
12+
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
@rem See the License for the specific language governing permissions and
14+
@rem limitations under the License.
15+
@rem
16+
@rem SPDX-License-Identifier: Apache-2.0
17+
@rem
18+
19+
@if "%DEBUG%"=="" @echo off
20+
@rem ##########################################################################
21+
@rem
22+
@rem Gradle startup script for Windows
23+
@rem
24+
@rem ##########################################################################
25+
26+
@rem Set local scope for the variables with windows NT shell
27+
if "%OS%"=="Windows_NT" setlocal
28+
29+
set DIRNAME=%~dp0
30+
if "%DIRNAME%"=="" set DIRNAME=.
31+
@rem This is normally unused
32+
set APP_BASE_NAME=%~n0
33+
set APP_HOME=%DIRNAME%
34+
35+
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
36+
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
37+
38+
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
39+
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
40+
41+
@rem Find java.exe
42+
if defined JAVA_HOME goto findJavaFromJavaHome
43+
44+
set JAVA_EXE=java.exe
45+
%JAVA_EXE% -version >NUL 2>&1
46+
if %ERRORLEVEL% equ 0 goto execute
47+
48+
echo. 1>&2
49+
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
50+
echo. 1>&2
51+
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
52+
echo location of your Java installation. 1>&2
53+
54+
goto fail
55+
56+
:findJavaFromJavaHome
57+
set JAVA_HOME=%JAVA_HOME:"=%
58+
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
59+
60+
if exist "%JAVA_EXE%" goto execute
61+
62+
echo. 1>&2
63+
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
64+
echo. 1>&2
65+
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
66+
echo location of your Java installation. 1>&2
67+
68+
goto fail
69+
70+
:execute
71+
@rem Setup the command line
72+
73+
set CLASSPATH=
74+
75+
76+
@rem Execute Gradle
77+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
78+
79+
:end
80+
@rem End local scope for the variables with windows NT shell
81+
if %ERRORLEVEL% equ 0 goto mainEnd
82+
83+
:fail
84+
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
85+
rem the _cmd.exe /c_ return code!
86+
set EXIT_CODE=%ERRORLEVEL%
87+
if %EXIT_CODE% equ 0 set EXIT_CODE=1
88+
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
89+
exit /b %EXIT_CODE%
90+
91+
:mainEnd
92+
if "%OS%"=="Windows_NT" endlocal
93+
94+
:omega

‎marklogic-client-api-functionaltests/build.gradle

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,12 @@ dependencies {
3333
}
3434

3535
testImplementation 'ch.qos.logback:logback-classic:1.3.15'
36-
testImplementation 'org.junit.jupiter:junit-jupiter:5.11.1'
36+
testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
3737
testImplementation 'org.xmlunit:xmlunit-legacy:2.10.0'
38+
39+
// Without this, once using JUnit 5.12 or higher, Gradle will not find any tests and report an error of:
40+
// org.junit.platform.commons.JUnitException: TestEngine with ID 'junit-jupiter' failed to discover tests
41+
testRuntimeOnly "org.junit.platform:junit-platform-launcher:1.13.4"
3842
}
3943

4044
tasks.register("runFragileTests", Test) {

‎marklogic-client-api/build.gradle

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ dependencies {
3939
compileOnly 'org.dom4j:dom4j:2.1.4'
4040
compileOnly 'com.google.code.gson:gson:2.10.1'
4141

42-
testImplementation 'org.junit.jupiter:junit-jupiter:5.11.1'
42+
testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
43+
4344
// Forcing junit version to avoid vulnerability with older version in xmlunit
4445
testImplementation 'junit:junit:4.13.2'
4546
testImplementation 'org.xmlunit:xmlunit-legacy:2.10.0'
@@ -64,17 +65,18 @@ dependencies {
6465
// Using this to avoid a schema validation issue with the regular xercesImpl
6566
testImplementation 'org.opengis.cite.xerces:xercesImpl-xsd11:2.12-beta-r1667115'
6667

67-
testImplementation ('com.opencsv:opencsv:5.11.2') {
68+
testImplementation('com.opencsv:opencsv:5.11.2') {
6869
// Excluding this due to a security vulnerability, and the test for the example that uses this library
6970
// passes without this on the classpath.
7071
exclude module: "commons-beanutils"
7172
}
7273
testImplementation 'org.skyscreamer:jsonassert:1.5.3'
7374

74-
// Commenting out for now as it prevents tests from being runnable in Intellij.
7575
// Automatic loading of test framework implementation dependencies is deprecated.
7676
// https://docs.gradle.org/current/userguide/upgrading_version_8.html#test_framework_implementation_dependencies
77-
// testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.13.4")
77+
// Without this, once using JUnit 5.12 or higher, Gradle will not find any tests and report an error of:
78+
// org.junit.platform.commons.JUnitException: TestEngine with ID 'junit-jupiter' failed to discover tests
79+
testRuntimeOnly "org.junit.platform:junit-platform-launcher:1.13.4"
7880
}
7981

8082
// Ensure that mlHost and mlPassword can override the defaults of localhost/admin if they've been modified

‎ml-development-tools/build.gradle

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,6 @@ dependencies {
2424
testCompileOnly gradleTestKit()
2525

2626
testImplementation 'com.squareup.okhttp3:okhttp:4.12.0'
27-
28-
// We need the MarkLogicVersion class, but that has no dependencies and so we exclude all dependencies from
29-
// this, in particular to avoid vulnerabilities on Spring 5.x libraries.
30-
testImplementation ("com.marklogic:marklogic-junit5:1.5.0") {
31-
transitive = false
32-
}
3327
}
3428

3529
// Added to avoid problem where processResources fails because - somehow - the plugin properties file is getting

0 commit comments

Comments
 (0)