Merge branch 'main' into feature/redis-disposalbean-to-lifecycle-3.3.x

Signed-off-by: seunghun.ham <[email protected]>

Author: seung-hun-h

.github/dco.yml

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

.github/dependabot.yml

@@ -9,7 +9,6 @@ updates:
 
   - package-ecosystem: "gradle"
     target-branch: "main"
-    milestone: 154
     directory: "/"
     schedule:
       interval: "daily"
@@ -24,11 +23,10 @@ updates:
       - dependency-name: "org.mockito:mockito-bom"
         update-types: [ "version-update:semver-major" ]
       - dependency-name: "*"
-        update-types: [ "version-update:semver-major",  "version-update:semver-minor" ]
+        update-types: [ "version-update:semver-major" ]
 
   - package-ecosystem: "gradle"
-    target-branch: "3.2.x"
-    milestone: 152
+    target-branch: "3.3.x"
     directory: "/"
     schedule:
       interval: "daily"
@@ -46,8 +44,7 @@ updates:
         update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
 
   - package-ecosystem: "gradle"
-    target-branch: "3.1.x"
-    milestone: 151
+    target-branch: "3.2.x"
     directory: "/"
     schedule:
       interval: "daily"
@@ -71,13 +68,13 @@ updates:
     schedule:
       interval: weekly
   - package-ecosystem: github-actions
-    target-branch: "3.2.x"
+    target-branch: "3.3.x"
     milestone: 152
     directory: "/"
     schedule:
       interval: weekly
   - package-ecosystem: github-actions
-    target-branch: "3.1.x"
+    target-branch: "3.2.x"
     milestone: 151
     directory: "/"
     schedule:
@@ -87,3 +84,9 @@ updates:
     directory: "/"
     schedule:
       interval: weekly
+
+  - package-ecosystem: npm
+    target-branch: docs-build
+    directory: /
+    schedule:
+      interval: weekly

.github/workflows/continuous-integration-workflow.yml

@@ -27,6 +27,7 @@ jobs:
     uses: spring-io/spring-security-release-tools/.github/workflows/deploy-artifacts.yml@v1
     with:
       should-deploy-artifacts: ${{ needs.build.outputs.should-deploy-artifacts }}
+      default-publish-milestones-central: true
     secrets: inherit
   deploy-docs:
     name: Deploy Docs
@@ -42,7 +43,7 @@ jobs:
     with:
       should-perform-release: ${{ needs.deploy-artifacts.outputs.artifacts-deployed }}
       project-version: ${{ needs.deploy-artifacts.outputs.project-version }}
-      milestone-repo-url: https://repo.spring.io/artifactory/milestone
+      milestone-repo-url: https://repo1.maven.org/maven2
       release-repo-url: https://repo1.maven.org/maven2
       artifact-path: org/springframework/session/spring-session-core
       slack-announcing-id: spring-session-announcing

.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.4.x, 3.3.x ]
     runs-on: ubuntu-latest
     steps:
       - name: Checkout

CONTRIBUTING.adoc

@@ -63,15 +63,15 @@ dependencies {
 
     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 'io.projectreactor:reactor-core:3.6.18'
     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.javaformat:spring-javaformat-gradle-plugin:0.0.47'
     implementation 'io.spring.nohttp:nohttp-gradle:0.0.11'
     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.33.23'
+    implementation 'org.jfrog.buildinfo:build-info-extractor-gradle:4.33.24'
     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

buildSrc/build.gradle

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2014-present the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of

buildSrc/src/main/groovy/io/spring/gradle/IncludeRepoTask.groovy

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2014-present the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2014-present the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 the original author or authors.
+ * Copyright 2014-present the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of