Merge branch '3.4.x' into 3.5.x

Author: jzheaux

spring-session-docs/antora.yml

@@ -7,7 +7,7 @@ nav:
 ext:
   collector:
     run:
-      command: gradlew -q -PbuildSrc.skipTests=true "-Dorg.gradle.jvmargs=-Xmx3g -XX:+HeapDumpOnOutOfMemoryError" :spring-session-docs:generateAntoraYml
+      command: gradlew -q -PbuildSrc.skipTests=true "-Dorg.gradle.jvmargs=-Xmx3g -XX:+HeapDumpOnOutOfMemoryError" :spring-session-docs:generateAntoraResources
       local: true
     scan:
       dir: ./build/generated-antora-resources

spring-session-docs/modules/ROOT/nav.adoc

@@ -1,4 +1,5 @@
 * xref:whats-new.adoc[What's New]
+* xref:attachment$api/java/index.html[Javadoc]
 * xref:samples.adoc[Samples & Guides (Start Here)]
 ** Boot Samples
 *** HttpSession

spring-session-docs/spring-session-docs.gradle

@@ -43,11 +43,22 @@ antora {
     options = [clean: true, fetch: !project.gradle.startParameter.offline, stacktrace: true]
 }
 
+tasks.register("syncAntoraAttachments", Sync) {
+    group = 'Documentation'
+    description = 'Syncs the Antora attachments'
+    from project.provider( { project.tasks.api.outputs } )
+    into project.layout.buildDirectory.dir('generated-antora-resources/modules/ROOT/assets/attachments/api/java')
+}
+
 tasks.named("generateAntoraYml") {
     asciidocAttributes = project.provider( { generateAttributes() } )
     asciidocAttributes.putAll(providers.provider( { resolvedVersions(project.configurations.testRuntimeClasspath) }))
 }
 
+tasks.register("generateAntoraResources") {
+    dependsOn 'generateAntoraYml', 'syncAntoraAttachments'
+}
+
 
 def generateAttributes() {
 	def springBootVersion = getLibVersion(libs.versions.org.springframework.boot.get())