Update antora version

Explicitly reference the logback.xml file to prevent gretty from configuring the defaults using groovy.

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

@@ -33,7 +33,7 @@ jobs:
       - name: Setup gradle user name
         run: |
           mkdir -p ~/.gradle
-          echo 'systemProp.user.name=spring-builds' >> ~/.gradle/gradle.properties
+          echo 'systemProp.user.name=spring-builds+github' >> ~/.gradle/gradle.properties
       - name: Cache Gradle packages
         uses: actions/cache@v2
         with:
@@ -59,7 +59,7 @@ jobs:
       - name: Setup gradle user name
         run: |
           mkdir -p ~/.gradle
-          echo 'systemProp.user.name=spring-builds' >> ~/.gradle/gradle.properties
+          echo 'systemProp.user.name=spring-builds+github' >> ~/.gradle/gradle.properties
       - name: Deploy artifacts
         run: |
           export GRADLE_ENTERPRISE_CACHE_USERNAME="$GRADLE_ENTERPRISE_CACHE_USER"
@@ -87,7 +87,7 @@ jobs:
       - name: Setup gradle user name
         run: |
           mkdir -p ~/.gradle
-          echo 'systemProp.user.name=spring-builds' >> ~/.gradle/gradle.properties
+          echo 'systemProp.user.name=spring-builds+github' >> ~/.gradle/gradle.properties
       - name: Deploy Docs
         run: |
           export GRADLE_ENTERPRISE_CACHE_USERNAME="$GRADLE_ENTERPRISE_CACHE_USER"

README.adoc

@@ -19,9 +19,9 @@ This Spring Session repository consists of the following modules:
 * Spring Session Data Redis - provides `SessionRepository` and `ReactiveSessionRepository` implementation backed by Redis and configuration support
 * Spring Session JDBC - provides `SessionRepository` implementation backed by a relational database and configuration support
 * Spring Session Hazelcast - provides `SessionRepository` implementation backed by Hazelcast and configuration support
+* Spring Session MongoDB - provides `SessionRepository` implementation backed by MongoDB and configuration support
 
-Additional Spring Session modules can be found in the https://github.com/spring-projects/spring-session-data-mongodb[spring-session-data-mongodb] repository
-and https://github.com/spring-projects/spring-session-data-geode[spring-session-data-geode] repository.
+Additional Spring Session modules can be found in the https://github.com/spring-projects/spring-session-data-geode[spring-session-data-geode] repository.
 
 == Getting Started
 

build.gradle

@@ -4,7 +4,7 @@ buildscript {
 		snapshotBuild = version.endsWith('SNAPSHOT')
 		milestoneBuild = !(releaseBuild || snapshotBuild)
 
-		springBootVersion = '2.5.5'
+		springBootVersion = '2.5.6'
 	}
 
 	repositories {

buildSrc/build.gradle

@@ -64,7 +64,7 @@ dependencies {
     implementation 'com.github.spullara.mustache.java:compiler:0.9.10'
     implementation 'io.spring.javaformat:spring-javaformat-gradle-plugin:0.0.15'
     implementation 'io.spring.nohttp:nohttp-gradle:0.0.9'
-    implementation 'net.sourceforge.htmlunit:htmlunit:2.37.0'
+    implementation 'net.sourceforge.htmlunit:htmlunit:2.55.0'
     implementation 'org.hidetake:gradle-ssh-plugin:2.10.1'
     implementation 'org.jfrog.buildinfo:build-info-extractor-gradle:4.24.20'
     implementation 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.7.1'

buildSrc/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle.properties

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

gradle/dependency-management.gradle

@@ -1,12 +1,12 @@
 dependencyManagement {
 	imports {
-		mavenBom 'io.projectreactor:reactor-bom:2020.0.12'
-		mavenBom 'com.fasterxml.jackson:jackson-bom:2.11.2'
-		mavenBom 'org.junit:junit-bom:5.8.1'
-		mavenBom 'org.springframework:spring-framework-bom:5.3.11'
-		mavenBom 'org.springframework.data:spring-data-bom:2021.1.0-RC1'
-		mavenBom 'org.springframework.security:spring-security-bom:5.6.0-RC1'
-		mavenBom 'org.testcontainers:testcontainers-bom:1.16.0'
+		mavenBom 'io.projectreactor:reactor-bom:2020.0.14'
+		mavenBom 'com.fasterxml.jackson:jackson-bom:2.13.0'
+		mavenBom 'org.junit:junit-bom:5.8.2'
+		mavenBom 'org.springframework:spring-framework-bom:5.3.14'
+		mavenBom 'org.springframework.data:spring-data-bom:2021.1.0'
+		mavenBom 'org.springframework.security:spring-security-bom:5.6.1'
+		mavenBom 'org.testcontainers:testcontainers-bom:1.16.2'
 	}
 
 	dependencies {
@@ -16,18 +16,18 @@ dependencyManagement {
 		}
 
 		dependency 'org.aspectj:aspectjweaver:1.9.7'
-		dependency 'ch.qos.logback:logback-core:1.2.3'
+		dependency 'ch.qos.logback:logback-core:1.2.9'
 		dependency 'com.google.code.findbugs:jsr305:3.0.2'
 		dependency 'com.h2database:h2:1.4.200'
 		dependency 'com.ibm.db2:jcc:11.5.6.0'
-		dependency 'com.microsoft.sqlserver:mssql-jdbc:9.4.0.jre8'
+		dependency 'com.microsoft.sqlserver:mssql-jdbc:9.4.1.jre8'
 		dependency 'com.oracle.database.jdbc:ojdbc8:21.3.0.0'
 		dependency 'com.zaxxer:HikariCP:3.4.5'
 		dependency 'edu.umd.cs.mtc:multithreadedtc:1.01'
 		dependency 'io.lettuce:lettuce-core:6.1.5.RELEASE'
 		dependency 'javax.annotation:javax.annotation-api:1.3.2'
 		dependency 'javax.servlet:javax.servlet-api:4.0.1'
-		dependency 'mysql:mysql-connector-java:8.0.26'
+		dependency 'mysql:mysql-connector-java:8.0.27'
 		dependency 'org.apache.derby:derby:10.14.2.0'
 		dependency 'org.assertj:assertj-core:3.21.0'
 		dependency 'org.hamcrest:hamcrest:2.1'
@@ -38,12 +38,12 @@ dependencyManagement {
 			entry 'mockito-junit-jupiter'
 		}
 
-		dependencySet(group: 'org.mongodb', version: '4.2.3') {
+		dependencySet(group: 'org.mongodb', version: '4.4.0') {
 			entry 'mongodb-driver-core'
 			entry 'mongodb-driver-sync'
 			entry 'mongodb-driver-reactivestreams'
 		}
-		dependency 'org.postgresql:postgresql:42.2.24'
+		dependency 'org.postgresql:postgresql:42.3.1'
 	}
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

spring-session-docs/antora-playbook.yml

@@ -9,7 +9,8 @@ content:
     - url: https://github.com/spring-io/spring-generated-docs
       branches: [spring-projects/spring-session/*]
     - url: https://github.com/spring-projects/spring-session
-      branches: [main]
+      branches: [main,3.0.x]
+      tags: ['2.6.*','!2.6.0-M*','!2.6.0-RC*']
       start_path: spring-session-docs
 urls:
   latest_version_segment_strategy: redirect:to

spring-session-docs/antora.yml

@@ -1,3 +1,2 @@
 name: ROOT
-version: '2.6.0'
-prerelease: '-SNAPSHOT'
+version: '2.6.1'

spring-session-docs/modules/ROOT/pages/guides/java-rest.adoc

@@ -170,7 +170,7 @@ You can now try to use the application. To do so, use your favorite REST client
 
 Note that you are prompted for basic authentication. Provide the following information for the username and password:
 
-* *Username* _user-
+* *Username* _user_
 * *Password* _password_
 
 Then run the following command:

spring-session-hazelcast/hazelcast4/hazelcast4.gradle

@@ -21,7 +21,7 @@ artifacts {
 
 dependencies {
     api project(':spring-session-core')
-    optional "com.hazelcast:hazelcast:4.2.2"
+    optional "com.hazelcast:hazelcast:4.2.3"
     api "org.springframework:spring-context"
     api "javax.annotation:javax.annotation-api"
 
@@ -35,7 +35,7 @@ dependencies {
     testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
 
     integrationTestCompile "org.testcontainers:testcontainers"
-    integrationTestCompile "com.hazelcast:hazelcast:4.2"
+    integrationTestCompile "com.hazelcast:hazelcast:4.2.3"
     integrationTestCompile project(":spring-session-hazelcast")
 }
 

spring-session-samples/gradle/dependency-management.gradle

@@ -4,7 +4,7 @@ dependencyManagement {
 	}
 
 	dependencies {
-		dependency 'ch.qos.logback:logback-classic:1.2.6'
+		dependency 'ch.qos.logback:logback-classic:1.2.9'
 		dependency 'com.maxmind.geoip2:geoip2:2.15.0'
 		dependency 'javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:1.2.2'
 		dependency 'javax.servlet.jsp:javax.servlet.jsp-api:2.3.3'

spring-session-samples/spring-session-sample-boot-hazelcast4/spring-session-sample-boot-hazelcast4.gradle

@@ -7,7 +7,7 @@ dependencies {
 	implementation  "org.springframework.boot:spring-boot-starter-actuator"
 	implementation  "org.springframework.boot:spring-boot-starter-thymeleaf"
 	implementation  "org.springframework.boot:spring-boot-starter-security"
-	implementation  "com.hazelcast:hazelcast:4.2.2"
+	implementation  "com.hazelcast:hazelcast:4.2.3"
 	implementation "nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect"
 	implementation "org.webjars:bootstrap"
 	implementation "org.webjars:html5shiv"

spring-session-samples/spring-session-sample-javaconfig-custom-cookie/spring-session-sample-javaconfig-custom-cookie.gradle

@@ -29,4 +29,5 @@ dependencies {
 
 gretty {
 	jvmArgs = ['-Dspring.profiles.active=embedded-redis']
+	logbackConfigFile = "src/main/resources/logback.xml"
 }

spring-session-samples/spring-session-sample-javaconfig-hazelcast/spring-session-sample-javaconfig-hazelcast.gradle

@@ -29,3 +29,7 @@ dependencies {
 	integrationTestCompile "org.seleniumhq.selenium:htmlunit-driver"
 	integrationTestCompile "org.seleniumhq.selenium:selenium-support"
 }
+
+gretty {
+	logbackConfigFile = "src/main/resources/logback.xml"
+}

spring-session-samples/spring-session-sample-javaconfig-jdbc/spring-session-sample-javaconfig-jdbc.gradle

@@ -25,3 +25,7 @@ dependencies {
 	integrationTestCompile "org.seleniumhq.selenium:htmlunit-driver"
 	integrationTestCompile "org.seleniumhq.selenium:selenium-support"
 }
+
+gretty {
+	logbackConfigFile = "src/main/resources/logback.xml"
+}

spring-session-samples/spring-session-sample-javaconfig-redis/spring-session-sample-javaconfig-redis.gradle

@@ -29,4 +29,5 @@ dependencies {
 
 gretty {
 	jvmArgs = ['-Dspring.profiles.active=embedded-redis']
+	logbackConfigFile = "src/main/resources/logback.xml"
 }

spring-session-samples/spring-session-sample-javaconfig-rest/spring-session-sample-javaconfig-rest.gradle

@@ -30,4 +30,5 @@ dependencies {
 gretty {
 	jvmArgs = ['-Dspring.profiles.active=embedded-redis']
 	servletContainer = 'tomcat9'
+	logbackConfigFile = "src/main/resources/logback.xml"
 }

spring-session-samples/spring-session-sample-javaconfig-security/spring-session-sample-javaconfig-security.gradle

@@ -33,4 +33,5 @@ dependencies {
 
 gretty {
 	jvmArgs = ['-Dspring.profiles.active=embedded-redis']
+	logbackConfigFile = "src/main/resources/logback.xml"
 }

spring-session-samples/spring-session-sample-misc-hazelcast/spring-session-sample-misc-hazelcast.gradle

@@ -24,3 +24,7 @@ dependencies {
 	integrationTestCompile "org.seleniumhq.selenium:htmlunit-driver"
 	integrationTestCompile "org.seleniumhq.selenium:selenium-support"
 }
+
+gretty {
+	logbackConfigFile = "src/main/resources/logback.xml"
+}

spring-session-samples/spring-session-sample-xml-jdbc/spring-session-sample-xml-jdbc.gradle

@@ -25,3 +25,7 @@ dependencies {
 	integrationTestCompile "org.seleniumhq.selenium:htmlunit-driver"
 	integrationTestCompile "org.seleniumhq.selenium:selenium-support"
 }
+
+gretty {
+	logbackConfigFile = "src/main/resources/logback.xml"
+}

spring-session-samples/spring-session-sample-xml-redis/spring-session-sample-xml-redis.gradle

@@ -29,4 +29,5 @@ dependencies {
 
 gretty {
 	jvmArgs = ['-Dspring.profiles.active=embedded-redis']
+	logbackConfigFile = "src/main/resources/logback.xml"
 }