Skip to content

Commit 348bca4

Browse files
committed
MLE-27213 upgrade Spring to 7.
Upgrade Spring to version 7 (7.0.5) Upgrade gradle to 9.10 Upgrade junit and jupiter to supported version 6 (6.0.3) Make mods to a few classes to support new version of Spring 7. Update notice file with new Spring 7 dependency.
1 parent 8fe16ad commit 348bca4

File tree

23 files changed

+58
-51
lines changed

23 files changed

+58
-51
lines changed

NOTICE.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Progress® MarkLogic® Ml-gradle
22

3-
Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
3+
Copyright (c) 2015-2026 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
44

55
To the extent required by the applicable open-source license, a complete machine-readable copy of the source code
66
corresponding to such code is available upon request. This offer is valid to anyone in receipt of this information and
@@ -19,7 +19,7 @@ marklogic-client-api 8.0.0 (Apache-2.0)
1919
marklogic-xcc 12.0.0 (Apache-2.0)
2020
okhttp 5.2.0 (Apache-2.0)
2121
slf4j-api 2.0.17 (MIT)
22-
spring-web 6.2.12 (Apache-2.0)
22+
spring-web 7.0.5 (Apache-2.0)
2323
zjsonpatch 0.4.16 (Apache-2.0)
2424

2525
Third-Party Components
@@ -62,7 +62,7 @@ slf4j-api 2.0.17 (MIT)
6262
https://repo1.maven.org/maven2/org/slf4j/slf4j-api/
6363
For the full text of the MIT license, see MIT license (MIT)
6464

65-
spring-web 6.2.12 (Apache-2.0)
65+
spring-web 7.0.5 (Apache-2.0)
6666
https://repo1.maven.org/maven2/org/springframework/spring-web/
6767
For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0)
6868

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
1+
// Copyright (c) 2015-2026 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
22

33
// Defines common configuration for each of the 3 subprojects.
44
subprojects {
@@ -26,9 +26,9 @@ subprojects {
2626
dependencies {
2727
// Without this, once using JUnit 5.12 or higher, Gradle will not find any tests and report an error of:
2828
// org.junit.platform.commons.JUnitException: TestEngine with ID 'junit-jupiter' failed to discover tests
29-
testRuntimeOnly "org.junit.platform:junit-platform-launcher:1.14.0"
29+
testRuntimeOnly "org.junit.platform:junit-platform-launcher:${junitVersion}"
3030

31-
testImplementation 'org.junit.jupiter:junit-jupiter:5.14.0'
31+
testImplementation "org.junit.jupiter:junit-jupiter:${junitVersion}"
3232
testImplementation "org.springframework:spring-test:${springVersion}"
3333

3434
// Forcing Spring to use logback instead of commons-logging
2.35 KB
Binary file not shown.

examples/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

examples/gradlew

Lines changed: 1 addition & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/gradlew.bat

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradle.properties

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ version=6.2-SNAPSHOT
44
# This should match the version used by the MarkLogic Java Client.
55
jacksonVersion=2.20.0
66

7-
springVersion=6.2.12
7+
springVersion=7.0.5
8+
9+
junitVersion=6.0.3
810

911
# Define these on the command line to publish to OSSRH
1012
# See https://central.sonatype.org/publish/publish-gradle/#credentials for more information

gradle/wrapper/gradle-wrapper.jar

1.65 KB
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 1 addition & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)