Merge branch 'main' into 3299-fix-jdbc-session-special-characters-pro…

…blem

Signed-off-by: Rüdiger Schulz <[email protected]>

.github/dco.yml

@@ -0,0 +1,2 @@
+require:
+  members: false

.github/dependabot.yml

@@ -0,0 +1,92 @@
+version: 2
+
+registries:
+  spring-milestones:
+    type: maven-repository
+    url: https://repo.spring.io/milestone
+
+updates:
+
+  - package-ecosystem: "gradle"
+    target-branch: "main"
+    directory: "/"
+    schedule:
+      interval: "daily"
+      time: "03:00"
+      timezone: "Etc/UTC"
+    labels: [ "type: dependency-upgrade" ]
+    registries:
+      - "spring-milestones"
+    ignore:
+      - dependency-name: "org.junit:junit-bom"
+        update-types: [ "version-update:semver-major" ]
+      - dependency-name: "org.mockito:mockito-bom"
+        update-types: [ "version-update:semver-major" ]
+      - dependency-name: "*"
+        update-types: [ "version-update:semver-major" ]
+
+  - package-ecosystem: "gradle"
+    target-branch: "3.3.x"
+    directory: "/"
+    schedule:
+      interval: "daily"
+      time: "03:00"
+      timezone: "Etc/UTC"
+    labels: [ "type: dependency-upgrade" ]
+    registries:
+      - "spring-milestones"
+    ignore:
+      - dependency-name: "org.junit:junit-bom"
+        update-types: [ "version-update:semver-major" ]
+      - dependency-name: "org.mockito:mockito-bom"
+        update-types: [ "version-update:semver-major" ]
+      - dependency-name: "*"
+        update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
+
+  - package-ecosystem: "gradle"
+    target-branch: "3.2.x"
+    directory: "/"
+    schedule:
+      interval: "daily"
+      time: "03:00"
+      timezone: "Etc/UTC"
+    labels: [ "type: dependency-upgrade" ]
+    ignore:
+      - dependency-name: "org.junit:junit-bom"
+        update-types: [ "version-update:semver-major" ]
+      - dependency-name: "org.mockito:mockito-bom"
+        update-types: [ "version-update:semver-major" ]
+      - dependency-name: "*"
+        update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
+
+  #    GitHub Actions
+
+  - package-ecosystem: github-actions
+    target-branch: "main"
+    milestone: 154
+    directory: "/"
+    schedule:
+      interval: weekly
+  - package-ecosystem: github-actions
+    target-branch: "3.3.x"
+    milestone: 152
+    directory: "/"
+    schedule:
+      interval: weekly
+  - package-ecosystem: github-actions
+    target-branch: "3.2.x"
+    milestone: 151
+    directory: "/"
+    schedule:
+      interval: weekly
+  - package-ecosystem: github-actions
+    target-branch: "docs-build"
+    directory: "/"
+    schedule:
+      interval: weekly
+
+  - package-ecosystem: npm
+    target-branch: docs-build
+    directory: /
+    schedule:
+      interval: weekly

.github/workflows/release-scheduler.yml

@@ -14,7 +14,7 @@ jobs:
     strategy:
       matrix:
         # List of active maintenance branches.
-        branch: [ main, 3.2.x, 3.1.x ]
+        branch: [ main, 3.3.x, 3.2.x ]
     runs-on: ubuntu-latest
     steps:
       - name: Checkout

.github/workflows/update-antora-ui-spring.yml

@@ -0,0 +1,22 @@
+name: Update Antora UI Spring
+
+on:
+  schedule:
+    - cron: '0 10 * * *' # Once per day at 10am UTC
+  workflow_dispatch:
+
+permissions:
+  pull-requests: write
+  issues: write
+  contents: write
+
+jobs:
+  update-antora-ui-spring-docs-build:
+    runs-on: ubuntu-latest
+    name: Update on docs-build
+    steps:
+      - uses: spring-io/spring-doc-actions/update-antora-spring-ui@852920ba3fb1f28b35a2f13201133bc00ef33677
+        name: Update
+        with:
+          docs-branch: 'docs-build'
+          token: ${{ secrets.GITHUB_TOKEN }}

CONTRIBUTING.adoc

@@ -33,7 +33,7 @@ Switch to a branch named `<major>.<minor>.x` from the smallest milestone in the
 The spring team will ensure the code gets merged forward into additional branches.
 
 
-== Sign the Contributor License Agreement
-If you have not previously done so, please fill out and
-submit the https://cla.pivotal.io/sign/spring[Contributor License Agreement].
+== Add Signed-off-by Trailer
+All commits must include a __Signed-off-by__ trailer at the end of each commit message to indicate that the contributor agrees to the Developer Certificate of Origin.
+For additional details, please refer to the blog post https://spring.io/blog/2025/01/06/hello-dco-goodbye-cla-simplifying-contributions-to-spring[Hello DCO, Goodbye CLA: Simplifying Contributions to Spring].
 

build.gradle

@@ -24,6 +24,10 @@ buildscript {
 	}
 }
 
+plugins {
+	id "com.github.ben-manes.versions"
+}
+
 apply plugin: 'io.spring.convention.root'
 apply plugin: 'io.spring.security.release'
 
@@ -40,6 +44,11 @@ subprojects {
 	tasks.withType(Test) {
 		useJUnitPlatform()
 	}
+
+	// Spring Framework 6.1 requires -parameters to be able to introspect method parameter names
+	tasks.withType(JavaCompile) {
+		options.compilerArgs.add("-parameters")
+	}
 }
 
 nohttp {

buildSrc/build.gradle

@@ -7,7 +7,6 @@ plugins {
 sourceCompatibility = JavaVersion.VERSION_17
 
 repositories {
-    jcenter()
     gradlePluginPortal()
     mavenCentral()
     maven { url 'https://repo.spring.io/plugins-release/' }
@@ -57,32 +56,32 @@ configurations {
 }
 
 dependencies {
-    implementation 'com.google.code.gson:gson:2.8.9'
+    implementation 'com.google.code.gson:gson:2.10.1'
     implementation 'net.sourceforge.saxon:saxon:9.1.0.8'
-    implementation 'org.yaml:snakeyaml:1.30'
+    implementation 'org.yaml:snakeyaml:1.33'
     implementation localGroovy()
 
-    implementation 'io.github.gradle-nexus:publish-plugin:1.1.0'
-    implementation 'io.spring.gradle:dependency-management-plugin:1.0.15.RELEASE'
-    implementation 'io.projectreactor:reactor-core:3.4.38'
-    implementation 'com.apollographql.apollo:apollo-runtime:2.4.5'
-    implementation 'com.github.ben-manes:gradle-versions-plugin:0.38.0'
-    implementation 'com.github.spullara.mustache.java:compiler:0.9.13'
-    implementation 'io.spring.javaformat:spring-javaformat-gradle-plugin:0.0.41'
+    implementation 'io.github.gradle-nexus:publish-plugin:1.3.0'
+    implementation 'io.spring.gradle:dependency-management-plugin:1.1.7'
+    implementation 'io.projectreactor:reactor-core:3.6.13'
+    implementation 'com.apollographql.apollo:apollo-runtime:2.5.14'
+    implementation 'com.github.ben-manes:gradle-versions-plugin:0.51.0'
+    implementation 'com.github.spullara.mustache.java:compiler:0.9.14'
+    implementation 'io.spring.javaformat:spring-javaformat-gradle-plugin:0.0.43'
     implementation 'io.spring.nohttp:nohttp-gradle:0.0.11'
-    implementation 'net.sourceforge.htmlunit:htmlunit:2.37.0'
+    implementation 'net.sourceforge.htmlunit:htmlunit:2.70.0'
     implementation 'org.hidetake:gradle-ssh-plugin:2.10.1'
-    implementation 'org.jfrog.buildinfo:build-info-extractor-gradle:4.29.4'
-    implementation 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.7.1'
+    implementation 'org.jfrog.buildinfo:build-info-extractor-gradle:4.33.23'
+    implementation 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.8.0.1969'
     implementation libs.com.squareup.okhttp3.okhttp
     implementation libs.io.spring.security.release.plugin
 
-    testImplementation platform('org.junit:junit-bom:5.8.2')
+    testImplementation platform('org.junit:junit-bom:5.10.5')
     testImplementation "org.junit.jupiter:junit-jupiter-api"
     testImplementation "org.junit.jupiter:junit-jupiter-params"
     testImplementation "org.junit.jupiter:junit-jupiter-engine"
     testImplementation 'org.apache.commons:commons-io:1.3.2'
-    testImplementation 'org.assertj:assertj-core:3.21.0'
+    testImplementation 'org.assertj:assertj-core:3.25.3'
     testImplementation 'org.mockito:mockito-core:3.12.4'
     testImplementation 'org.mockito:mockito-junit-jupiter:3.12.4'
     testImplementation 'com.squareup.okhttp3:mockwebserver:3.14.9'

buildSrc/src/main/groovy/io/spring/gradle/convention/RepositoryConventionPlugin.groovy

@@ -35,11 +35,6 @@ class RepositoryConventionPlugin implements Plugin<Project> {
 				mavenLocal()
 			}
 			mavenCentral()
-			jcenter() {
-				content {
-					includeGroup "org.gretty"
-				}
-			}
 			if (isSnapshot) {
 				maven {
 					name = 'artifactory-snapshot'

buildSrc/src/main/java/org/springframework/gradle/maven/PublishLocalPlugin.java

@@ -1,9 +1,7 @@
 package org.springframework.gradle.maven;
 
-import org.gradle.api.Action;
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
-import org.gradle.api.artifacts.repositories.MavenArtifactRepository;
 import org.gradle.api.publish.PublishingExtension;
 import org.gradle.api.publish.maven.plugins.MavenPublishPlugin;
 
@@ -12,18 +10,12 @@
 public class PublishLocalPlugin implements Plugin<Project> {
 	@Override
 	public void apply(Project project) {
-		project.getPlugins().withType(MavenPublishPlugin.class).all(new Action<MavenPublishPlugin>() {
-			@Override
-			public void execute(MavenPublishPlugin mavenPublish) {
-				PublishingExtension publishing = project.getExtensions().getByType(PublishingExtension.class);
-				publishing.getRepositories().maven(new Action<MavenArtifactRepository>() {
-					@Override
-					public void execute(MavenArtifactRepository maven) {
-						maven.setName("local");
-						maven.setUrl(new File(project.getRootProject().getBuildDir(), "publications/repos"));
-					}
-				});
-			}
+		project.getPlugins().withType(MavenPublishPlugin.class).all(mavenPublish -> {
+			PublishingExtension publishing = project.getExtensions().getByType(PublishingExtension.class);
+			publishing.getRepositories().maven(maven -> {
+				maven.setName("local");
+				maven.setUrl(new File(project.getRootProject().getBuildDir(), "publications/repos"));
+			});
 		});
 	}
 }

buildSrc/src/test/java/io/spring/gradle/convention/JavadocApiPluginITest.java

@@ -9,6 +9,7 @@
 import org.junit.jupiter.api.io.TempDir;
 
 import java.io.File;
+import java.nio.charset.Charset;
 import java.nio.file.Path;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -30,7 +31,7 @@ public void multiModuleApi() throws Exception {
         File allClasses = new File(testKit.getRootDir(), "build/api/allclasses-noframe.html");
 		File index = new File(testKit.getRootDir(), "build/api/allclasses-index.html");
 		File listing = allClasses.exists() ? allClasses : index;
-		String listingText = FileUtils.readFileToString(listing);
+		String listingText = FileUtils.readFileToString(listing, Charset.defaultCharset());
 		assertThat(listingText).contains("sample/Api.html");
         assertThat(listingText).contains("sample/Impl.html");
 		assertThat(listingText).doesNotContain("sample/Sample.html");

buildSrc/src/test/java/io/spring/gradle/convention/SpringMavenPluginITest.java

@@ -9,6 +9,7 @@
 import org.junit.jupiter.api.io.TempDir;
 
 import java.io.File;
+import java.nio.charset.Charset;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.LinkedHashMap;
@@ -56,6 +57,6 @@ public void signArchivesWhenInMemory() throws Exception {
 	}
 
     public String getSigningKey() throws Exception {
-		return IOUtils.toString(getClass().getResource("/test-private.pgp"));
+		return IOUtils.toString(getClass().getResource("/test-private.pgp"), Charset.defaultCharset());
 	}
 }

git/hooks/prepare-forward-merge

@@ -4,7 +4,7 @@ require 'net/http'
 require 'yaml'
 require 'logger'
 
-$main_branch = "3.1.x"
+$main_branch = "3.4.x"
 
 $log = Logger.new(STDOUT)
 $log.level = Logger::WARN

gradle.properties

@@ -1,3 +1,3 @@
-org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 org.gradle.parallel=true
-version=3.1.7-SNAPSHOT
+version=3.4.2-SNAPSHOT