Merge branch 'spring-projects:main' into fix/content-type-inference

Author: banseok1216

spring-restdocs-docs/build.gradle

@@ -53,21 +53,24 @@ configurations {
 }
 
 def aggregatedJavadoc = tasks.register('aggregatedJavadoc', Javadoc) {
-	// dependsOn configurations.resolvedBom
 	destinationDir = project.file(project.layout.buildDirectory.dir("docs/javadoc"))
 	source = configurations.javadocSource
 	classpath = configurations.javadocClasspath
 	include("**/*.java")
 	options {
 		author = true
 		docTitle = "Spring REST Docs ${project.version} API"
+		links = [
+			"https://docs.spring.io/spring-framework/docs/$springFrameworkVersion/javadoc-api/",
+			"https://docs.hibernate.org/validator/9.0/api/",
+			"https://jakarta.ee/specifications/bean-validation/3.1/apidocs/"
+		] as String[]
 		memberLevel = "protected"
 		outputLevel = "quiet"
 		splitIndex = true
 		use = true
 		windowTitle = "Spring REST Docs ${project.version} API"
 	}
-	// doFirst(new ConfigureJavadocLinks(configurations.resolvedBom, ["Spring Framework", "Spring Security", "Tomcat"]))
 }
 
 project.rootProject.gradle.projectsEvaluated {

spring-restdocs-docs/src/docs/antora/modules/tutorial/pages/getting-started/index.adoc

@@ -35,7 +35,7 @@ Maven::
 			<plugin> <2>
 				<groupId>org.asciidoctor</groupId>
 				<artifactId>asciidoctor-maven-plugin</artifactId>
-				<version>2.2.1</version>
+				<version>3.2.0</version>
 				<executions>
 					<execution>
 						<id>generate-docs</id>
@@ -74,46 +74,51 @@ Gradle::
 [source,indent=0,subs="verbatim,attributes"]
 ----
 	plugins { <1>
-		id "org.asciidoctor.jvm.convert" version "3.3.2"
+		id "org.asciidoctor.jvm.convert" version "4.0.5"
+	}
+
+	asciidoctorj { <2>
+		version = "3.0.0"
 	}
 
 	configurations {
-		asciidoctorExt <2>
+		asciidoctorExt <3>
 	}
 
 	dependencies {
-		asciidoctorExt 'org.springframework.restdocs:spring-restdocs-asciidoctor:{project-version}' <3>
-		testImplementation 'org.springframework.restdocs:spring-restdocs-mockmvc:{project-version}' <4>
+		asciidoctorExt 'org.springframework.restdocs:spring-restdocs-asciidoctor:{project-version}' <4>
+		testImplementation 'org.springframework.restdocs:spring-restdocs-mockmvc:{project-version}' <5>
 	}
 
-	ext { <5>
+	ext { <6>
 		snippetsDir = file('build/generated-snippets')
 	}
 
-	test { <6>
+	tasks.named("test") { <7>
 		outputs.dir snippetsDir
 	}
 
-	asciidoctor { <7>
-		inputs.dir snippetsDir <8>
-		configurations 'asciidoctorExt' <9>
-		dependsOn test <10>
+	tasks.named("asciidoctor") { <8>
+		inputs.dir snippetsDir <9>
+		configurations 'asciidoctorExt' <10>
+		dependsOn test <11>
 	}
 ----
 <1> Apply the Asciidoctor plugin.
-<2> Declare the `asciidoctorExt` configuration for dependencies that extend Asciidoctor.
-<3> Add a dependency on `spring-restdocs-asciidoctor` in the `asciidoctorExt` configuration.
+<2> Configure the Asciidoctor plugin to use the required version of AsciidoctorJ.
+<3> Declare the `asciidoctorExt` configuration for dependencies that extend Asciidoctor.
+<4> Add a dependency on `spring-restdocs-asciidoctor` in the `asciidoctorExt` configuration.
 This will automatically configure the `snippets` attribute for use in your `.adoc` files to point to `build/generated-snippets`.
 It will also allow you to use the `operation` block macro.
 It requires AsciidoctorJ 3.0.
-<4> Add a dependency on `spring-restdocs-mockmvc` in the `testImplementation` configuration.
+<5> Add a dependency on `spring-restdocs-mockmvc` in the `testImplementation` configuration.
 If you want to use `WebTestClient` rather than MockMvc, add a dependency on `spring-restdocs-webtestclient` instead.
-<5> Configure a `snippetsDir` property that defines the output location for generated snippets.
-<6> Make Gradle aware that running the `test` task will write output to the snippetsDir. This is required for https://docs.gradle.org/current/userguide/incremental_build.html[incremental builds].
-<7> Configure the `asciidoctor` task.
-<8> Make Gradle aware that running the task will read input from the snippetsDir. This is required for https://docs.gradle.org/current/userguide/incremental_build.html[incremental builds].
-<9> Configure the use of the `asciidoctorExt` configuration for extensions.
-<10> Make the task depend on the `test` task so that the tests are run before the documentation is created.
+<6> Configure a `snippetsDir` property that defines the output location for generated snippets.
+<7> Make Gradle aware that running the `test` task will write output to the snippetsDir. This is required for https://docs.gradle.org/current/userguide/incremental_build.html[incremental builds].
+<8> Configure the `asciidoctor` task.
+<9> Make Gradle aware that running the task will read input from the snippetsDir. This is required for https://docs.gradle.org/current/userguide/incremental_build.html[incremental builds].
+<10> Configure the use of the `asciidoctorExt` configuration for extensions.
+<11> Make the task depend on the `test` task so that the tests are run before the documentation is created.
 ====
 
 

spring-restdocs-mockmvc/src/main/java/org/springframework/restdocs/mockmvc/MockMvcResponseConverter.java

@@ -107,7 +107,6 @@ private String generateSetCookieHeader(Cookie cookie) {
 
 	private void appendIfAvailable(StringBuilder header, String value) {
 		if (StringUtils.hasText(value)) {
-			header.append("");
 			header.append(value);
 		}
 	}