From aeb5bc545cee6f87775293c698f87a5bfaa5b62e Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Mon, 15 Nov 2021 09:59:22 +0100 Subject: [PATCH 001/108] Update to Gradle 7.3 Closes gh-1959 --- buildSrc/gradle/wrapper/gradle-wrapper.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/buildSrc/gradle/wrapper/gradle-wrapper.properties b/buildSrc/gradle/wrapper/gradle-wrapper.properties index ffed3a25..e750102e 100644 --- a/buildSrc/gradle/wrapper/gradle-wrapper.properties +++ b/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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ffed3a25..e750102e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/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 From 004466ed0727bf90ca0eb439d90289683b3ba060 Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Tue, 16 Nov 2021 13:04:32 +0100 Subject: [PATCH 002/108] Upgrade Reactor to 2020.0.13 Closes gh-1961 --- gradle/dependency-management.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle index b8e07dd7..cd87d448 100644 --- a/gradle/dependency-management.gradle +++ b/gradle/dependency-management.gradle @@ -1,7 +1,7 @@ dependencyManagement { imports { - mavenBom 'io.projectreactor:reactor-bom:2020.0.12' mavenBom 'com.fasterxml.jackson:jackson-bom:2.11.2' + mavenBom 'io.projectreactor:reactor-bom:2020.0.13' 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' From addbdbc1a2980d8fcf9c12aad01c8f44a1c7b7d8 Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Tue, 16 Nov 2021 13:05:51 +0100 Subject: [PATCH 003/108] Upgrade Spring Framework to 5.3.13 Closes gh-1962 --- gradle/dependency-management.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle index cd87d448..d5926aeb 100644 --- a/gradle/dependency-management.gradle +++ b/gradle/dependency-management.gradle @@ -3,10 +3,10 @@ dependencyManagement { mavenBom 'com.fasterxml.jackson:jackson-bom:2.11.2' mavenBom 'io.projectreactor:reactor-bom:2020.0.13' 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 'org.springframework:spring-framework-bom:5.3.13' } dependencies { From 722069a5f83a9b4cd8bfd0084c52ee87c839caf4 Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Tue, 16 Nov 2021 13:06:41 +0100 Subject: [PATCH 004/108] Upgrade Spring Data to 2021.1.0 Closes gh-1963 --- gradle/dependency-management.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle index d5926aeb..7cb653b1 100644 --- a/gradle/dependency-management.gradle +++ b/gradle/dependency-management.gradle @@ -3,10 +3,10 @@ dependencyManagement { mavenBom 'com.fasterxml.jackson:jackson-bom:2.11.2' mavenBom 'io.projectreactor:reactor-bom:2020.0.13' mavenBom 'org.junit:junit-bom:5.8.1' - 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 'org.springframework:spring-framework-bom:5.3.13' + mavenBom 'org.springframework.data:spring-data-bom:2021.1.0' } dependencies { From 7832942752b671a68d9b8bce0b3a9052459f19db Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Tue, 16 Nov 2021 13:07:43 +0100 Subject: [PATCH 005/108] Upgrade Spring Security to 5.6.0 Closes gh-1964 --- gradle/dependency-management.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle index 7cb653b1..ee2a61eb 100644 --- a/gradle/dependency-management.gradle +++ b/gradle/dependency-management.gradle @@ -3,10 +3,10 @@ dependencyManagement { mavenBom 'com.fasterxml.jackson:jackson-bom:2.11.2' mavenBom 'io.projectreactor:reactor-bom:2020.0.13' mavenBom 'org.junit:junit-bom:5.8.1' - mavenBom 'org.springframework.security:spring-security-bom:5.6.0-RC1' mavenBom 'org.testcontainers:testcontainers-bom:1.16.0' mavenBom 'org.springframework:spring-framework-bom:5.3.13' mavenBom 'org.springframework.data:spring-data-bom:2021.1.0' + mavenBom 'org.springframework.security:spring-security-bom:5.6.0' } dependencies { From 98f656ad46b5551ff82138ed0a47e6c69d4f53e8 Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Tue, 16 Nov 2021 13:11:51 +0100 Subject: [PATCH 006/108] Upgrade Jackson to 2.13.0 Closes gh-1965 --- gradle/dependency-management.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle index ee2a61eb..e439d3a7 100644 --- a/gradle/dependency-management.gradle +++ b/gradle/dependency-management.gradle @@ -1,7 +1,7 @@ dependencyManagement { imports { - mavenBom 'com.fasterxml.jackson:jackson-bom:2.11.2' mavenBom 'io.projectreactor:reactor-bom:2020.0.13' + mavenBom 'com.fasterxml.jackson:jackson-bom:2.13.0' mavenBom 'org.junit:junit-bom:5.8.1' mavenBom 'org.testcontainers:testcontainers-bom:1.16.0' mavenBom 'org.springframework:spring-framework-bom:5.3.13' From bcf17ba3b7b3e988ea3c7f17e857b50faf33bb45 Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Tue, 16 Nov 2021 13:37:41 +0100 Subject: [PATCH 007/108] Upgrade samples to Spring Boot 2.5.6 Closes gh-1966 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index e415ab1a..b60b7f6c 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ buildscript { snapshotBuild = version.endsWith('SNAPSHOT') milestoneBuild = !(releaseBuild || snapshotBuild) - springBootVersion = '2.5.5' + springBootVersion = '2.5.6' } repositories { From 33812f719738aba272483c8816a7b3edd094b628 Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Tue, 16 Nov 2021 13:56:44 +0100 Subject: [PATCH 008/108] Upgrade MongoDB to 4.4.0 Closes gh-1967 --- gradle/dependency-management.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle index e439d3a7..1e80bce2 100644 --- a/gradle/dependency-management.gradle +++ b/gradle/dependency-management.gradle @@ -38,7 +38,7 @@ 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' From 134f89dd417bfb0db8d8827f2ff995da40f2c36f Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Tue, 16 Nov 2021 13:57:45 +0100 Subject: [PATCH 009/108] Upgrade test dependencies --- buildSrc/build.gradle | 2 +- gradle/dependency-management.gradle | 6 +++--- spring-session-samples/gradle/dependency-management.gradle | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index b4ac6088..4a44d6b3 100644 --- a/buildSrc/build.gradle +++ b/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' diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle index 1e80bce2..ff45a03b 100644 --- a/gradle/dependency-management.gradle +++ b/gradle/dependency-management.gradle @@ -3,10 +3,10 @@ dependencyManagement { mavenBom 'io.projectreactor:reactor-bom:2020.0.13' mavenBom 'com.fasterxml.jackson:jackson-bom:2.13.0' mavenBom 'org.junit:junit-bom:5.8.1' - mavenBom 'org.testcontainers:testcontainers-bom:1.16.0' mavenBom 'org.springframework:spring-framework-bom:5.3.13' mavenBom 'org.springframework.data:spring-data-bom:2021.1.0' mavenBom 'org.springframework.security:spring-security-bom:5.6.0' + mavenBom 'org.testcontainers:testcontainers-bom:1.16.2' } dependencies { @@ -27,7 +27,7 @@ dependencyManagement { 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' @@ -43,7 +43,7 @@ dependencyManagement { entry 'mongodb-driver-sync' entry 'mongodb-driver-reactivestreams' } - dependency 'org.postgresql:postgresql:42.2.24' + dependency 'org.postgresql:postgresql:42.3.1' } } diff --git a/spring-session-samples/gradle/dependency-management.gradle b/spring-session-samples/gradle/dependency-management.gradle index 26b3d75c..66f56e0a 100644 --- a/spring-session-samples/gradle/dependency-management.gradle +++ b/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.7' 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' From 76924bc9238a784d603c7e69e1885247c32ad60b Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Tue, 16 Nov 2021 14:21:51 +0100 Subject: [PATCH 010/108] Release 2.6.0 --- gradle.properties | 2 +- spring-session-docs/antora.yml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index f665f118..1d6723cc 100644 --- a/gradle.properties +++ b/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.0 diff --git a/spring-session-docs/antora.yml b/spring-session-docs/antora.yml index 9a0f2c28..62c9efe6 100644 --- a/spring-session-docs/antora.yml +++ b/spring-session-docs/antora.yml @@ -1,3 +1,2 @@ name: ROOT version: '2.6.0' -prerelease: '-SNAPSHOT' From 7807aa9f3c9641492581f09faf7266d374778d59 Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Tue, 16 Nov 2021 18:56:49 +0100 Subject: [PATCH 011/108] Next development version --- gradle.properties | 2 +- spring-session-docs/antora.yml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 1d6723cc..4e268d6d 100644 --- a/gradle.properties +++ b/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 +version=2.6.1-SNAPSHOT diff --git a/spring-session-docs/antora.yml b/spring-session-docs/antora.yml index 62c9efe6..6b1de1aa 100644 --- a/spring-session-docs/antora.yml +++ b/spring-session-docs/antora.yml @@ -1,2 +1,3 @@ name: ROOT -version: '2.6.0' +version: '2.6.1' +prerelease: '-SNAPSHOT' From 6f823805f22e633c93971a961ee67596620c7ee8 Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Wed, 17 Nov 2021 11:04:55 +0100 Subject: [PATCH 012/108] Include 2.6.8 release in docs --- spring-session-docs/antora-playbook.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/spring-session-docs/antora-playbook.yml b/spring-session-docs/antora-playbook.yml index 9718ebeb..c4f182a4 100644 --- a/spring-session-docs/antora-playbook.yml +++ b/spring-session-docs/antora-playbook.yml @@ -10,6 +10,7 @@ content: branches: [spring-projects/spring-session/*] - url: https://github.com/spring-projects/spring-session branches: [main] + tags: ['2.6.*','!2.6.0-M*'] start_path: spring-session-docs urls: latest_version_segment_strategy: redirect:to From aaf122f3a636ea8aea72b1a1c324c39f3bbc37d7 Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Wed, 17 Nov 2021 11:28:11 +0100 Subject: [PATCH 013/108] Include 2.6.0 and 3.0 snapshots in reference docs --- spring-session-docs/antora-playbook.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-session-docs/antora-playbook.yml b/spring-session-docs/antora-playbook.yml index c4f182a4..183d9283 100644 --- a/spring-session-docs/antora-playbook.yml +++ b/spring-session-docs/antora-playbook.yml @@ -9,8 +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] - tags: ['2.6.*','!2.6.0-M*'] + 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 From 72159794f47d1efb28083efe5862d7bbc8f4ca95 Mon Sep 17 00:00:00 2001 From: Guillaume Husta Date: Wed, 10 Nov 2021 23:21:32 +0100 Subject: [PATCH 014/108] Doc : typo on Username _user- user should be in italic --- spring-session-docs/modules/ROOT/pages/guides/java-rest.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-session-docs/modules/ROOT/pages/guides/java-rest.adoc b/spring-session-docs/modules/ROOT/pages/guides/java-rest.adoc index 88ee5a88..3b69c049 100644 --- a/spring-session-docs/modules/ROOT/pages/guides/java-rest.adoc +++ b/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: From 1eb53ead9d47f9463bf8ff23f40d9cdacfd9c008 Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Fri, 26 Nov 2021 17:37:12 +0100 Subject: [PATCH 015/108] Update README to include MongoDB Issue gh-1901 --- README.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.adoc b/README.adoc index c089747c..a840b5c4 100644 --- a/README.adoc +++ b/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 From 8ae55b7ee4b338e4f7a43af983ed70f57eb5a96d Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Tue, 7 Dec 2021 15:43:42 +0100 Subject: [PATCH 016/108] GitHub Actions uses spring-builds+github user This is more clear than spring-builds user --- .github/workflows/continuous-integration-workflow.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml index 7f3b1d67..63360097 100644 --- a/.github/workflows/continuous-integration-workflow.yml +++ b/.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" From 757175516fda16ceeaab672b8bf1c6d0a3990114 Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Tue, 21 Dec 2021 10:02:30 +0200 Subject: [PATCH 017/108] Upgrade Reactor to 2020.0.14 Closes gh-1976 --- gradle/dependency-management.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle index ff45a03b..f18e6e3e 100644 --- a/gradle/dependency-management.gradle +++ b/gradle/dependency-management.gradle @@ -1,6 +1,6 @@ dependencyManagement { imports { - mavenBom 'io.projectreactor:reactor-bom:2020.0.13' + mavenBom 'io.projectreactor:reactor-bom:2020.0.14' mavenBom 'com.fasterxml.jackson:jackson-bom:2.13.0' mavenBom 'org.junit:junit-bom:5.8.1' mavenBom 'org.springframework:spring-framework-bom:5.3.13' From d98ff97e1a4215345254b71e3b6b41bc1eb2bc74 Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Tue, 21 Dec 2021 10:03:02 +0200 Subject: [PATCH 018/108] Upgrade Spring Framework to 5.3.14 Closes gh-1977 --- gradle/dependency-management.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle index f18e6e3e..ea32399f 100644 --- a/gradle/dependency-management.gradle +++ b/gradle/dependency-management.gradle @@ -3,7 +3,7 @@ dependencyManagement { mavenBom 'io.projectreactor:reactor-bom:2020.0.14' mavenBom 'com.fasterxml.jackson:jackson-bom:2.13.0' mavenBom 'org.junit:junit-bom:5.8.1' - mavenBom 'org.springframework:spring-framework-bom:5.3.13' + 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.0' mavenBom 'org.testcontainers:testcontainers-bom:1.16.2' From ced2d8421c917eebaeff67b71c66ef5b29b4808c Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Tue, 21 Dec 2021 10:08:25 +0200 Subject: [PATCH 019/108] Upgrade Spring Security to 5.6.1 Closes gh-1978 --- gradle/dependency-management.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle index ea32399f..8783edc0 100644 --- a/gradle/dependency-management.gradle +++ b/gradle/dependency-management.gradle @@ -5,7 +5,7 @@ dependencyManagement { mavenBom 'org.junit:junit-bom:5.8.1' 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.0' + mavenBom 'org.springframework.security:spring-security-bom:5.6.1' mavenBom 'org.testcontainers:testcontainers-bom:1.16.2' } From 307a1f0dde0503b40cafd31817102f9b6d5db020 Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Tue, 21 Dec 2021 10:09:06 +0200 Subject: [PATCH 020/108] Upgrade Hazelcast 4 to 4.2.3 Closes gh-1979 --- spring-session-hazelcast/hazelcast4/hazelcast4.gradle | 4 ++-- .../spring-session-sample-boot-hazelcast4.gradle | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-session-hazelcast/hazelcast4/hazelcast4.gradle b/spring-session-hazelcast/hazelcast4/hazelcast4.gradle index eac0d9b4..6642372b 100644 --- a/spring-session-hazelcast/hazelcast4/hazelcast4.gradle +++ b/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") } diff --git a/spring-session-samples/spring-session-sample-boot-hazelcast4/spring-session-sample-boot-hazelcast4.gradle b/spring-session-samples/spring-session-sample-boot-hazelcast4/spring-session-sample-boot-hazelcast4.gradle index 69e068c9..4bdaad17 100644 --- a/spring-session-samples/spring-session-sample-boot-hazelcast4/spring-session-sample-boot-hazelcast4.gradle +++ b/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" From b5f8e29585c842fe443d878f4e250fbe5d7d9210 Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Tue, 21 Dec 2021 11:10:22 +0200 Subject: [PATCH 021/108] Upgrade test dependencies --- gradle/dependency-management.gradle | 6 +++--- spring-session-samples/gradle/dependency-management.gradle | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle index 8783edc0..fd37c29d 100644 --- a/gradle/dependency-management.gradle +++ b/gradle/dependency-management.gradle @@ -2,7 +2,7 @@ dependencyManagement { imports { mavenBom 'io.projectreactor:reactor-bom:2020.0.14' mavenBom 'com.fasterxml.jackson:jackson-bom:2.13.0' - mavenBom 'org.junit:junit-bom:5.8.1' + 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' @@ -16,11 +16,11 @@ 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' diff --git a/spring-session-samples/gradle/dependency-management.gradle b/spring-session-samples/gradle/dependency-management.gradle index 66f56e0a..b99f7d46 100644 --- a/spring-session-samples/gradle/dependency-management.gradle +++ b/spring-session-samples/gradle/dependency-management.gradle @@ -4,7 +4,7 @@ dependencyManagement { } dependencies { - dependency 'ch.qos.logback:logback-classic:1.2.7' + 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' From 59923121f055ea5dbd0cf37b47bbd57eca357697 Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Tue, 21 Dec 2021 11:10:33 +0200 Subject: [PATCH 022/108] Make gretty samples compatible with logback 1.2.9 Explicitly reference the logback.xml file to prevent gretty from configuring the defaults using groovy. --- .../spring-session-sample-javaconfig-custom-cookie.gradle | 1 + .../spring-session-sample-javaconfig-hazelcast.gradle | 4 ++++ .../spring-session-sample-javaconfig-jdbc.gradle | 4 ++++ .../spring-session-sample-javaconfig-redis.gradle | 1 + .../spring-session-sample-javaconfig-rest.gradle | 1 + .../spring-session-sample-javaconfig-security.gradle | 1 + .../spring-session-sample-misc-hazelcast.gradle | 4 ++++ .../spring-session-sample-xml-jdbc.gradle | 4 ++++ .../spring-session-sample-xml-redis.gradle | 1 + 9 files changed, 21 insertions(+) diff --git a/spring-session-samples/spring-session-sample-javaconfig-custom-cookie/spring-session-sample-javaconfig-custom-cookie.gradle b/spring-session-samples/spring-session-sample-javaconfig-custom-cookie/spring-session-sample-javaconfig-custom-cookie.gradle index 533a04bc..31feb7d0 100644 --- a/spring-session-samples/spring-session-sample-javaconfig-custom-cookie/spring-session-sample-javaconfig-custom-cookie.gradle +++ b/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" } diff --git a/spring-session-samples/spring-session-sample-javaconfig-hazelcast/spring-session-sample-javaconfig-hazelcast.gradle b/spring-session-samples/spring-session-sample-javaconfig-hazelcast/spring-session-sample-javaconfig-hazelcast.gradle index a044cdb3..6b1837a2 100644 --- a/spring-session-samples/spring-session-sample-javaconfig-hazelcast/spring-session-sample-javaconfig-hazelcast.gradle +++ b/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" +} diff --git a/spring-session-samples/spring-session-sample-javaconfig-jdbc/spring-session-sample-javaconfig-jdbc.gradle b/spring-session-samples/spring-session-sample-javaconfig-jdbc/spring-session-sample-javaconfig-jdbc.gradle index 7308dd06..3d3f5ad9 100644 --- a/spring-session-samples/spring-session-sample-javaconfig-jdbc/spring-session-sample-javaconfig-jdbc.gradle +++ b/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" +} diff --git a/spring-session-samples/spring-session-sample-javaconfig-redis/spring-session-sample-javaconfig-redis.gradle b/spring-session-samples/spring-session-sample-javaconfig-redis/spring-session-sample-javaconfig-redis.gradle index b1232e23..6f12909c 100644 --- a/spring-session-samples/spring-session-sample-javaconfig-redis/spring-session-sample-javaconfig-redis.gradle +++ b/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" } diff --git a/spring-session-samples/spring-session-sample-javaconfig-rest/spring-session-sample-javaconfig-rest.gradle b/spring-session-samples/spring-session-sample-javaconfig-rest/spring-session-sample-javaconfig-rest.gradle index 7a9bc6e1..d827edc4 100644 --- a/spring-session-samples/spring-session-sample-javaconfig-rest/spring-session-sample-javaconfig-rest.gradle +++ b/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" } diff --git a/spring-session-samples/spring-session-sample-javaconfig-security/spring-session-sample-javaconfig-security.gradle b/spring-session-samples/spring-session-sample-javaconfig-security/spring-session-sample-javaconfig-security.gradle index da4e5e34..13b3e261 100644 --- a/spring-session-samples/spring-session-sample-javaconfig-security/spring-session-sample-javaconfig-security.gradle +++ b/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" } diff --git a/spring-session-samples/spring-session-sample-misc-hazelcast/spring-session-sample-misc-hazelcast.gradle b/spring-session-samples/spring-session-sample-misc-hazelcast/spring-session-sample-misc-hazelcast.gradle index 926c6c0b..27910b9c 100644 --- a/spring-session-samples/spring-session-sample-misc-hazelcast/spring-session-sample-misc-hazelcast.gradle +++ b/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" +} diff --git a/spring-session-samples/spring-session-sample-xml-jdbc/spring-session-sample-xml-jdbc.gradle b/spring-session-samples/spring-session-sample-xml-jdbc/spring-session-sample-xml-jdbc.gradle index 55fc55c6..4f516f74 100644 --- a/spring-session-samples/spring-session-sample-xml-jdbc/spring-session-sample-xml-jdbc.gradle +++ b/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" +} diff --git a/spring-session-samples/spring-session-sample-xml-redis/spring-session-sample-xml-redis.gradle b/spring-session-samples/spring-session-sample-xml-redis/spring-session-sample-xml-redis.gradle index b1232e23..6f12909c 100644 --- a/spring-session-samples/spring-session-sample-xml-redis/spring-session-sample-xml-redis.gradle +++ b/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" } From 61bf2eca494bbaedbf87f249a0a572ca8d4bd550 Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Tue, 21 Dec 2021 15:12:26 +0200 Subject: [PATCH 023/108] Release 2.6.1 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 4e268d6d..49c05c3e 100644 --- a/gradle.properties +++ b/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.1-SNAPSHOT +version=2.6.1 From 70e0c6d22d3c58d890841f88a5d5f12c606bca7b Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Tue, 21 Dec 2021 15:44:58 +0200 Subject: [PATCH 024/108] Update antora version --- spring-session-docs/antora.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/spring-session-docs/antora.yml b/spring-session-docs/antora.yml index 6b1de1aa..4ce86542 100644 --- a/spring-session-docs/antora.yml +++ b/spring-session-docs/antora.yml @@ -1,3 +1,2 @@ name: ROOT version: '2.6.1' -prerelease: '-SNAPSHOT' From a08c721118938bc165632f455c8d05dc4c05bfd5 Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Tue, 21 Dec 2021 16:30:17 +0200 Subject: [PATCH 025/108] Next development version --- gradle.properties | 2 +- spring-session-docs/antora.yml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 49c05c3e..b0f11422 100644 --- a/gradle.properties +++ b/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.1 +version=2.6.2-SNAPSHOT diff --git a/spring-session-docs/antora.yml b/spring-session-docs/antora.yml index 4ce86542..049ba2c4 100644 --- a/spring-session-docs/antora.yml +++ b/spring-session-docs/antora.yml @@ -1,2 +1,3 @@ name: ROOT -version: '2.6.1' +version: '2.6.2' +prerelease: '-SNAPSHOT' From 2c065c024115a8d57c556b4a436d86f6dbf73628 Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Wed, 5 Jan 2022 13:32:55 +0200 Subject: [PATCH 026/108] Next minor development version --- gradle.properties | 2 +- spring-session-docs/antora-playbook.yml | 2 +- spring-session-docs/antora.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index b0f11422..ef20cd90 100644 --- a/gradle.properties +++ b/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.2-SNAPSHOT +version=2.7.0-SNAPSHOT diff --git a/spring-session-docs/antora-playbook.yml b/spring-session-docs/antora-playbook.yml index 183d9283..6a74b186 100644 --- a/spring-session-docs/antora-playbook.yml +++ b/spring-session-docs/antora-playbook.yml @@ -10,7 +10,7 @@ content: branches: [spring-projects/spring-session/*] - url: https://github.com/spring-projects/spring-session branches: [main,3.0.x] - tags: ['2.6.*','!2.6.0-M*','!2.6.0-RC*'] + tags: ['2.7.*', '2.6.*','!2.6.0-M*','!2.6.0-RC*'] start_path: spring-session-docs urls: latest_version_segment_strategy: redirect:to diff --git a/spring-session-docs/antora.yml b/spring-session-docs/antora.yml index 049ba2c4..5a71442d 100644 --- a/spring-session-docs/antora.yml +++ b/spring-session-docs/antora.yml @@ -1,3 +1,3 @@ name: ROOT -version: '2.6.2' +version: '2.7.0' prerelease: '-SNAPSHOT' From c79173879f65cb72e3e3993f8720363987a3daf2 Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Wed, 5 Jan 2022 14:29:28 +0200 Subject: [PATCH 027/108] Run CI on all branches --- .github/workflows/continuous-integration-workflow.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml index 63360097..b3bfbdd5 100644 --- a/.github/workflows/continuous-integration-workflow.yml +++ b/.github/workflows/continuous-integration-workflow.yml @@ -2,8 +2,6 @@ name: CI on: push: - branches: - - main schedule: - cron: '0 10 * * *' # Once per day at 10am UTC workflow_dispatch: # Manual trigger From dba22292a3f073752548ff11873b03c95a2c71ba Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Wed, 5 Jan 2022 14:29:28 +0200 Subject: [PATCH 028/108] Run CI on all branches --- .github/workflows/continuous-integration-workflow.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml index 63360097..b3bfbdd5 100644 --- a/.github/workflows/continuous-integration-workflow.yml +++ b/.github/workflows/continuous-integration-workflow.yml @@ -2,8 +2,6 @@ name: CI on: push: - branches: - - main schedule: - cron: '0 10 * * *' # Once per day at 10am UTC workflow_dispatch: # Manual trigger From 9bad2afa14acbe683ac1543494b90a2f2deca154 Mon Sep 17 00:00:00 2001 From: Jerome Prinet Date: Fri, 19 Nov 2021 14:32:31 +0100 Subject: [PATCH 029/108] Bump up Gradle enterprise plugin to 3.7.2 --- settings.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle b/settings.gradle index 67cdd447..6d2d5be9 100644 --- a/settings.gradle +++ b/settings.gradle @@ -6,7 +6,7 @@ pluginManagement { } plugins { - id "com.gradle.enterprise" version "3.5.1" + id "com.gradle.enterprise" version "3.7.2" id "io.spring.ge.conventions" version "0.0.7" } From 7a1cb66dae0159caf7fd745bfc5901b46f9818fe Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Fri, 14 Jan 2022 16:19:22 +0100 Subject: [PATCH 030/108] Update to jakarta.annotation-api dependency Closes gh-1956 --- gradle/dependency-management.gradle | 2 +- spring-session-core/spring-session-core.gradle | 2 +- spring-session-hazelcast/hazelcast4/hazelcast4.gradle | 2 +- spring-session-hazelcast/spring-session-hazelcast.gradle | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle index fd37c29d..7d8c89bd 100644 --- a/gradle/dependency-management.gradle +++ b/gradle/dependency-management.gradle @@ -25,8 +25,8 @@ dependencyManagement { 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 'jakarta.annotation:jakarta.annotation-api:1.3.5' 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' diff --git a/spring-session-core/spring-session-core.gradle b/spring-session-core/spring-session-core.gradle index 4182f8cf..60ca6ae7 100644 --- a/spring-session-core/spring-session-core.gradle +++ b/spring-session-core/spring-session-core.gradle @@ -6,8 +6,8 @@ dependencies { api "org.springframework:spring-jcl" optional "io.projectreactor:reactor-core" - optional "javax.annotation:javax.annotation-api" optional "javax.servlet:javax.servlet-api" + optional "jakarta.annotation:jakarta.annotation-api" optional "org.springframework:spring-context" optional "org.springframework:spring-jdbc" optional "org.springframework:spring-messaging" diff --git a/spring-session-hazelcast/hazelcast4/hazelcast4.gradle b/spring-session-hazelcast/hazelcast4/hazelcast4.gradle index 6642372b..e4e8d9bd 100644 --- a/spring-session-hazelcast/hazelcast4/hazelcast4.gradle +++ b/spring-session-hazelcast/hazelcast4/hazelcast4.gradle @@ -23,7 +23,7 @@ dependencies { api project(':spring-session-core') optional "com.hazelcast:hazelcast:4.2.3" api "org.springframework:spring-context" - api "javax.annotation:javax.annotation-api" + api "jakarta.annotation:jakarta.annotation-api" testImplementation "javax.servlet:javax.servlet-api" testImplementation "org.assertj:assertj-core" diff --git a/spring-session-hazelcast/spring-session-hazelcast.gradle b/spring-session-hazelcast/spring-session-hazelcast.gradle index 408664a8..951eaf43 100644 --- a/spring-session-hazelcast/spring-session-hazelcast.gradle +++ b/spring-session-hazelcast/spring-session-hazelcast.gradle @@ -7,7 +7,7 @@ configurations { dependencies { api project(':spring-session-core') api "com.hazelcast:hazelcast" - api "javax.annotation:javax.annotation-api" + api "jakarta.annotation:jakarta.annotation-api" api "org.springframework:spring-context" hazelcast4(project(path: ":hazelcast4", configuration: 'classesOnlyElements')) From 2f4a0110ab680c8a592e91067d6ab96970177fe6 Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Fri, 14 Jan 2022 16:21:35 +0100 Subject: [PATCH 031/108] Update to jakarta.servlet-api dependency Closes gh-1960 --- .../resources/samples/integrationtest/withpropdeps/build.gradle | 2 +- .../samples/showcase/samples/sgbcs-sample-war/build.gradle | 2 +- gradle/dependency-management.gradle | 2 +- spring-session-core/spring-session-core.gradle | 2 +- spring-session-data-mongodb/spring-session-data-mongodb.gradle | 2 +- spring-session-data-redis/spring-session-data-redis.gradle | 2 +- spring-session-docs/spring-session-docs.gradle | 2 +- spring-session-hazelcast/hazelcast4/hazelcast4.gradle | 2 +- spring-session-hazelcast/spring-session-hazelcast.gradle | 2 +- spring-session-jdbc/spring-session-jdbc.gradle | 2 +- .../spring-session-sample-javaconfig-custom-cookie.gradle | 2 +- .../spring-session-sample-javaconfig-hazelcast.gradle | 2 +- .../spring-session-sample-javaconfig-jdbc.gradle | 2 +- .../spring-session-sample-javaconfig-redis.gradle | 2 +- .../spring-session-sample-javaconfig-rest.gradle | 2 +- .../spring-session-sample-javaconfig-security.gradle | 2 +- .../spring-session-sample-misc-hazelcast.gradle | 2 +- .../spring-session-sample-xml-jdbc.gradle | 2 +- .../spring-session-sample-xml-redis.gradle | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/buildSrc/src/test/resources/samples/integrationtest/withpropdeps/build.gradle b/buildSrc/src/test/resources/samples/integrationtest/withpropdeps/build.gradle index cc4b661e..0bdffa27 100644 --- a/buildSrc/src/test/resources/samples/integrationtest/withpropdeps/build.gradle +++ b/buildSrc/src/test/resources/samples/integrationtest/withpropdeps/build.gradle @@ -9,7 +9,7 @@ repositories { } dependencies { - optional 'javax.servlet:javax.servlet-api:3.1.0' + optional 'jakarta.servlet:jakarta.servlet-api:4.0.4' testImplementation platform('org.junit:junit-bom:5.8.1') testImplementation 'org.junit.jupiter:junit-jupiter-api' testImplementation 'org.junit.jupiter:junit-jupiter-engine' diff --git a/buildSrc/src/test/resources/samples/showcase/samples/sgbcs-sample-war/build.gradle b/buildSrc/src/test/resources/samples/showcase/samples/sgbcs-sample-war/build.gradle index 750a5735..b68d8b30 100644 --- a/buildSrc/src/test/resources/samples/showcase/samples/sgbcs-sample-war/build.gradle +++ b/buildSrc/src/test/resources/samples/showcase/samples/sgbcs-sample-war/build.gradle @@ -4,7 +4,7 @@ plugins { } dependencies { - provided 'javax.servlet:javax.servlet-api' + provided 'jakarta.servlet:jakarta.servlet-api:4.0.4' testImplementation 'commons-io:commons-io:2.11.0' testImplementation 'org.assertj:assertj-core:3.21.0' testImplementation platform('org.junit:junit-bom:5.8.1') diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle index 7d8c89bd..45f0cb50 100644 --- a/gradle/dependency-management.gradle +++ b/gradle/dependency-management.gradle @@ -25,8 +25,8 @@ dependencyManagement { 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.servlet:javax.servlet-api:4.0.1' dependency 'jakarta.annotation:jakarta.annotation-api:1.3.5' + dependency 'jakarta.servlet:jakarta.servlet-api:4.0.4' 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' diff --git a/spring-session-core/spring-session-core.gradle b/spring-session-core/spring-session-core.gradle index 60ca6ae7..1adc0e80 100644 --- a/spring-session-core/spring-session-core.gradle +++ b/spring-session-core/spring-session-core.gradle @@ -6,8 +6,8 @@ dependencies { api "org.springframework:spring-jcl" optional "io.projectreactor:reactor-core" - optional "javax.servlet:javax.servlet-api" optional "jakarta.annotation:jakarta.annotation-api" + optional "jakarta.servlet:jakarta.servlet-api" optional "org.springframework:spring-context" optional "org.springframework:spring-jdbc" optional "org.springframework:spring-messaging" diff --git a/spring-session-data-mongodb/spring-session-data-mongodb.gradle b/spring-session-data-mongodb/spring-session-data-mongodb.gradle index 8d24631e..a1f00178 100644 --- a/spring-session-data-mongodb/spring-session-data-mongodb.gradle +++ b/spring-session-data-mongodb/spring-session-data-mongodb.gradle @@ -41,5 +41,5 @@ dependencies { testImplementation "org.mockito:mockito-core" testImplementation "org.mockito:mockito-junit-jupiter" testImplementation "io.projectreactor:reactor-test" - testImplementation "javax.servlet:javax.servlet-api" + testImplementation "jakarta.servlet:jakarta.servlet-api" } diff --git a/spring-session-data-redis/spring-session-data-redis.gradle b/spring-session-data-redis/spring-session-data-redis.gradle index e00c7ab4..6b701b8d 100644 --- a/spring-session-data-redis/spring-session-data-redis.gradle +++ b/spring-session-data-redis/spring-session-data-redis.gradle @@ -15,7 +15,7 @@ dependencies { testImplementation "org.mockito:mockito-core" testImplementation "org.springframework:spring-test" testImplementation "io.projectreactor:reactor-test" - testImplementation "javax.servlet:javax.servlet-api" + testImplementation "jakarta.servlet:jakarta.servlet-api" testImplementation "org.springframework:spring-web" testImplementation "org.springframework.security:spring-security-core" testImplementation "org.junit.jupiter:junit-jupiter-api" diff --git a/spring-session-docs/spring-session-docs.gradle b/spring-session-docs/spring-session-docs.gradle index b0fb52d7..1c47661b 100644 --- a/spring-session-docs/spring-session-docs.gradle +++ b/spring-session-docs/spring-session-docs.gradle @@ -22,7 +22,7 @@ dependencies { testImplementation 'org.assertj:assertj-core' testImplementation 'com.hazelcast:hazelcast' testImplementation 'io.lettuce:lettuce-core' - testImplementation 'javax.servlet:javax.servlet-api' + testImplementation 'jakarta.servlet:jakarta.servlet-api' testImplementation 'org.junit.jupiter:junit-jupiter-api' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' } diff --git a/spring-session-hazelcast/hazelcast4/hazelcast4.gradle b/spring-session-hazelcast/hazelcast4/hazelcast4.gradle index e4e8d9bd..d4ce5b7d 100644 --- a/spring-session-hazelcast/hazelcast4/hazelcast4.gradle +++ b/spring-session-hazelcast/hazelcast4/hazelcast4.gradle @@ -25,7 +25,7 @@ dependencies { api "org.springframework:spring-context" api "jakarta.annotation:jakarta.annotation-api" - testImplementation "javax.servlet:javax.servlet-api" + testImplementation "jakarta.servlet:jakarta.servlet-api" testImplementation "org.assertj:assertj-core" testImplementation "org.mockito:mockito-core" testImplementation "org.springframework:spring-test" diff --git a/spring-session-hazelcast/spring-session-hazelcast.gradle b/spring-session-hazelcast/spring-session-hazelcast.gradle index 951eaf43..b7cd931f 100644 --- a/spring-session-hazelcast/spring-session-hazelcast.gradle +++ b/spring-session-hazelcast/spring-session-hazelcast.gradle @@ -13,7 +13,7 @@ dependencies { hazelcast4(project(path: ":hazelcast4", configuration: 'classesOnlyElements')) compileOnly(project(":hazelcast4")) - testImplementation "javax.servlet:javax.servlet-api" + testImplementation "jakarta.servlet:jakarta.servlet-api" testImplementation "org.assertj:assertj-core" testImplementation "org.mockito:mockito-core" testImplementation "org.springframework:spring-test" diff --git a/spring-session-jdbc/spring-session-jdbc.gradle b/spring-session-jdbc/spring-session-jdbc.gradle index 21867b21..3d255b67 100644 --- a/spring-session-jdbc/spring-session-jdbc.gradle +++ b/spring-session-jdbc/spring-session-jdbc.gradle @@ -7,7 +7,7 @@ dependencies { api "org.springframework:spring-context" api "org.springframework:spring-jdbc" - testImplementation "javax.servlet:javax.servlet-api" + testImplementation "jakarta.servlet:jakarta.servlet-api" testImplementation "org.assertj:assertj-core" testImplementation "org.mockito:mockito-core" testImplementation "org.springframework:spring-test" diff --git a/spring-session-samples/spring-session-sample-javaconfig-custom-cookie/spring-session-sample-javaconfig-custom-cookie.gradle b/spring-session-samples/spring-session-sample-javaconfig-custom-cookie/spring-session-sample-javaconfig-custom-cookie.gradle index 31feb7d0..dc3401cf 100644 --- a/spring-session-samples/spring-session-sample-javaconfig-custom-cookie/spring-session-sample-javaconfig-custom-cookie.gradle +++ b/spring-session-samples/spring-session-sample-javaconfig-custom-cookie/spring-session-sample-javaconfig-custom-cookie.gradle @@ -17,7 +17,7 @@ dependencies { implementation "ch.qos.logback:logback-classic" implementation "org.testcontainers:testcontainers" - providedCompile "javax.servlet:javax.servlet-api" + providedCompile "jakarta.servlet:jakarta.servlet-api" testImplementation "org.assertj:assertj-core" testImplementation "org.junit.jupiter:junit-jupiter-api" diff --git a/spring-session-samples/spring-session-sample-javaconfig-hazelcast/spring-session-sample-javaconfig-hazelcast.gradle b/spring-session-samples/spring-session-sample-javaconfig-hazelcast/spring-session-sample-javaconfig-hazelcast.gradle index 6b1837a2..f2a85d1e 100644 --- a/spring-session-samples/spring-session-sample-javaconfig-hazelcast/spring-session-sample-javaconfig-hazelcast.gradle +++ b/spring-session-samples/spring-session-sample-javaconfig-hazelcast/spring-session-sample-javaconfig-hazelcast.gradle @@ -19,7 +19,7 @@ dependencies { implementation "org.slf4j:log4j-over-slf4j" implementation "ch.qos.logback:logback-classic" - providedCompile "javax.servlet:javax.servlet-api" + providedCompile "jakarta.servlet:jakarta.servlet-api" providedCompile "javax.servlet.jsp:javax.servlet.jsp-api" testImplementation "org.assertj:assertj-core" diff --git a/spring-session-samples/spring-session-sample-javaconfig-jdbc/spring-session-sample-javaconfig-jdbc.gradle b/spring-session-samples/spring-session-sample-javaconfig-jdbc/spring-session-sample-javaconfig-jdbc.gradle index 3d3f5ad9..a7ef307c 100644 --- a/spring-session-samples/spring-session-sample-javaconfig-jdbc/spring-session-sample-javaconfig-jdbc.gradle +++ b/spring-session-samples/spring-session-sample-javaconfig-jdbc/spring-session-sample-javaconfig-jdbc.gradle @@ -16,7 +16,7 @@ dependencies { implementation "org.slf4j:log4j-over-slf4j" implementation "ch.qos.logback:logback-classic" - providedCompile "javax.servlet:javax.servlet-api" + providedCompile "jakarta.servlet:jakarta.servlet-api" testImplementation "org.assertj:assertj-core" testImplementation "org.junit.jupiter:junit-jupiter-api" diff --git a/spring-session-samples/spring-session-sample-javaconfig-redis/spring-session-sample-javaconfig-redis.gradle b/spring-session-samples/spring-session-sample-javaconfig-redis/spring-session-sample-javaconfig-redis.gradle index 6f12909c..459bc911 100644 --- a/spring-session-samples/spring-session-sample-javaconfig-redis/spring-session-sample-javaconfig-redis.gradle +++ b/spring-session-samples/spring-session-sample-javaconfig-redis/spring-session-sample-javaconfig-redis.gradle @@ -17,7 +17,7 @@ dependencies { implementation "ch.qos.logback:logback-classic" implementation "org.testcontainers:testcontainers" - providedCompile "javax.servlet:javax.servlet-api" + providedCompile "jakarta.servlet:jakarta.servlet-api" testImplementation "org.assertj:assertj-core" testImplementation "org.junit.jupiter:junit-jupiter-api" diff --git a/spring-session-samples/spring-session-sample-javaconfig-rest/spring-session-sample-javaconfig-rest.gradle b/spring-session-samples/spring-session-sample-javaconfig-rest/spring-session-sample-javaconfig-rest.gradle index d827edc4..520b9a00 100644 --- a/spring-session-samples/spring-session-sample-javaconfig-rest/spring-session-sample-javaconfig-rest.gradle +++ b/spring-session-samples/spring-session-sample-javaconfig-rest/spring-session-sample-javaconfig-rest.gradle @@ -18,7 +18,7 @@ dependencies { implementation "ch.qos.logback:logback-classic" implementation "org.testcontainers:testcontainers" - providedCompile "javax.servlet:javax.servlet-api" + providedCompile "jakarta.servlet:jakarta.servlet-api" testImplementation "org.springframework.security:spring-security-test" testImplementation "org.assertj:assertj-core" diff --git a/spring-session-samples/spring-session-sample-javaconfig-security/spring-session-sample-javaconfig-security.gradle b/spring-session-samples/spring-session-sample-javaconfig-security/spring-session-sample-javaconfig-security.gradle index 13b3e261..a7a57c22 100644 --- a/spring-session-samples/spring-session-sample-javaconfig-security/spring-session-sample-javaconfig-security.gradle +++ b/spring-session-samples/spring-session-sample-javaconfig-security/spring-session-sample-javaconfig-security.gradle @@ -19,7 +19,7 @@ dependencies { implementation "ch.qos.logback:logback-classic" implementation "org.testcontainers:testcontainers" - providedCompile "javax.servlet:javax.servlet-api" + providedCompile "jakarta.servlet:jakarta.servlet-api" providedCompile "javax.servlet.jsp:javax.servlet.jsp-api" testImplementation "org.assertj:assertj-core" diff --git a/spring-session-samples/spring-session-sample-misc-hazelcast/spring-session-sample-misc-hazelcast.gradle b/spring-session-samples/spring-session-sample-misc-hazelcast/spring-session-sample-misc-hazelcast.gradle index 27910b9c..b280a1fb 100644 --- a/spring-session-samples/spring-session-sample-misc-hazelcast/spring-session-sample-misc-hazelcast.gradle +++ b/spring-session-samples/spring-session-sample-misc-hazelcast/spring-session-sample-misc-hazelcast.gradle @@ -15,7 +15,7 @@ dependencies { implementation "org.slf4j:log4j-over-slf4j" implementation "ch.qos.logback:logback-classic" - providedCompile "javax.servlet:javax.servlet-api" + providedCompile "jakarta.servlet:jakarta.servlet-api" testImplementation "org.assertj:assertj-core" testImplementation "org.junit.jupiter:junit-jupiter-api" diff --git a/spring-session-samples/spring-session-sample-xml-jdbc/spring-session-sample-xml-jdbc.gradle b/spring-session-samples/spring-session-sample-xml-jdbc/spring-session-sample-xml-jdbc.gradle index 4f516f74..0f3d3514 100644 --- a/spring-session-samples/spring-session-sample-xml-jdbc/spring-session-sample-xml-jdbc.gradle +++ b/spring-session-samples/spring-session-sample-xml-jdbc/spring-session-sample-xml-jdbc.gradle @@ -16,7 +16,7 @@ dependencies { implementation "org.slf4j:log4j-over-slf4j" implementation "ch.qos.logback:logback-classic" - providedCompile "javax.servlet:javax.servlet-api" + providedCompile "jakarta.servlet:jakarta.servlet-api" testImplementation "org.assertj:assertj-core" testImplementation "org.junit.jupiter:junit-jupiter-api" diff --git a/spring-session-samples/spring-session-sample-xml-redis/spring-session-sample-xml-redis.gradle b/spring-session-samples/spring-session-sample-xml-redis/spring-session-sample-xml-redis.gradle index 6f12909c..459bc911 100644 --- a/spring-session-samples/spring-session-sample-xml-redis/spring-session-sample-xml-redis.gradle +++ b/spring-session-samples/spring-session-sample-xml-redis/spring-session-sample-xml-redis.gradle @@ -17,7 +17,7 @@ dependencies { implementation "ch.qos.logback:logback-classic" implementation "org.testcontainers:testcontainers" - providedCompile "javax.servlet:javax.servlet-api" + providedCompile "jakarta.servlet:jakarta.servlet-api" testImplementation "org.assertj:assertj-core" testImplementation "org.junit.jupiter:junit-jupiter-api" From 265099c58683e5bc00104ac4b6eb13842ca512b8 Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Mon, 17 Jan 2022 09:41:09 +0100 Subject: [PATCH 032/108] Upgrade Reactor to 2020.0.15 Closes gh-1999 --- gradle/dependency-management.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle index 45f0cb50..602fb517 100644 --- a/gradle/dependency-management.gradle +++ b/gradle/dependency-management.gradle @@ -1,6 +1,6 @@ dependencyManagement { imports { - mavenBom 'io.projectreactor:reactor-bom:2020.0.14' + mavenBom 'io.projectreactor:reactor-bom:2020.0.15' 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' From 4ba62c71dd912075603228cead60cf8c749c0120 Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Mon, 17 Jan 2022 09:41:53 +0100 Subject: [PATCH 033/108] Upgrade MongoDB to 4.4.1 Closes gh-2000 --- gradle/dependency-management.gradle | 2 +- .../data/mongo/integration/AbstractMongoRepositoryITest.java | 2 +- .../MongoDbDeleteJacksonSessionVerificationTest.java | 2 +- .../data/mongo/integration/MongoDbLogoutVerificationTest.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle index 602fb517..4b1bed8c 100644 --- a/gradle/dependency-management.gradle +++ b/gradle/dependency-management.gradle @@ -38,7 +38,7 @@ dependencyManagement { entry 'mockito-junit-jupiter' } - dependencySet(group: 'org.mongodb', version: '4.4.0') { + dependencySet(group: 'org.mongodb', version: '4.4.1') { entry 'mongodb-driver-core' entry 'mongodb-driver-sync' entry 'mongodb-driver-reactivestreams' diff --git a/spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/integration/AbstractMongoRepositoryITest.java b/spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/integration/AbstractMongoRepositoryITest.java index 7b3d7fe8..a451e32e 100644 --- a/spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/integration/AbstractMongoRepositoryITest.java +++ b/spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/integration/AbstractMongoRepositoryITest.java @@ -389,7 +389,7 @@ public abstract class AbstractMongoRepositoryITest extends AbstractITest { protected static class BaseConfig { - private static final String DOCKER_IMAGE = "mongo:4.0.10"; + private static final String DOCKER_IMAGE = "mongo:4.4.1"; @Bean(initMethod = "start", destroyMethod = "stop") public MongoDBContainer mongoContainer() { diff --git a/spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/integration/MongoDbDeleteJacksonSessionVerificationTest.java b/spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/integration/MongoDbDeleteJacksonSessionVerificationTest.java index 4719a9cc..87326471 100644 --- a/spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/integration/MongoDbDeleteJacksonSessionVerificationTest.java +++ b/spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/integration/MongoDbDeleteJacksonSessionVerificationTest.java @@ -175,7 +175,7 @@ public class MongoDbDeleteJacksonSessionVerificationTest { @EnableMongoWebSession static class Config { - private static final String DOCKER_IMAGE = "mongo:4.0.10"; + private static final String DOCKER_IMAGE = "mongo:4.4.1"; @Bean(initMethod = "start", destroyMethod = "stop") MongoDBContainer mongoContainer() { diff --git a/spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/integration/MongoDbLogoutVerificationTest.java b/spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/integration/MongoDbLogoutVerificationTest.java index 4320a3ea..188f7b84 100644 --- a/spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/integration/MongoDbLogoutVerificationTest.java +++ b/spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/integration/MongoDbLogoutVerificationTest.java @@ -170,7 +170,7 @@ public class MongoDbLogoutVerificationTest { @EnableMongoWebSession static class Config { - private static final String DOCKER_IMAGE = "mongo:4.0.10"; + private static final String DOCKER_IMAGE = "mongo:4.4.1"; @Bean(initMethod = "start", destroyMethod = "stop") MongoDBContainer mongoContainer() { From 97308bdbf418f37809d3af053e5cf4674a395ab8 Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Mon, 17 Jan 2022 09:42:51 +0100 Subject: [PATCH 034/108] Upgrade Jackson to 2.13.1 Closes gh-2002 --- gradle/dependency-management.gradle | 2 +- spring-session-samples/gradle/dependency-management.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle index 4b1bed8c..3bf5baba 100644 --- a/gradle/dependency-management.gradle +++ b/gradle/dependency-management.gradle @@ -1,7 +1,7 @@ dependencyManagement { imports { mavenBom 'io.projectreactor:reactor-bom:2020.0.15' - mavenBom 'com.fasterxml.jackson:jackson-bom:2.13.0' + mavenBom 'com.fasterxml.jackson:jackson-bom:2.13.1' 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' diff --git a/spring-session-samples/gradle/dependency-management.gradle b/spring-session-samples/gradle/dependency-management.gradle index b99f7d46..8a49c1b5 100644 --- a/spring-session-samples/gradle/dependency-management.gradle +++ b/spring-session-samples/gradle/dependency-management.gradle @@ -1,6 +1,6 @@ dependencyManagement { imports { - mavenBom 'com.fasterxml.jackson:jackson-bom:2.13.0' + mavenBom 'com.fasterxml.jackson:jackson-bom:2.13.1' } dependencies { From 04b4b9ba17c1c9398904b23244fd3a5a796271d8 Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Mon, 17 Jan 2022 09:43:22 +0100 Subject: [PATCH 035/108] Upgrade Spring Framework to 5.3.15 Closes gh-1998 --- gradle/dependency-management.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle index 3bf5baba..0912fd88 100644 --- a/gradle/dependency-management.gradle +++ b/gradle/dependency-management.gradle @@ -3,7 +3,7 @@ dependencyManagement { mavenBom 'io.projectreactor:reactor-bom:2020.0.15' mavenBom 'com.fasterxml.jackson:jackson-bom:2.13.1' mavenBom 'org.junit:junit-bom:5.8.2' - mavenBom 'org.springframework:spring-framework-bom:5.3.14' + mavenBom 'org.springframework:spring-framework-bom:5.3.15' 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' From d5dac6629d0957fe13be53df5894beb6d7626db6 Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Mon, 17 Jan 2022 09:43:41 +0100 Subject: [PATCH 036/108] Upgrade Spring Security to 5.7.0-M1 Closes gh-1997 --- gradle/dependency-management.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle index 0912fd88..e9a94bfc 100644 --- a/gradle/dependency-management.gradle +++ b/gradle/dependency-management.gradle @@ -5,7 +5,7 @@ dependencyManagement { mavenBom 'org.junit:junit-bom:5.8.2' mavenBom 'org.springframework:spring-framework-bom:5.3.15' mavenBom 'org.springframework.data:spring-data-bom:2021.1.0' - mavenBom 'org.springframework.security:spring-security-bom:5.6.1' + mavenBom 'org.springframework.security:spring-security-bom:5.7.0-M1' mavenBom 'org.testcontainers:testcontainers-bom:1.16.2' } From fb1362aa2c16282106b13dd242c4d97a94d2586f Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Mon, 17 Jan 2022 09:46:21 +0100 Subject: [PATCH 037/108] Upgrade Hazelcast 4 to 4.2.4 Closes gh-2001 --- spring-session-hazelcast/hazelcast4/hazelcast4.gradle | 4 ++-- .../ClientServerHazelcast4IndexedSessionRepositoryITests.java | 4 ++-- .../spring-session-sample-boot-hazelcast4.gradle | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/spring-session-hazelcast/hazelcast4/hazelcast4.gradle b/spring-session-hazelcast/hazelcast4/hazelcast4.gradle index d4ce5b7d..34535842 100644 --- a/spring-session-hazelcast/hazelcast4/hazelcast4.gradle +++ b/spring-session-hazelcast/hazelcast4/hazelcast4.gradle @@ -21,7 +21,7 @@ artifacts { dependencies { api project(':spring-session-core') - optional "com.hazelcast:hazelcast:4.2.3" + optional "com.hazelcast:hazelcast:4.2.4" api "org.springframework:spring-context" api "jakarta.annotation:jakarta.annotation-api" @@ -35,7 +35,7 @@ dependencies { testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine" integrationTestCompile "org.testcontainers:testcontainers" - integrationTestCompile "com.hazelcast:hazelcast:4.2.3" + integrationTestCompile "com.hazelcast:hazelcast:4.2.4" integrationTestCompile project(":spring-session-hazelcast") } diff --git a/spring-session-hazelcast/hazelcast4/src/integration-test/java/org/springframework/session/hazelcast/ClientServerHazelcast4IndexedSessionRepositoryITests.java b/spring-session-hazelcast/hazelcast4/src/integration-test/java/org/springframework/session/hazelcast/ClientServerHazelcast4IndexedSessionRepositoryITests.java index dae3d4ec..e7eb2b90 100644 --- a/spring-session-hazelcast/hazelcast4/src/integration-test/java/org/springframework/session/hazelcast/ClientServerHazelcast4IndexedSessionRepositoryITests.java +++ b/spring-session-hazelcast/hazelcast4/src/integration-test/java/org/springframework/session/hazelcast/ClientServerHazelcast4IndexedSessionRepositoryITests.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2021 the original author or authors. + * Copyright 2014-2022 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. @@ -45,7 +45,7 @@ import org.springframework.test.context.web.WebAppConfiguration; @WebAppConfiguration class ClientServerHazelcast4IndexedSessionRepositoryITests extends AbstractHazelcast4IndexedSessionRepositoryITests { - private static GenericContainer container = new GenericContainer<>("hazelcast/hazelcast:4.2.2") + private static GenericContainer container = new GenericContainer<>("hazelcast/hazelcast:4.2.4") .withExposedPorts(5701).withCopyFileToContainer(MountableFile.forClasspathResource("/hazelcast-server.xml"), "/opt/hazelcast/hazelcast.xml"); diff --git a/spring-session-samples/spring-session-sample-boot-hazelcast4/spring-session-sample-boot-hazelcast4.gradle b/spring-session-samples/spring-session-sample-boot-hazelcast4/spring-session-sample-boot-hazelcast4.gradle index 4bdaad17..312dc12a 100644 --- a/spring-session-samples/spring-session-sample-boot-hazelcast4/spring-session-sample-boot-hazelcast4.gradle +++ b/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.3" + implementation "com.hazelcast:hazelcast:4.2.4" implementation "nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect" implementation "org.webjars:bootstrap" implementation "org.webjars:html5shiv" From bda72c074f94d7ba48d20c7de3326e4ac397130e Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Mon, 17 Jan 2022 12:22:29 +0100 Subject: [PATCH 038/108] Upgrade test dependencies --- gradle/dependency-management.gradle | 12 ++++++------ .../gradle/dependency-management.gradle | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle index e9a94bfc..0dc32746 100644 --- a/gradle/dependency-management.gradle +++ b/gradle/dependency-management.gradle @@ -16,24 +16,24 @@ dependencyManagement { } dependency 'org.aspectj:aspectjweaver:1.9.7' - dependency 'ch.qos.logback:logback-core:1.2.9' + dependency 'ch.qos.logback:logback-core:1.2.10' 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.1.jre8' - dependency 'com.oracle.database.jdbc:ojdbc8:21.3.0.0' + dependency 'com.oracle.database.jdbc:ojdbc8:21.4.0.0.1' 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 'io.lettuce:lettuce-core:6.1.6.RELEASE' dependency 'jakarta.annotation:jakarta.annotation-api:1.3.5' dependency 'jakarta.servlet:jakarta.servlet-api:4.0.4' 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.assertj:assertj-core:3.22.0' dependency 'org.hamcrest:hamcrest:2.1' - dependency 'org.hsqldb:hsqldb:2.5.2' + dependency 'org.hsqldb:hsqldb:2.6.1' dependency 'org.mariadb.jdbc:mariadb-java-client:2.7.4' - dependencySet(group: 'org.mockito', version: '4.0.0') { + dependencySet(group: 'org.mockito', version: '4.2.0') { entry 'mockito-core' entry 'mockito-junit-jupiter' } diff --git a/spring-session-samples/gradle/dependency-management.gradle b/spring-session-samples/gradle/dependency-management.gradle index 8a49c1b5..606051f6 100644 --- a/spring-session-samples/gradle/dependency-management.gradle +++ b/spring-session-samples/gradle/dependency-management.gradle @@ -4,14 +4,14 @@ dependencyManagement { } dependencies { - dependency 'ch.qos.logback:logback-classic:1.2.9' + dependency 'ch.qos.logback:logback-classic:1.2.10' 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' dependency 'org.apache.taglibs:taglibs-standard-jstlel:1.2.5' dependency 'org.seleniumhq.selenium:htmlunit-driver:2.52.0' - dependency 'org.slf4j:jcl-over-slf4j:1.7.32' - dependency 'org.slf4j:log4j-over-slf4j:1.7.32' + dependency 'org.slf4j:jcl-over-slf4j:1.7.33' + dependency 'org.slf4j:log4j-over-slf4j:1.7.33' dependency 'org.webjars:bootstrap:2.3.2' dependency 'org.webjars:html5shiv:3.7.3-1' dependency 'org.webjars:jquery:3.6.0' From 950ac502341359a985e42e318c9d7eb2c082c69b Mon Sep 17 00:00:00 2001 From: Jerome Prinet Date: Mon, 17 Jan 2022 15:29:46 +0100 Subject: [PATCH 039/108] Bump up Gradle plugin dependencies --- settings.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle b/settings.gradle index 6d2d5be9..480b1288 100644 --- a/settings.gradle +++ b/settings.gradle @@ -6,7 +6,7 @@ pluginManagement { } plugins { - id "com.gradle.enterprise" version "3.7.2" + id "com.gradle.enterprise" version "3.8.1" id "io.spring.ge.conventions" version "0.0.7" } From 653d820290922debcb740861f81a28e5468d4987 Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Tue, 18 Jan 2022 10:35:06 +0100 Subject: [PATCH 040/108] Update antora tags to include 3.0 --- spring-session-docs/antora-playbook.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-session-docs/antora-playbook.yml b/spring-session-docs/antora-playbook.yml index 6a74b186..ab9ba700 100644 --- a/spring-session-docs/antora-playbook.yml +++ b/spring-session-docs/antora-playbook.yml @@ -10,7 +10,7 @@ content: branches: [spring-projects/spring-session/*] - url: https://github.com/spring-projects/spring-session branches: [main,3.0.x] - tags: ['2.7.*', '2.6.*','!2.6.0-M*','!2.6.0-RC*'] + tags: ['3.0.*', '2.7.*', '2.6.*','!2.6.0-M*','!2.6.0-RC*'] start_path: spring-session-docs urls: latest_version_segment_strategy: redirect:to From 6fd68e093f8cadac0e0fb9dd53984534540b4886 Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Tue, 18 Jan 2022 10:37:12 +0100 Subject: [PATCH 041/108] Upgrade Spring Data to 2021.2.0-M2 Closes gh-1996 --- gradle/dependency-management.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle index 0dc32746..39ace1ed 100644 --- a/gradle/dependency-management.gradle +++ b/gradle/dependency-management.gradle @@ -4,7 +4,7 @@ dependencyManagement { mavenBom 'com.fasterxml.jackson:jackson-bom:2.13.1' mavenBom 'org.junit:junit-bom:5.8.2' mavenBom 'org.springframework:spring-framework-bom:5.3.15' - mavenBom 'org.springframework.data:spring-data-bom:2021.1.0' + mavenBom 'org.springframework.data:spring-data-bom:2021.2.0-M2' mavenBom 'org.springframework.security:spring-security-bom:5.7.0-M1' mavenBom 'org.testcontainers:testcontainers-bom:1.16.2' } From f13df5aa2fda4cef79cc3c73cdc8a0083d4868ae Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Tue, 18 Jan 2022 11:14:02 +0100 Subject: [PATCH 042/108] Revert "Upgrade test dependencies" This reverts commit bda72c074f94d7ba48d20c7de3326e4ac397130e. --- gradle/dependency-management.gradle | 12 ++++++------ .../gradle/dependency-management.gradle | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle index 39ace1ed..d4847c84 100644 --- a/gradle/dependency-management.gradle +++ b/gradle/dependency-management.gradle @@ -16,24 +16,24 @@ dependencyManagement { } dependency 'org.aspectj:aspectjweaver:1.9.7' - dependency 'ch.qos.logback:logback-core:1.2.10' + 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.1.jre8' - dependency 'com.oracle.database.jdbc:ojdbc8:21.4.0.0.1' + 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.6.RELEASE' + dependency 'io.lettuce:lettuce-core:6.1.5.RELEASE' dependency 'jakarta.annotation:jakarta.annotation-api:1.3.5' dependency 'jakarta.servlet:jakarta.servlet-api:4.0.4' dependency 'mysql:mysql-connector-java:8.0.27' dependency 'org.apache.derby:derby:10.14.2.0' - dependency 'org.assertj:assertj-core:3.22.0' + dependency 'org.assertj:assertj-core:3.21.0' dependency 'org.hamcrest:hamcrest:2.1' - dependency 'org.hsqldb:hsqldb:2.6.1' + dependency 'org.hsqldb:hsqldb:2.5.2' dependency 'org.mariadb.jdbc:mariadb-java-client:2.7.4' - dependencySet(group: 'org.mockito', version: '4.2.0') { + dependencySet(group: 'org.mockito', version: '4.0.0') { entry 'mockito-core' entry 'mockito-junit-jupiter' } diff --git a/spring-session-samples/gradle/dependency-management.gradle b/spring-session-samples/gradle/dependency-management.gradle index 606051f6..8a49c1b5 100644 --- a/spring-session-samples/gradle/dependency-management.gradle +++ b/spring-session-samples/gradle/dependency-management.gradle @@ -4,14 +4,14 @@ dependencyManagement { } dependencies { - dependency 'ch.qos.logback:logback-classic:1.2.10' + 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' dependency 'org.apache.taglibs:taglibs-standard-jstlel:1.2.5' dependency 'org.seleniumhq.selenium:htmlunit-driver:2.52.0' - dependency 'org.slf4j:jcl-over-slf4j:1.7.33' - dependency 'org.slf4j:log4j-over-slf4j:1.7.33' + dependency 'org.slf4j:jcl-over-slf4j:1.7.32' + dependency 'org.slf4j:log4j-over-slf4j:1.7.32' dependency 'org.webjars:bootstrap:2.3.2' dependency 'org.webjars:html5shiv:3.7.3-1' dependency 'org.webjars:jquery:3.6.0' From a70abd90bde9a7e86dcf67d45be389c60cf1b81d Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Tue, 18 Jan 2022 11:29:58 +0100 Subject: [PATCH 043/108] Upgrade test dependencies --- gradle/dependency-management.gradle | 10 +++++----- .../gradle/dependency-management.gradle | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle index d4847c84..7e34d14c 100644 --- a/gradle/dependency-management.gradle +++ b/gradle/dependency-management.gradle @@ -16,24 +16,24 @@ dependencyManagement { } dependency 'org.aspectj:aspectjweaver:1.9.7' - dependency 'ch.qos.logback:logback-core:1.2.9' + dependency 'ch.qos.logback:logback-core:1.2.10' 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.1.jre8' - dependency 'com.oracle.database.jdbc:ojdbc8:21.3.0.0' + dependency 'com.oracle.database.jdbc:ojdbc8:21.4.0.0.1' 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 'io.lettuce:lettuce-core:6.1.6.RELEASE' dependency 'jakarta.annotation:jakarta.annotation-api:1.3.5' dependency 'jakarta.servlet:jakarta.servlet-api:4.0.4' 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.assertj:assertj-core:3.22.0' dependency 'org.hamcrest:hamcrest:2.1' dependency 'org.hsqldb:hsqldb:2.5.2' dependency 'org.mariadb.jdbc:mariadb-java-client:2.7.4' - dependencySet(group: 'org.mockito', version: '4.0.0') { + dependencySet(group: 'org.mockito', version: '4.2.0') { entry 'mockito-core' entry 'mockito-junit-jupiter' } diff --git a/spring-session-samples/gradle/dependency-management.gradle b/spring-session-samples/gradle/dependency-management.gradle index 8a49c1b5..606051f6 100644 --- a/spring-session-samples/gradle/dependency-management.gradle +++ b/spring-session-samples/gradle/dependency-management.gradle @@ -4,14 +4,14 @@ dependencyManagement { } dependencies { - dependency 'ch.qos.logback:logback-classic:1.2.9' + dependency 'ch.qos.logback:logback-classic:1.2.10' 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' dependency 'org.apache.taglibs:taglibs-standard-jstlel:1.2.5' dependency 'org.seleniumhq.selenium:htmlunit-driver:2.52.0' - dependency 'org.slf4j:jcl-over-slf4j:1.7.32' - dependency 'org.slf4j:log4j-over-slf4j:1.7.32' + dependency 'org.slf4j:jcl-over-slf4j:1.7.33' + dependency 'org.slf4j:log4j-over-slf4j:1.7.33' dependency 'org.webjars:bootstrap:2.3.2' dependency 'org.webjars:html5shiv:3.7.3-1' dependency 'org.webjars:jquery:3.6.0' From 315b9c9929c6b266146368170013ad2900e73694 Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Tue, 18 Jan 2022 12:51:40 +0100 Subject: [PATCH 044/108] Release 2.7.0-M1 --- gradle.properties | 2 +- spring-session-docs/antora.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index ef20cd90..88c6dbe3 100644 --- a/gradle.properties +++ b/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.7.0-SNAPSHOT +version=2.7.0-M1 diff --git a/spring-session-docs/antora.yml b/spring-session-docs/antora.yml index 5a71442d..d41e37da 100644 --- a/spring-session-docs/antora.yml +++ b/spring-session-docs/antora.yml @@ -1,3 +1,3 @@ name: ROOT version: '2.7.0' -prerelease: '-SNAPSHOT' +prerelease: '-M1' From 2e8c4292fd7a3673204ac6a0732b40d53b0861b6 Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Tue, 18 Jan 2022 13:01:30 +0100 Subject: [PATCH 045/108] Next development version --- gradle.properties | 2 +- spring-session-docs/antora.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 88c6dbe3..ef20cd90 100644 --- a/gradle.properties +++ b/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.7.0-M1 +version=2.7.0-SNAPSHOT diff --git a/spring-session-docs/antora.yml b/spring-session-docs/antora.yml index d41e37da..5a71442d 100644 --- a/spring-session-docs/antora.yml +++ b/spring-session-docs/antora.yml @@ -1,3 +1,3 @@ name: ROOT version: '2.7.0' -prerelease: '-M1' +prerelease: '-SNAPSHOT' From 81bd6bd2612c4b0b0f1a43e4ef5c504545862eea Mon Sep 17 00:00:00 2001 From: Ruslan Molchanov Date: Tue, 28 Dec 2021 16:46:32 +0300 Subject: [PATCH 046/108] Fix memory leak with null principal in Redis Closes gh-1987 --- .../RedisIndexedSessionRepositoryITests.java | 24 +++++++++++++++++++ .../redis/RedisIndexedSessionRepository.java | 12 ++++++---- 2 files changed, 31 insertions(+), 5 deletions(-) diff --git a/spring-session-data-redis/src/integration-test/java/org/springframework/session/data/redis/RedisIndexedSessionRepositoryITests.java b/spring-session-data-redis/src/integration-test/java/org/springframework/session/data/redis/RedisIndexedSessionRepositoryITests.java index e1665aee..08745fab 100644 --- a/spring-session-data-redis/src/integration-test/java/org/springframework/session/data/redis/RedisIndexedSessionRepositoryITests.java +++ b/spring-session-data-redis/src/integration-test/java/org/springframework/session/data/redis/RedisIndexedSessionRepositoryITests.java @@ -527,6 +527,30 @@ class RedisIndexedSessionRepositoryITests extends AbstractRedisITests { assertThat(findByPrincipalName.keySet()).containsOnly(changeSessionId); } + @Test // gh-1987 + void changeSessionIdWhenPrincipalNameChangesFromNullThenIndexShouldNotBeCreated() { + String principalName = null; + String principalNameChanged = "findByChangedPrincipalName" + UUID.randomUUID(); + RedisSession toSave = this.repository.createSession(); + toSave.setAttribute(INDEX_NAME, principalName); + + this.repository.save(toSave); + + RedisSession findById = this.repository.findById(toSave.getId()); + String changeSessionId = findById.changeSessionId(); + findById.setAttribute(INDEX_NAME, principalNameChanged); + this.repository.save(findById); + + Map findByPrincipalName = this.repository.findByIndexNameAndIndexValue(INDEX_NAME, + principalName); + assertThat(findByPrincipalName).isEmpty(); + + findByPrincipalName = this.repository.findByIndexNameAndIndexValue(INDEX_NAME, principalNameChanged); + + assertThat(findByPrincipalName).hasSize(1); + assertThat(findByPrincipalName.keySet()).containsOnly(changeSessionId); + } + @Test void changeSessionIdWhenOnlyChangeId() { String attrName = "changeSessionId"; diff --git a/spring-session-data-redis/src/main/java/org/springframework/session/data/redis/RedisIndexedSessionRepository.java b/spring-session-data-redis/src/main/java/org/springframework/session/data/redis/RedisIndexedSessionRepository.java index e1cd731d..19f3e0a2 100644 --- a/spring-session-data-redis/src/main/java/org/springframework/session/data/redis/RedisIndexedSessionRepository.java +++ b/spring-session-data-redis/src/main/java/org/springframework/session/data/redis/RedisIndexedSessionRepository.java @@ -858,11 +858,13 @@ public class RedisIndexedSessionRepository catch (NonTransientDataAccessException ex) { handleErrNoSuchKeyError(ex); } - String originalPrincipalRedisKey = getPrincipalKey(this.originalPrincipalName); - RedisIndexedSessionRepository.this.sessionRedisOperations.boundSetOps(originalPrincipalRedisKey) - .remove(this.originalSessionId); - RedisIndexedSessionRepository.this.sessionRedisOperations.boundSetOps(originalPrincipalRedisKey) - .add(sessionId); + if (this.originalPrincipalName != null) { + String originalPrincipalRedisKey = getPrincipalKey(this.originalPrincipalName); + RedisIndexedSessionRepository.this.sessionRedisOperations.boundSetOps(originalPrincipalRedisKey) + .remove(this.originalSessionId); + RedisIndexedSessionRepository.this.sessionRedisOperations.boundSetOps(originalPrincipalRedisKey) + .add(sessionId); + } } this.originalSessionId = sessionId; } From 12ce8de84eb215bda0b1ad07c5b8198221450e85 Mon Sep 17 00:00:00 2001 From: Ruslan Molchanov Date: Tue, 28 Dec 2021 16:46:32 +0300 Subject: [PATCH 047/108] Fix memory leak with null principal in Redis Closes gh-1987 --- .../RedisIndexedSessionRepositoryITests.java | 24 +++++++++++++++++++ .../redis/RedisIndexedSessionRepository.java | 12 ++++++---- 2 files changed, 31 insertions(+), 5 deletions(-) diff --git a/spring-session-data-redis/src/integration-test/java/org/springframework/session/data/redis/RedisIndexedSessionRepositoryITests.java b/spring-session-data-redis/src/integration-test/java/org/springframework/session/data/redis/RedisIndexedSessionRepositoryITests.java index e1665aee..08745fab 100644 --- a/spring-session-data-redis/src/integration-test/java/org/springframework/session/data/redis/RedisIndexedSessionRepositoryITests.java +++ b/spring-session-data-redis/src/integration-test/java/org/springframework/session/data/redis/RedisIndexedSessionRepositoryITests.java @@ -527,6 +527,30 @@ class RedisIndexedSessionRepositoryITests extends AbstractRedisITests { assertThat(findByPrincipalName.keySet()).containsOnly(changeSessionId); } + @Test // gh-1987 + void changeSessionIdWhenPrincipalNameChangesFromNullThenIndexShouldNotBeCreated() { + String principalName = null; + String principalNameChanged = "findByChangedPrincipalName" + UUID.randomUUID(); + RedisSession toSave = this.repository.createSession(); + toSave.setAttribute(INDEX_NAME, principalName); + + this.repository.save(toSave); + + RedisSession findById = this.repository.findById(toSave.getId()); + String changeSessionId = findById.changeSessionId(); + findById.setAttribute(INDEX_NAME, principalNameChanged); + this.repository.save(findById); + + Map findByPrincipalName = this.repository.findByIndexNameAndIndexValue(INDEX_NAME, + principalName); + assertThat(findByPrincipalName).isEmpty(); + + findByPrincipalName = this.repository.findByIndexNameAndIndexValue(INDEX_NAME, principalNameChanged); + + assertThat(findByPrincipalName).hasSize(1); + assertThat(findByPrincipalName.keySet()).containsOnly(changeSessionId); + } + @Test void changeSessionIdWhenOnlyChangeId() { String attrName = "changeSessionId"; diff --git a/spring-session-data-redis/src/main/java/org/springframework/session/data/redis/RedisIndexedSessionRepository.java b/spring-session-data-redis/src/main/java/org/springframework/session/data/redis/RedisIndexedSessionRepository.java index e1cd731d..19f3e0a2 100644 --- a/spring-session-data-redis/src/main/java/org/springframework/session/data/redis/RedisIndexedSessionRepository.java +++ b/spring-session-data-redis/src/main/java/org/springframework/session/data/redis/RedisIndexedSessionRepository.java @@ -858,11 +858,13 @@ public class RedisIndexedSessionRepository catch (NonTransientDataAccessException ex) { handleErrNoSuchKeyError(ex); } - String originalPrincipalRedisKey = getPrincipalKey(this.originalPrincipalName); - RedisIndexedSessionRepository.this.sessionRedisOperations.boundSetOps(originalPrincipalRedisKey) - .remove(this.originalSessionId); - RedisIndexedSessionRepository.this.sessionRedisOperations.boundSetOps(originalPrincipalRedisKey) - .add(sessionId); + if (this.originalPrincipalName != null) { + String originalPrincipalRedisKey = getPrincipalKey(this.originalPrincipalName); + RedisIndexedSessionRepository.this.sessionRedisOperations.boundSetOps(originalPrincipalRedisKey) + .remove(this.originalSessionId); + RedisIndexedSessionRepository.this.sessionRedisOperations.boundSetOps(originalPrincipalRedisKey) + .add(sessionId); + } } this.originalSessionId = sessionId; } From 75c60b27bdd2cdd7e675adba82fc80d964e03053 Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Thu, 20 Jan 2022 13:22:31 +0100 Subject: [PATCH 048/108] Exclude 3.0.0-M1 and 2.7.0-M1 tags from antora Closes gh-2014 --- spring-session-docs/antora-playbook.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-session-docs/antora-playbook.yml b/spring-session-docs/antora-playbook.yml index ab9ba700..39c15a89 100644 --- a/spring-session-docs/antora-playbook.yml +++ b/spring-session-docs/antora-playbook.yml @@ -10,7 +10,7 @@ content: branches: [spring-projects/spring-session/*] - url: https://github.com/spring-projects/spring-session branches: [main,3.0.x] - tags: ['3.0.*', '2.7.*', '2.6.*','!2.6.0-M*','!2.6.0-RC*'] + tags: [ '3.0.*', '2.7.*', '2.6.*','!2.6.0-M*','!2.6.0-RC*','!2.7.0-M1','!3.0.0-M1'] start_path: spring-session-docs urls: latest_version_segment_strategy: redirect:to From ad67a3775bd2907d455d6ec5822e3f732b13b8be Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Thu, 20 Jan 2022 13:52:11 +0100 Subject: [PATCH 049/108] Add manual trigger to antora generate workflow Issue gh-2014 --- .github/workflows/antora-generate.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/antora-generate.yml b/.github/workflows/antora-generate.yml index 3612b901..2a5bed58 100644 --- a/.github/workflows/antora-generate.yml +++ b/.github/workflows/antora-generate.yml @@ -1,6 +1,7 @@ name: Generate Antora Files and Request Build on: + workflow_dispatch: # Manual trigger push: branches-ignore: - 'gh-pages' From 44ff959c5934264ae0b5bae50f7251b1525745e0 Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Fri, 21 Jan 2022 10:13:47 +0100 Subject: [PATCH 050/108] Include 2.6.x branch in Antora docs Issue gh-2014 --- spring-session-docs/antora-playbook.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-session-docs/antora-playbook.yml b/spring-session-docs/antora-playbook.yml index 39c15a89..0c4a1bd1 100644 --- a/spring-session-docs/antora-playbook.yml +++ b/spring-session-docs/antora-playbook.yml @@ -9,7 +9,7 @@ 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,3.0.x] + branches: [main,3.0.x,2.6.x] tags: [ '3.0.*', '2.7.*', '2.6.*','!2.6.0-M*','!2.6.0-RC*','!2.7.0-M1','!3.0.0-M1'] start_path: spring-session-docs urls: From 8f20fa328a866f1c3bad18dfa2f0dbbd04b13393 Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Fri, 14 Jan 2022 16:19:22 +0100 Subject: [PATCH 051/108] Update to jakarta.annotation-api dependency Closes gh-1956 --- gradle/dependency-management.gradle | 2 +- spring-session-core/spring-session-core.gradle | 2 +- spring-session-hazelcast/hazelcast4/hazelcast4.gradle | 2 +- spring-session-hazelcast/spring-session-hazelcast.gradle | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle index fd37c29d..a9c8f6b8 100644 --- a/gradle/dependency-management.gradle +++ b/gradle/dependency-management.gradle @@ -25,7 +25,7 @@ dependencyManagement { 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 'jakarta.annotation:jakarta.annotation-api:1.3.5' dependency 'javax.servlet:javax.servlet-api:4.0.1' dependency 'mysql:mysql-connector-java:8.0.27' dependency 'org.apache.derby:derby:10.14.2.0' diff --git a/spring-session-core/spring-session-core.gradle b/spring-session-core/spring-session-core.gradle index 4182f8cf..25c4c36b 100644 --- a/spring-session-core/spring-session-core.gradle +++ b/spring-session-core/spring-session-core.gradle @@ -6,7 +6,7 @@ dependencies { api "org.springframework:spring-jcl" optional "io.projectreactor:reactor-core" - optional "javax.annotation:javax.annotation-api" + optional "jakarta.annotation:jakarta.annotation-api" optional "javax.servlet:javax.servlet-api" optional "org.springframework:spring-context" optional "org.springframework:spring-jdbc" diff --git a/spring-session-hazelcast/hazelcast4/hazelcast4.gradle b/spring-session-hazelcast/hazelcast4/hazelcast4.gradle index 6642372b..e4e8d9bd 100644 --- a/spring-session-hazelcast/hazelcast4/hazelcast4.gradle +++ b/spring-session-hazelcast/hazelcast4/hazelcast4.gradle @@ -23,7 +23,7 @@ dependencies { api project(':spring-session-core') optional "com.hazelcast:hazelcast:4.2.3" api "org.springframework:spring-context" - api "javax.annotation:javax.annotation-api" + api "jakarta.annotation:jakarta.annotation-api" testImplementation "javax.servlet:javax.servlet-api" testImplementation "org.assertj:assertj-core" diff --git a/spring-session-hazelcast/spring-session-hazelcast.gradle b/spring-session-hazelcast/spring-session-hazelcast.gradle index 408664a8..951eaf43 100644 --- a/spring-session-hazelcast/spring-session-hazelcast.gradle +++ b/spring-session-hazelcast/spring-session-hazelcast.gradle @@ -7,7 +7,7 @@ configurations { dependencies { api project(':spring-session-core') api "com.hazelcast:hazelcast" - api "javax.annotation:javax.annotation-api" + api "jakarta.annotation:jakarta.annotation-api" api "org.springframework:spring-context" hazelcast4(project(path: ":hazelcast4", configuration: 'classesOnlyElements')) From a0246a61b68dc49d23403eeaa5d843e02fb10cde Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Fri, 14 Jan 2022 16:21:35 +0100 Subject: [PATCH 052/108] Update to jakarta.servlet-api dependency Closes gh-1960 --- .../resources/samples/integrationtest/withpropdeps/build.gradle | 2 +- .../samples/showcase/samples/sgbcs-sample-war/build.gradle | 2 +- gradle/dependency-management.gradle | 2 +- spring-session-core/spring-session-core.gradle | 2 +- spring-session-data-mongodb/spring-session-data-mongodb.gradle | 2 +- spring-session-data-redis/spring-session-data-redis.gradle | 2 +- spring-session-docs/spring-session-docs.gradle | 2 +- spring-session-hazelcast/hazelcast4/hazelcast4.gradle | 2 +- spring-session-hazelcast/spring-session-hazelcast.gradle | 2 +- spring-session-jdbc/spring-session-jdbc.gradle | 2 +- .../spring-session-sample-javaconfig-custom-cookie.gradle | 2 +- .../spring-session-sample-javaconfig-hazelcast.gradle | 2 +- .../spring-session-sample-javaconfig-jdbc.gradle | 2 +- .../spring-session-sample-javaconfig-redis.gradle | 2 +- .../spring-session-sample-javaconfig-rest.gradle | 2 +- .../spring-session-sample-javaconfig-security.gradle | 2 +- .../spring-session-sample-misc-hazelcast.gradle | 2 +- .../spring-session-sample-xml-jdbc.gradle | 2 +- .../spring-session-sample-xml-redis.gradle | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/buildSrc/src/test/resources/samples/integrationtest/withpropdeps/build.gradle b/buildSrc/src/test/resources/samples/integrationtest/withpropdeps/build.gradle index cc4b661e..0bdffa27 100644 --- a/buildSrc/src/test/resources/samples/integrationtest/withpropdeps/build.gradle +++ b/buildSrc/src/test/resources/samples/integrationtest/withpropdeps/build.gradle @@ -9,7 +9,7 @@ repositories { } dependencies { - optional 'javax.servlet:javax.servlet-api:3.1.0' + optional 'jakarta.servlet:jakarta.servlet-api:4.0.4' testImplementation platform('org.junit:junit-bom:5.8.1') testImplementation 'org.junit.jupiter:junit-jupiter-api' testImplementation 'org.junit.jupiter:junit-jupiter-engine' diff --git a/buildSrc/src/test/resources/samples/showcase/samples/sgbcs-sample-war/build.gradle b/buildSrc/src/test/resources/samples/showcase/samples/sgbcs-sample-war/build.gradle index 750a5735..b68d8b30 100644 --- a/buildSrc/src/test/resources/samples/showcase/samples/sgbcs-sample-war/build.gradle +++ b/buildSrc/src/test/resources/samples/showcase/samples/sgbcs-sample-war/build.gradle @@ -4,7 +4,7 @@ plugins { } dependencies { - provided 'javax.servlet:javax.servlet-api' + provided 'jakarta.servlet:jakarta.servlet-api:4.0.4' testImplementation 'commons-io:commons-io:2.11.0' testImplementation 'org.assertj:assertj-core:3.21.0' testImplementation platform('org.junit:junit-bom:5.8.1') diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle index a9c8f6b8..45f0cb50 100644 --- a/gradle/dependency-management.gradle +++ b/gradle/dependency-management.gradle @@ -26,7 +26,7 @@ dependencyManagement { dependency 'edu.umd.cs.mtc:multithreadedtc:1.01' dependency 'io.lettuce:lettuce-core:6.1.5.RELEASE' dependency 'jakarta.annotation:jakarta.annotation-api:1.3.5' - dependency 'javax.servlet:javax.servlet-api:4.0.1' + dependency 'jakarta.servlet:jakarta.servlet-api:4.0.4' 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' diff --git a/spring-session-core/spring-session-core.gradle b/spring-session-core/spring-session-core.gradle index 25c4c36b..1adc0e80 100644 --- a/spring-session-core/spring-session-core.gradle +++ b/spring-session-core/spring-session-core.gradle @@ -7,7 +7,7 @@ dependencies { optional "io.projectreactor:reactor-core" optional "jakarta.annotation:jakarta.annotation-api" - optional "javax.servlet:javax.servlet-api" + optional "jakarta.servlet:jakarta.servlet-api" optional "org.springframework:spring-context" optional "org.springframework:spring-jdbc" optional "org.springframework:spring-messaging" diff --git a/spring-session-data-mongodb/spring-session-data-mongodb.gradle b/spring-session-data-mongodb/spring-session-data-mongodb.gradle index 8d24631e..a1f00178 100644 --- a/spring-session-data-mongodb/spring-session-data-mongodb.gradle +++ b/spring-session-data-mongodb/spring-session-data-mongodb.gradle @@ -41,5 +41,5 @@ dependencies { testImplementation "org.mockito:mockito-core" testImplementation "org.mockito:mockito-junit-jupiter" testImplementation "io.projectreactor:reactor-test" - testImplementation "javax.servlet:javax.servlet-api" + testImplementation "jakarta.servlet:jakarta.servlet-api" } diff --git a/spring-session-data-redis/spring-session-data-redis.gradle b/spring-session-data-redis/spring-session-data-redis.gradle index e00c7ab4..6b701b8d 100644 --- a/spring-session-data-redis/spring-session-data-redis.gradle +++ b/spring-session-data-redis/spring-session-data-redis.gradle @@ -15,7 +15,7 @@ dependencies { testImplementation "org.mockito:mockito-core" testImplementation "org.springframework:spring-test" testImplementation "io.projectreactor:reactor-test" - testImplementation "javax.servlet:javax.servlet-api" + testImplementation "jakarta.servlet:jakarta.servlet-api" testImplementation "org.springframework:spring-web" testImplementation "org.springframework.security:spring-security-core" testImplementation "org.junit.jupiter:junit-jupiter-api" diff --git a/spring-session-docs/spring-session-docs.gradle b/spring-session-docs/spring-session-docs.gradle index b0fb52d7..1c47661b 100644 --- a/spring-session-docs/spring-session-docs.gradle +++ b/spring-session-docs/spring-session-docs.gradle @@ -22,7 +22,7 @@ dependencies { testImplementation 'org.assertj:assertj-core' testImplementation 'com.hazelcast:hazelcast' testImplementation 'io.lettuce:lettuce-core' - testImplementation 'javax.servlet:javax.servlet-api' + testImplementation 'jakarta.servlet:jakarta.servlet-api' testImplementation 'org.junit.jupiter:junit-jupiter-api' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' } diff --git a/spring-session-hazelcast/hazelcast4/hazelcast4.gradle b/spring-session-hazelcast/hazelcast4/hazelcast4.gradle index e4e8d9bd..d4ce5b7d 100644 --- a/spring-session-hazelcast/hazelcast4/hazelcast4.gradle +++ b/spring-session-hazelcast/hazelcast4/hazelcast4.gradle @@ -25,7 +25,7 @@ dependencies { api "org.springframework:spring-context" api "jakarta.annotation:jakarta.annotation-api" - testImplementation "javax.servlet:javax.servlet-api" + testImplementation "jakarta.servlet:jakarta.servlet-api" testImplementation "org.assertj:assertj-core" testImplementation "org.mockito:mockito-core" testImplementation "org.springframework:spring-test" diff --git a/spring-session-hazelcast/spring-session-hazelcast.gradle b/spring-session-hazelcast/spring-session-hazelcast.gradle index 951eaf43..b7cd931f 100644 --- a/spring-session-hazelcast/spring-session-hazelcast.gradle +++ b/spring-session-hazelcast/spring-session-hazelcast.gradle @@ -13,7 +13,7 @@ dependencies { hazelcast4(project(path: ":hazelcast4", configuration: 'classesOnlyElements')) compileOnly(project(":hazelcast4")) - testImplementation "javax.servlet:javax.servlet-api" + testImplementation "jakarta.servlet:jakarta.servlet-api" testImplementation "org.assertj:assertj-core" testImplementation "org.mockito:mockito-core" testImplementation "org.springframework:spring-test" diff --git a/spring-session-jdbc/spring-session-jdbc.gradle b/spring-session-jdbc/spring-session-jdbc.gradle index 21867b21..3d255b67 100644 --- a/spring-session-jdbc/spring-session-jdbc.gradle +++ b/spring-session-jdbc/spring-session-jdbc.gradle @@ -7,7 +7,7 @@ dependencies { api "org.springframework:spring-context" api "org.springframework:spring-jdbc" - testImplementation "javax.servlet:javax.servlet-api" + testImplementation "jakarta.servlet:jakarta.servlet-api" testImplementation "org.assertj:assertj-core" testImplementation "org.mockito:mockito-core" testImplementation "org.springframework:spring-test" diff --git a/spring-session-samples/spring-session-sample-javaconfig-custom-cookie/spring-session-sample-javaconfig-custom-cookie.gradle b/spring-session-samples/spring-session-sample-javaconfig-custom-cookie/spring-session-sample-javaconfig-custom-cookie.gradle index 31feb7d0..dc3401cf 100644 --- a/spring-session-samples/spring-session-sample-javaconfig-custom-cookie/spring-session-sample-javaconfig-custom-cookie.gradle +++ b/spring-session-samples/spring-session-sample-javaconfig-custom-cookie/spring-session-sample-javaconfig-custom-cookie.gradle @@ -17,7 +17,7 @@ dependencies { implementation "ch.qos.logback:logback-classic" implementation "org.testcontainers:testcontainers" - providedCompile "javax.servlet:javax.servlet-api" + providedCompile "jakarta.servlet:jakarta.servlet-api" testImplementation "org.assertj:assertj-core" testImplementation "org.junit.jupiter:junit-jupiter-api" diff --git a/spring-session-samples/spring-session-sample-javaconfig-hazelcast/spring-session-sample-javaconfig-hazelcast.gradle b/spring-session-samples/spring-session-sample-javaconfig-hazelcast/spring-session-sample-javaconfig-hazelcast.gradle index 6b1837a2..f2a85d1e 100644 --- a/spring-session-samples/spring-session-sample-javaconfig-hazelcast/spring-session-sample-javaconfig-hazelcast.gradle +++ b/spring-session-samples/spring-session-sample-javaconfig-hazelcast/spring-session-sample-javaconfig-hazelcast.gradle @@ -19,7 +19,7 @@ dependencies { implementation "org.slf4j:log4j-over-slf4j" implementation "ch.qos.logback:logback-classic" - providedCompile "javax.servlet:javax.servlet-api" + providedCompile "jakarta.servlet:jakarta.servlet-api" providedCompile "javax.servlet.jsp:javax.servlet.jsp-api" testImplementation "org.assertj:assertj-core" diff --git a/spring-session-samples/spring-session-sample-javaconfig-jdbc/spring-session-sample-javaconfig-jdbc.gradle b/spring-session-samples/spring-session-sample-javaconfig-jdbc/spring-session-sample-javaconfig-jdbc.gradle index 3d3f5ad9..a7ef307c 100644 --- a/spring-session-samples/spring-session-sample-javaconfig-jdbc/spring-session-sample-javaconfig-jdbc.gradle +++ b/spring-session-samples/spring-session-sample-javaconfig-jdbc/spring-session-sample-javaconfig-jdbc.gradle @@ -16,7 +16,7 @@ dependencies { implementation "org.slf4j:log4j-over-slf4j" implementation "ch.qos.logback:logback-classic" - providedCompile "javax.servlet:javax.servlet-api" + providedCompile "jakarta.servlet:jakarta.servlet-api" testImplementation "org.assertj:assertj-core" testImplementation "org.junit.jupiter:junit-jupiter-api" diff --git a/spring-session-samples/spring-session-sample-javaconfig-redis/spring-session-sample-javaconfig-redis.gradle b/spring-session-samples/spring-session-sample-javaconfig-redis/spring-session-sample-javaconfig-redis.gradle index 6f12909c..459bc911 100644 --- a/spring-session-samples/spring-session-sample-javaconfig-redis/spring-session-sample-javaconfig-redis.gradle +++ b/spring-session-samples/spring-session-sample-javaconfig-redis/spring-session-sample-javaconfig-redis.gradle @@ -17,7 +17,7 @@ dependencies { implementation "ch.qos.logback:logback-classic" implementation "org.testcontainers:testcontainers" - providedCompile "javax.servlet:javax.servlet-api" + providedCompile "jakarta.servlet:jakarta.servlet-api" testImplementation "org.assertj:assertj-core" testImplementation "org.junit.jupiter:junit-jupiter-api" diff --git a/spring-session-samples/spring-session-sample-javaconfig-rest/spring-session-sample-javaconfig-rest.gradle b/spring-session-samples/spring-session-sample-javaconfig-rest/spring-session-sample-javaconfig-rest.gradle index d827edc4..520b9a00 100644 --- a/spring-session-samples/spring-session-sample-javaconfig-rest/spring-session-sample-javaconfig-rest.gradle +++ b/spring-session-samples/spring-session-sample-javaconfig-rest/spring-session-sample-javaconfig-rest.gradle @@ -18,7 +18,7 @@ dependencies { implementation "ch.qos.logback:logback-classic" implementation "org.testcontainers:testcontainers" - providedCompile "javax.servlet:javax.servlet-api" + providedCompile "jakarta.servlet:jakarta.servlet-api" testImplementation "org.springframework.security:spring-security-test" testImplementation "org.assertj:assertj-core" diff --git a/spring-session-samples/spring-session-sample-javaconfig-security/spring-session-sample-javaconfig-security.gradle b/spring-session-samples/spring-session-sample-javaconfig-security/spring-session-sample-javaconfig-security.gradle index 13b3e261..a7a57c22 100644 --- a/spring-session-samples/spring-session-sample-javaconfig-security/spring-session-sample-javaconfig-security.gradle +++ b/spring-session-samples/spring-session-sample-javaconfig-security/spring-session-sample-javaconfig-security.gradle @@ -19,7 +19,7 @@ dependencies { implementation "ch.qos.logback:logback-classic" implementation "org.testcontainers:testcontainers" - providedCompile "javax.servlet:javax.servlet-api" + providedCompile "jakarta.servlet:jakarta.servlet-api" providedCompile "javax.servlet.jsp:javax.servlet.jsp-api" testImplementation "org.assertj:assertj-core" diff --git a/spring-session-samples/spring-session-sample-misc-hazelcast/spring-session-sample-misc-hazelcast.gradle b/spring-session-samples/spring-session-sample-misc-hazelcast/spring-session-sample-misc-hazelcast.gradle index 27910b9c..b280a1fb 100644 --- a/spring-session-samples/spring-session-sample-misc-hazelcast/spring-session-sample-misc-hazelcast.gradle +++ b/spring-session-samples/spring-session-sample-misc-hazelcast/spring-session-sample-misc-hazelcast.gradle @@ -15,7 +15,7 @@ dependencies { implementation "org.slf4j:log4j-over-slf4j" implementation "ch.qos.logback:logback-classic" - providedCompile "javax.servlet:javax.servlet-api" + providedCompile "jakarta.servlet:jakarta.servlet-api" testImplementation "org.assertj:assertj-core" testImplementation "org.junit.jupiter:junit-jupiter-api" diff --git a/spring-session-samples/spring-session-sample-xml-jdbc/spring-session-sample-xml-jdbc.gradle b/spring-session-samples/spring-session-sample-xml-jdbc/spring-session-sample-xml-jdbc.gradle index 4f516f74..0f3d3514 100644 --- a/spring-session-samples/spring-session-sample-xml-jdbc/spring-session-sample-xml-jdbc.gradle +++ b/spring-session-samples/spring-session-sample-xml-jdbc/spring-session-sample-xml-jdbc.gradle @@ -16,7 +16,7 @@ dependencies { implementation "org.slf4j:log4j-over-slf4j" implementation "ch.qos.logback:logback-classic" - providedCompile "javax.servlet:javax.servlet-api" + providedCompile "jakarta.servlet:jakarta.servlet-api" testImplementation "org.assertj:assertj-core" testImplementation "org.junit.jupiter:junit-jupiter-api" diff --git a/spring-session-samples/spring-session-sample-xml-redis/spring-session-sample-xml-redis.gradle b/spring-session-samples/spring-session-sample-xml-redis/spring-session-sample-xml-redis.gradle index 6f12909c..459bc911 100644 --- a/spring-session-samples/spring-session-sample-xml-redis/spring-session-sample-xml-redis.gradle +++ b/spring-session-samples/spring-session-sample-xml-redis/spring-session-sample-xml-redis.gradle @@ -17,7 +17,7 @@ dependencies { implementation "ch.qos.logback:logback-classic" implementation "org.testcontainers:testcontainers" - providedCompile "javax.servlet:javax.servlet-api" + providedCompile "jakarta.servlet:jakarta.servlet-api" testImplementation "org.assertj:assertj-core" testImplementation "org.junit.jupiter:junit-jupiter-api" From ab5c7278465182f78cbc4bf9da3638f53086aad9 Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Thu, 27 Jan 2022 14:11:26 +0100 Subject: [PATCH 053/108] Update Websocket sample to be compatible with H2 2.0 Closes gh-2013 --- .../src/main/java/sample/data/User.java | 4 ++-- .../src/main/resources/data.sql | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/spring-session-samples/spring-session-sample-boot-websocket/src/main/java/sample/data/User.java b/spring-session-samples/spring-session-sample-boot-websocket/src/main/java/sample/data/User.java index d815d2c8..c4cb4bf2 100644 --- a/spring-session-samples/spring-session-sample-boot-websocket/src/main/java/sample/data/User.java +++ b/spring-session-samples/spring-session-sample-boot-websocket/src/main/java/sample/data/User.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2019 the original author or authors. + * Copyright 2014-2022 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. @@ -38,7 +38,7 @@ import org.springframework.security.crypto.password.PasswordEncoder; * * @author Rob Winch */ -@Entity +@Entity(name = "custom_user") public class User implements Serializable { @Id diff --git a/spring-session-samples/spring-session-sample-boot-websocket/src/main/resources/data.sql b/spring-session-samples/spring-session-sample-boot-websocket/src/main/resources/data.sql index 56b07486..8eda4935 100644 --- a/spring-session-samples/spring-session-sample-boot-websocket/src/main/resources/data.sql +++ b/spring-session-samples/spring-session-sample-boot-websocket/src/main/resources/data.sql @@ -1,5 +1,5 @@ -insert into user(id,email,password,first_name,last_name) values (0,'rob','password','Rob','Winch'); -insert into user(id,email,password,first_name,last_name) values (1,'luke','password','Luke','Taylor'); -insert into user(id,email,password,first_name,last_name) values (2,'eve','password','Luke','Taylor'); +insert into custom_user(id,email,password,first_name,last_name) values (0,'rob','password','Rob','Winch'); +insert into custom_user(id,email,password,first_name,last_name) values (1,'luke','password','Luke','Taylor'); +insert into custom_user(id,email,password,first_name,last_name) values (2,'eve','password','Luke','Taylor'); -update user set password = '$2a$10$FBAKClV1zBIOOC9XMXf3AO8RoGXYVYsfvUdoLxGkd/BnXEn4tqT3u'; +update custom_user set password = '$2a$10$FBAKClV1zBIOOC9XMXf3AO8RoGXYVYsfvUdoLxGkd/BnXEn4tqT3u'; From 11aa50e83cf336c19d6130c8d27c6a564a9fb990 Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Tue, 22 Feb 2022 10:24:32 +0100 Subject: [PATCH 054/108] Upgrade Spring Security to 5.6.2 Closes gh-2030 --- gradle/dependency-management.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle index 45f0cb50..84605cfc 100644 --- a/gradle/dependency-management.gradle +++ b/gradle/dependency-management.gradle @@ -5,7 +5,7 @@ dependencyManagement { 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.springframework.security:spring-security-bom:5.6.2' mavenBom 'org.testcontainers:testcontainers-bom:1.16.2' } From ad16f17398458d2dff29e0140fb9eb568f702512 Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Tue, 22 Feb 2022 10:24:56 +0100 Subject: [PATCH 055/108] Upgrade Spring Data to 2021.1.2 Closes gh-2032 --- gradle/dependency-management.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle index 84605cfc..acdef82b 100644 --- a/gradle/dependency-management.gradle +++ b/gradle/dependency-management.gradle @@ -4,7 +4,7 @@ dependencyManagement { 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.data:spring-data-bom:2021.1.2' mavenBom 'org.springframework.security:spring-security-bom:5.6.2' mavenBom 'org.testcontainers:testcontainers-bom:1.16.2' } From 3995f8bf65a8088249dd1de7a45b9abe2feab80d Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Tue, 22 Feb 2022 10:25:32 +0100 Subject: [PATCH 056/108] Upgrade Spring Framework to 5.3.16 Closes gh-2028 --- gradle/dependency-management.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle index acdef82b..970dd3e1 100644 --- a/gradle/dependency-management.gradle +++ b/gradle/dependency-management.gradle @@ -3,7 +3,7 @@ dependencyManagement { 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:spring-framework-bom:5.3.16' mavenBom 'org.springframework.data:spring-data-bom:2021.1.2' mavenBom 'org.springframework.security:spring-security-bom:5.6.2' mavenBom 'org.testcontainers:testcontainers-bom:1.16.2' From 0484781541d24dcae0da8a858bff6372283c5f4e Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Tue, 22 Feb 2022 10:26:38 +0100 Subject: [PATCH 057/108] Upgrade Jackson to 2.13.1 Closes gh-2033 --- gradle/dependency-management.gradle | 2 +- spring-session-samples/gradle/dependency-management.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle index 970dd3e1..4019d7cd 100644 --- a/gradle/dependency-management.gradle +++ b/gradle/dependency-management.gradle @@ -1,7 +1,7 @@ dependencyManagement { imports { mavenBom 'io.projectreactor:reactor-bom:2020.0.14' - mavenBom 'com.fasterxml.jackson:jackson-bom:2.13.0' + mavenBom 'com.fasterxml.jackson:jackson-bom:2.13.1' mavenBom 'org.junit:junit-bom:5.8.2' mavenBom 'org.springframework:spring-framework-bom:5.3.16' mavenBom 'org.springframework.data:spring-data-bom:2021.1.2' diff --git a/spring-session-samples/gradle/dependency-management.gradle b/spring-session-samples/gradle/dependency-management.gradle index b99f7d46..8a49c1b5 100644 --- a/spring-session-samples/gradle/dependency-management.gradle +++ b/spring-session-samples/gradle/dependency-management.gradle @@ -1,6 +1,6 @@ dependencyManagement { imports { - mavenBom 'com.fasterxml.jackson:jackson-bom:2.13.0' + mavenBom 'com.fasterxml.jackson:jackson-bom:2.13.1' } dependencies { From 0924c9558a14fbcfbce21b2b47a0546508f4e39c Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Tue, 22 Feb 2022 10:27:20 +0100 Subject: [PATCH 058/108] Upgrade Reactor to 2020.0.16 Closes gh-2031 --- gradle/dependency-management.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle index 4019d7cd..5424575c 100644 --- a/gradle/dependency-management.gradle +++ b/gradle/dependency-management.gradle @@ -1,6 +1,6 @@ dependencyManagement { imports { - mavenBom 'io.projectreactor:reactor-bom:2020.0.14' + mavenBom 'io.projectreactor:reactor-bom:2020.0.16' mavenBom 'com.fasterxml.jackson:jackson-bom:2.13.1' mavenBom 'org.junit:junit-bom:5.8.2' mavenBom 'org.springframework:spring-framework-bom:5.3.16' From 092e6c6607075df70d46709ebc43fdc5def9752f Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Tue, 22 Feb 2022 10:28:02 +0100 Subject: [PATCH 059/108] Upgrade MongoDB to 4.4.2 Closes gh-2034 --- gradle/dependency-management.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle index 5424575c..3052ecbc 100644 --- a/gradle/dependency-management.gradle +++ b/gradle/dependency-management.gradle @@ -38,7 +38,7 @@ dependencyManagement { entry 'mockito-junit-jupiter' } - dependencySet(group: 'org.mongodb', version: '4.4.0') { + dependencySet(group: 'org.mongodb', version: '4.4.2') { entry 'mongodb-driver-core' entry 'mongodb-driver-sync' entry 'mongodb-driver-reactivestreams' From c335a49924f4627dd62672de18a114249ec3815c Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Tue, 22 Feb 2022 10:28:51 +0100 Subject: [PATCH 060/108] Upgrade Hazelcast 4 to 4.2.4 Closes gh-2029 --- spring-session-hazelcast/hazelcast4/hazelcast4.gradle | 4 ++-- .../ClientServerHazelcast4IndexedSessionRepositoryITests.java | 2 +- .../spring-session-sample-boot-hazelcast4.gradle | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-session-hazelcast/hazelcast4/hazelcast4.gradle b/spring-session-hazelcast/hazelcast4/hazelcast4.gradle index d4ce5b7d..34535842 100644 --- a/spring-session-hazelcast/hazelcast4/hazelcast4.gradle +++ b/spring-session-hazelcast/hazelcast4/hazelcast4.gradle @@ -21,7 +21,7 @@ artifacts { dependencies { api project(':spring-session-core') - optional "com.hazelcast:hazelcast:4.2.3" + optional "com.hazelcast:hazelcast:4.2.4" api "org.springframework:spring-context" api "jakarta.annotation:jakarta.annotation-api" @@ -35,7 +35,7 @@ dependencies { testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine" integrationTestCompile "org.testcontainers:testcontainers" - integrationTestCompile "com.hazelcast:hazelcast:4.2.3" + integrationTestCompile "com.hazelcast:hazelcast:4.2.4" integrationTestCompile project(":spring-session-hazelcast") } diff --git a/spring-session-hazelcast/hazelcast4/src/integration-test/java/org/springframework/session/hazelcast/ClientServerHazelcast4IndexedSessionRepositoryITests.java b/spring-session-hazelcast/hazelcast4/src/integration-test/java/org/springframework/session/hazelcast/ClientServerHazelcast4IndexedSessionRepositoryITests.java index dae3d4ec..b40add41 100644 --- a/spring-session-hazelcast/hazelcast4/src/integration-test/java/org/springframework/session/hazelcast/ClientServerHazelcast4IndexedSessionRepositoryITests.java +++ b/spring-session-hazelcast/hazelcast4/src/integration-test/java/org/springframework/session/hazelcast/ClientServerHazelcast4IndexedSessionRepositoryITests.java @@ -45,7 +45,7 @@ import org.springframework.test.context.web.WebAppConfiguration; @WebAppConfiguration class ClientServerHazelcast4IndexedSessionRepositoryITests extends AbstractHazelcast4IndexedSessionRepositoryITests { - private static GenericContainer container = new GenericContainer<>("hazelcast/hazelcast:4.2.2") + private static GenericContainer container = new GenericContainer<>("hazelcast/hazelcast:4.2.4") .withExposedPorts(5701).withCopyFileToContainer(MountableFile.forClasspathResource("/hazelcast-server.xml"), "/opt/hazelcast/hazelcast.xml"); diff --git a/spring-session-samples/spring-session-sample-boot-hazelcast4/spring-session-sample-boot-hazelcast4.gradle b/spring-session-samples/spring-session-sample-boot-hazelcast4/spring-session-sample-boot-hazelcast4.gradle index 4bdaad17..312dc12a 100644 --- a/spring-session-samples/spring-session-sample-boot-hazelcast4/spring-session-sample-boot-hazelcast4.gradle +++ b/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.3" + implementation "com.hazelcast:hazelcast:4.2.4" implementation "nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect" implementation "org.webjars:bootstrap" implementation "org.webjars:html5shiv" From 9be7ac7fa6019d01143de3a8c7466fe7dee8e937 Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Tue, 22 Feb 2022 10:30:29 +0100 Subject: [PATCH 061/108] Upgrade test dependencies --- gradle/dependency-management.gradle | 12 ++++++------ .../gradle/dependency-management.gradle | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle index 3052ecbc..f76d0346 100644 --- a/gradle/dependency-management.gradle +++ b/gradle/dependency-management.gradle @@ -15,19 +15,19 @@ dependencyManagement { entry 'hazelcast-client' } - dependency 'org.aspectj:aspectjweaver:1.9.7' - dependency 'ch.qos.logback:logback-core:1.2.9' + dependency 'org.aspectj:aspectjweaver:1.9.8' + dependency 'ch.qos.logback:logback-core:1.2.10' 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.ibm.db2:jcc:11.5.7.0' 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 'io.lettuce:lettuce-core:6.1.6.RELEASE' dependency 'jakarta.annotation:jakarta.annotation-api:1.3.5' dependency 'jakarta.servlet:jakarta.servlet-api:4.0.4' - dependency 'mysql:mysql-connector-java:8.0.27' + dependency 'mysql:mysql-connector-java:8.0.28' dependency 'org.apache.derby:derby:10.14.2.0' dependency 'org.assertj:assertj-core:3.21.0' dependency 'org.hamcrest:hamcrest:2.1' @@ -43,7 +43,7 @@ dependencyManagement { entry 'mongodb-driver-sync' entry 'mongodb-driver-reactivestreams' } - dependency 'org.postgresql:postgresql:42.3.1' + dependency 'org.postgresql:postgresql:42.3.3' } } diff --git a/spring-session-samples/gradle/dependency-management.gradle b/spring-session-samples/gradle/dependency-management.gradle index 8a49c1b5..da7a6810 100644 --- a/spring-session-samples/gradle/dependency-management.gradle +++ b/spring-session-samples/gradle/dependency-management.gradle @@ -4,14 +4,14 @@ dependencyManagement { } dependencies { - dependency 'ch.qos.logback:logback-classic:1.2.9' + dependency 'ch.qos.logback:logback-classic:1.2.10' 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' dependency 'org.apache.taglibs:taglibs-standard-jstlel:1.2.5' dependency 'org.seleniumhq.selenium:htmlunit-driver:2.52.0' - dependency 'org.slf4j:jcl-over-slf4j:1.7.32' - dependency 'org.slf4j:log4j-over-slf4j:1.7.32' + dependency 'org.slf4j:jcl-over-slf4j:1.7.36' + dependency 'org.slf4j:log4j-over-slf4j:1.7.36' dependency 'org.webjars:bootstrap:2.3.2' dependency 'org.webjars:html5shiv:3.7.3-1' dependency 'org.webjars:jquery:3.6.0' From 2516a495af08ebc57a232a09b4460587e2fea197 Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Tue, 22 Feb 2022 10:31:00 +0100 Subject: [PATCH 062/108] Release 2.6.2 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index b0f11422..3c6844d3 100644 --- a/gradle.properties +++ b/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.2-SNAPSHOT +version=2.6.2 From ad52fc0297ad1793d3266fb4f382542af196e00a Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Tue, 22 Feb 2022 14:13:29 +0100 Subject: [PATCH 063/108] Next development version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 3c6844d3..dc85c123 100644 --- a/gradle.properties +++ b/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.2 +version=2.6.3-SNAPSHOT From c2288615bff0ab8b792f6b08b957af6caf80bfa5 Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Tue, 22 Feb 2022 14:38:24 +0100 Subject: [PATCH 064/108] Update antora to 2.6.3 --- spring-session-docs/antora.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-session-docs/antora.yml b/spring-session-docs/antora.yml index 049ba2c4..6c427ae0 100644 --- a/spring-session-docs/antora.yml +++ b/spring-session-docs/antora.yml @@ -1,3 +1,3 @@ name: ROOT -version: '2.6.2' +version: '2.6.3' prerelease: '-SNAPSHOT' From e6ec5765b8bde89aa325d8f5f1fa2980dc7db6b3 Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Tue, 22 Feb 2022 15:43:37 +0100 Subject: [PATCH 065/108] Fix 2.6.2 reference docs Closes gh-2035 --- spring-session-docs/antora-playbook.yml | 1 + .../antora/extensions/version-fix.js | 15 +++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 spring-session-docs/antora/extensions/version-fix.js diff --git a/spring-session-docs/antora-playbook.yml b/spring-session-docs/antora-playbook.yml index 0c4a1bd1..ea0dd6e9 100644 --- a/spring-session-docs/antora-playbook.yml +++ b/spring-session-docs/antora-playbook.yml @@ -23,5 +23,6 @@ ui: pipeline: extensions: + - require: ./antora/extensions/version-fix.js - require: ./antora/extensions/major-minor-segment.js - require: ./antora/extensions/root-component-name.js diff --git a/spring-session-docs/antora/extensions/version-fix.js b/spring-session-docs/antora/extensions/version-fix.js new file mode 100644 index 00000000..4b78ba79 --- /dev/null +++ b/spring-session-docs/antora/extensions/version-fix.js @@ -0,0 +1,15 @@ +'use strict' + +module.exports.register = (pipeline, { config }) => { + + pipeline.on('contentAggregated', ({ contentAggregate }) => { + contentAggregate.forEach(aggregate => { + if (aggregate.version === "2.6.2" && + aggregate.prerelease == "-SNAPSHOT") { + aggregate.version = "2.6.2" + aggregate.displayVersion = `${aggregate.version}` + delete aggregate.prerelease + } + }) + }) +} From fba9313c6b3b68ab81a9c8871d42fad1d485adfc Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Wed, 23 Feb 2022 14:22:25 +0100 Subject: [PATCH 066/108] Document release process for 2.6.x Issue gh-2036 --- RELEASE.adoc | 101 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+) create mode 100644 RELEASE.adoc diff --git a/RELEASE.adoc b/RELEASE.adoc new file mode 100644 index 00000000..b1ddbfb6 --- /dev/null +++ b/RELEASE.adoc @@ -0,0 +1,101 @@ +== 1. Update Dependencies + +Dependencies are declared in `gradle/dependency-management.gradle`. +Update Spring Framework, Spring Security and Spring Data at a minimum. + +Run all the checks: + +[source,bash] +---- +$ ./gradlew check +---- + +Create separate issues for each dependency update, aside from test dependencies which can be combined into a single commit. + +== 2. Check All Issues are Closed + +You can manually check at https://github.com/spring-projects/spring-session/milestones + +== 3. Update Release Version + +Update the version number in `gradle.properties` for the release, for example `2.6.0-M1`, `2.6.0-RC1`, `2.6.3` + +== 4. Update Antora Version + +You will need to update the antora.yml version. + +== 5. Build Locally + +Run the build using + +[source,bash] +---- +$ ./gradlew check +---- + +== 6. Push the Release Commit + +Push the commit and GitHub actions will build and deploy the artifacts. +Wait for the artifact to appear in https://repo1.maven.org/maven2/org/springframework/session/spring-session-core/ + +== 7. Tag the release + +Tag the release and then push the tag + +.... +git tag 2.6.3 +git push origin 2.6.3 +.... + +== 8. Update to Next Development Version + +Update `gradle.properties` version to next `+SNAPSHOT+` version, update antora.yml and then push + +== 9. Update version on project pages + +Update the versions on https://spring.io/projects for Spring Session Core, Spring Session Data Redis, Spring Session JDBC, Spring Session Hazelcast, and Spring Session MongoDB. + +== 10. Update Release Notes on GitHub + +Download +https://github.com/spring-io/github-changelog-generator/releases/latest[the +GitHub release notes generator] + +* Generate the release notes + +.... +java -jar github-changelog-generator.jar \ + --changelog.repository=spring-projects/spring-session \ + $MILESTONE release-notes +.... + +Note 1: `+$MILESTONE+` is something like `+2.6.1+` or `+2.6.0-M1+`. + +Note 2: This will create a file on your filesystem +called `+release-notes+`. + +* Copy the release notes to your clipboard (your mileage may vary with +the following command) + +.... +cat release-notes | xclip -selection clipboard +.... + +* Create the +https://github.com/spring-projects/spring-session/releases[release on +GitHub], associate it with the tag, and paste the generated notes. + +== 11. Close / Create Milestone + +* In +https://github.com/spring-projects/spring-session/milestones[GitHub +Milestones], create a new milestone for the next release version +* Move any open issues from the existing milestone you just released to +the new milestone. +* Close the milestone for the release. + +== 12. Announce the release + +* Announce via Slack on https://pivotal.slack.com/messages/spring-session[#spring-session], and tag any downstream Spring Session projects (e.g Spring Session for Apache Geode). + +Note: Do not post on #spring-release or create a blog post. Those steps happen after the Spring Session BOM is released. + From 282f774e07203a30cbe4c7dc622bbf71e62eeb95 Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Thu, 24 Feb 2022 12:46:05 +0100 Subject: [PATCH 067/108] Document release process for 2.7.x Issue gh-2036 --- RELEASE.adoc | 110 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 110 insertions(+) create mode 100644 RELEASE.adoc diff --git a/RELEASE.adoc b/RELEASE.adoc new file mode 100644 index 00000000..578c1f32 --- /dev/null +++ b/RELEASE.adoc @@ -0,0 +1,110 @@ +== 1. Update Dependencies + +Dependencies are declared in `gradle/dependency-management.gradle`. +Update Spring Framework, Spring Security and Spring Data at a minimum. + +Run all the checks: + +[source,bash] +---- +$ ./gradlew check +---- + +Create separate issues for each dependency update, aside from test dependencies which can be combined into a single commit. + +== 2. Check All Issues are Closed + +You can manually check at https://github.com/spring-projects/spring-session/milestones + +== 3. Update Release Version + +Update the version number in `gradle.properties` for the release, for example `2.7.0-M1`, `2.7.0-RC1`, `2.7.3` + +== 4. Update Antora Version + +You will need to update the antora.yml version. + +For milestone / release candidate releases you should follow this format: +---- +version: '2.7.0-RC1' +prerelease: 'true' +display_version: '2.7.0-RC1' +---- + +== 5. Build Locally + +Run the build using + +[source,bash] +---- +$ ./gradlew check +---- + +== 6. Push the Release Commit + +Push the commit and GitHub actions will build and deploy the artifacts. +Wait for the artifact to appear in https://repo1.maven.org/maven2/org/springframework/session/spring-session-core/ + +== 7. Tag the release + +Tag the release and then push the tag + +.... +git tag 2.7.0-RC1 +git push origin 2.7.0-RC1 +.... + +== 8. Update to Next Development Version + +Update `gradle.properties` version to next `+SNAPSHOT+` version, update antora.yml and then push + +== 9. Update version on project pages + +Update the versions on https://spring.io/projects for Spring Session Core, Spring Session Data Redis, Spring Session JDBC, Spring Session Hazelcast, and Spring Session MongoDB. + +== 10. Update Release Notes on GitHub + +Download +https://github.com/spring-io/github-changelog-generator/releases/latest[the +GitHub release notes generator] + +* Generate the release notes + +.... +java -jar github-changelog-generator.jar \ + --changelog.repository=spring-projects/spring-session \ + $MILESTONE release-notes +.... + +Note 1: `+$MILESTONE+` is something like `+2.7.1+` or `+2.7.0-M1+`. + +Note 2: This will create a file on your filesystem +called `+release-notes+`. + +* Copy the release notes to your clipboard (your mileage may vary with +the following command) + +.... +cat release-notes | xclip -selection clipboard +.... + +* Create the +https://github.com/spring-projects/spring-session/releases[release on +GitHub], associate it with the tag, and paste the generated notes. + +== 11. Close / Create Milestone + +* In +https://github.com/spring-projects/spring-session/milestones[GitHub +Milestones], create a new milestone for the next release version. +* Move any open issues from the existing milestone you just released to +the new milestone. +* Close the milestone for the release. + +Note: Spring Session typically releases only one milestone (M1) and one release candidate (RC1). + +== 12. Announce the release + +* Announce via Slack on https://pivotal.slack.com/messages/spring-session[#spring-session], and tag any downstream Spring Session projects (e.g Spring Session for Apache Geode). + +Note: Do not post on #spring-release or create a blog post. Those steps happen after the Spring Session BOM is released. + From 9a643c88667770253304734443b19b06b029f06d Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Fri, 11 Mar 2022 15:46:19 +0100 Subject: [PATCH 068/108] Update to Antora 3.0.1 Closes gh-2038 --- spring-session-docs/antora-playbook.yml | 3 +- .../antora/extensions/major-minor-segment.js | 6 +-- .../antora/extensions/root-component-name.js | 40 ------------------- .../antora/extensions/version-fix.js | 4 +- spring-session-docs/local-antora-playbook.yml | 4 +- .../spring-session-docs.gradle | 2 +- 6 files changed, 9 insertions(+), 50 deletions(-) delete mode 100644 spring-session-docs/antora/extensions/root-component-name.js diff --git a/spring-session-docs/antora-playbook.yml b/spring-session-docs/antora-playbook.yml index ea0dd6e9..5d3a60f1 100644 --- a/spring-session-docs/antora-playbook.yml +++ b/spring-session-docs/antora-playbook.yml @@ -21,8 +21,7 @@ ui: url: https://github.com/spring-io/antora-ui-spring/releases/download/latest/ui-bundle.zip snapshot: true -pipeline: +antora: extensions: - require: ./antora/extensions/version-fix.js - require: ./antora/extensions/major-minor-segment.js - - require: ./antora/extensions/root-component-name.js diff --git a/spring-session-docs/antora/extensions/major-minor-segment.js b/spring-session-docs/antora/extensions/major-minor-segment.js index eec07645..3c3761f9 100644 --- a/spring-session-docs/antora/extensions/major-minor-segment.js +++ b/spring-session-docs/antora/extensions/major-minor-segment.js @@ -3,8 +3,8 @@ const { posix: path } = require('path') -module.exports.register = (pipeline, { config }) => { - pipeline.on('contentClassified', ({ contentCatalog }) => { +module.exports.register = function({ config }) { + this.on('contentClassified', ({ contentCatalog }) => { contentCatalog.getComponents().forEach(component => { const componentName = component.name; const generationToVersion = new Map(); @@ -197,4 +197,4 @@ function no_data(key, value) { return value ? "__data__" : value; } return value; -} \ No newline at end of file +} diff --git a/spring-session-docs/antora/extensions/root-component-name.js b/spring-session-docs/antora/extensions/root-component-name.js deleted file mode 100644 index dcc8dc48..00000000 --- a/spring-session-docs/antora/extensions/root-component-name.js +++ /dev/null @@ -1,40 +0,0 @@ -// https://gitlab.com/antora/antora/-/issues/132#note_712132072 -'use strict' - -const { posix: path } = require('path') - -module.exports.register = (pipeline, { config }) => { - pipeline.on('contentClassified', ({ contentCatalog }) => { - const rootComponentName = config.rootComponentName || 'ROOT' - const rootComponentNameLength = rootComponentName.length - contentCatalog.findBy({ component: rootComponentName }).forEach((file) => { - if (file.out) { - file.out.dirname = file.out.dirname.substr(rootComponentNameLength) - file.out.path = file.out.path.substr(rootComponentNameLength + 1) - file.out.rootPath = fixPath(file.out.rootPath) - } - if (file.pub) { - file.pub.url = file.pub.url.substr(rootComponentNameLength + 1) - if (file.pub.rootPath) { - file.pub.rootPath = fixPath(file.pub.rootPath) - } - } - if (file.rel) { - if (file.rel.pub) { - file.rel.pub.url = file.rel.pub.url.substr(rootComponentNameLength + 1) - file.rel.pub.rootPath = fixPath(file.rel.pub.rootPath); - } - } - }) - const rootComponent = contentCatalog.getComponent(rootComponentName) - rootComponent?.versions?.forEach((version) => { - version.url = version.url.substr(rootComponentName.length + 1) - }) - // const siteStartPage = contentCatalog.getById({ component: '', version: '', module: '', family: 'alias', relative: 'index.adoc' }) - // if (siteStartPage) delete siteStartPage.out - }) - - function fixPath(path) { - return path.split('/').slice(1).join('/') || '.' - } -} \ No newline at end of file diff --git a/spring-session-docs/antora/extensions/version-fix.js b/spring-session-docs/antora/extensions/version-fix.js index 4b78ba79..19e77b88 100644 --- a/spring-session-docs/antora/extensions/version-fix.js +++ b/spring-session-docs/antora/extensions/version-fix.js @@ -1,8 +1,8 @@ 'use strict' -module.exports.register = (pipeline, { config }) => { +module.exports.register = function({ config }) { - pipeline.on('contentAggregated', ({ contentAggregate }) => { + this.on('contentAggregated', ({ contentAggregate }) => { contentAggregate.forEach(aggregate => { if (aggregate.version === "2.6.2" && aggregate.prerelease == "-SNAPSHOT") { diff --git a/spring-session-docs/local-antora-playbook.yml b/spring-session-docs/local-antora-playbook.yml index 159543f4..d36554ec 100644 --- a/spring-session-docs/local-antora-playbook.yml +++ b/spring-session-docs/local-antora-playbook.yml @@ -20,7 +20,7 @@ ui: url: https://github.com/spring-io/antora-ui-spring/releases/download/latest/ui-bundle.zip snapshot: true -pipeline: +antora: extensions: + - require: ./antora/extensions/version-fix.js - require: ./antora/extensions/major-minor-segment.js - - require: ./antora/extensions/root-component-name.js diff --git a/spring-session-docs/spring-session-docs.gradle b/spring-session-docs/spring-session-docs.gradle index 1c47661b..20af1e58 100644 --- a/spring-session-docs/spring-session-docs.gradle +++ b/spring-session-docs/spring-session-docs.gradle @@ -28,7 +28,7 @@ dependencies { } antora { - antoraVersion = "3.0.0-alpha.8" + antoraVersion = "3.0.1" arguments = ["--fetch"] } From e8e4ee285021ef528cb5abb0e038377ee0ee62f8 Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Tue, 15 Mar 2022 18:23:17 +0100 Subject: [PATCH 069/108] Make RedisSessionRepository.DEFAULT_KEY_NAMESPACE public Closes gh-2043 --- .../session/data/redis/RedisSessionRepository.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/spring-session-data-redis/src/main/java/org/springframework/session/data/redis/RedisSessionRepository.java b/spring-session-data-redis/src/main/java/org/springframework/session/data/redis/RedisSessionRepository.java index 799e9c64..75dde726 100644 --- a/spring-session-data-redis/src/main/java/org/springframework/session/data/redis/RedisSessionRepository.java +++ b/spring-session-data-redis/src/main/java/org/springframework/session/data/redis/RedisSessionRepository.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2020 the original author or authors. + * Copyright 2014-2022 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. @@ -42,7 +42,10 @@ import org.springframework.util.Assert; */ public class RedisSessionRepository implements SessionRepository { - private static final String DEFAULT_KEY_NAMESPACE = "spring:session"; + /** + * The default namespace for each key and channel in Redis used by Spring Session. + */ + public static final String DEFAULT_KEY_NAMESPACE = "spring:session"; private final RedisOperations sessionRedisOperations; From 63f1c7bf6f09c573ea2db73e0f6c22d17e1c994d Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Wed, 23 Mar 2022 10:03:32 +0100 Subject: [PATCH 070/108] Fix reference documentation redirects Closes gh-2044 --- .../antora/extensions/major-minor-segment.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/spring-session-docs/antora/extensions/major-minor-segment.js b/spring-session-docs/antora/extensions/major-minor-segment.js index 3c3761f9..6cf7152b 100644 --- a/spring-session-docs/antora/extensions/major-minor-segment.js +++ b/spring-session-docs/antora/extensions/major-minor-segment.js @@ -91,6 +91,7 @@ function createSymbolicVersionAlias (component, version, symbolicVersionSegment, function computeOut (src, family, version, htmlUrlExtensionStyle) { let { component, module: module_, basename, extname, relative, stem } = src + if (component === 'ROOT') component = '' if (module_ === 'ROOT') module_ = '' let indexifyPathSegment = '' let familyPathSegment = '' @@ -120,8 +121,11 @@ function computePub (src, out, family, version, htmlUrlExtensionStyle) { const pub = {} let url if (family === 'nav') { - const urlSegments = version ? [src.component, version] : [src.component] - if (src.module && src.module !== 'ROOT') urlSegments.push(src.module) + const component = src.component || 'ROOT' + const urlSegments = component === 'ROOT' ? [] : [component] + if (version) urlSegments.push(version) + const module_ = src.module || 'ROOT' + if (module_ !== 'ROOT') urlSegments.push(module_) // an artificial URL used for resolving page references in navigation model url = '/' + urlSegments.join('/') + '/' pub.moduleRootPath = '.' From 2c1b79375d1380c305771d83add49b3676ede0ba Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Tue, 29 Mar 2022 15:33:08 +0200 Subject: [PATCH 071/108] Upgrade samples to Spring Boot 2.6.5 This also makes the necessary changes for the Thymeleaf Layout Dialect 3.0 update. Closes gh-1980 --- build.gradle | 2 +- .../src/main/resources/application.yml | 4 ++++ .../src/main/resources/application.properties | 1 + .../src/main/resources/templates/index.html | 2 +- .../src/main/resources/templates/layout.html | 2 +- 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index b60b7f6c..acd90697 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ buildscript { snapshotBuild = version.endsWith('SNAPSHOT') milestoneBuild = !(releaseBuild || snapshotBuild) - springBootVersion = '2.5.6' + springBootVersion = '2.6.5' } repositories { diff --git a/spring-session-samples/spring-session-sample-boot-mongodb-reactive/src/main/resources/application.yml b/spring-session-samples/spring-session-sample-boot-mongodb-reactive/src/main/resources/application.yml index 5ff2265b..8d4b88fe 100644 --- a/spring-session-samples/spring-session-sample-boot-mongodb-reactive/src/main/resources/application.yml +++ b/spring-session-samples/spring-session-sample-boot-mongodb-reactive/src/main/resources/application.yml @@ -2,3 +2,7 @@ logging: level: org.springframework.data.mongodb: DEBUG org.springframework.session: DEBUG +spring: + mongodb: + embedded: + version: 3.0.0 diff --git a/spring-session-samples/spring-session-sample-boot-mongodb-traditional/src/main/resources/application.properties b/spring-session-samples/spring-session-sample-boot-mongodb-traditional/src/main/resources/application.properties index 51ab5db5..6266b291 100644 --- a/spring-session-samples/spring-session-sample-boot-mongodb-traditional/src/main/resources/application.properties +++ b/spring-session-samples/spring-session-sample-boot-mongodb-traditional/src/main/resources/application.properties @@ -1,3 +1,4 @@ spring.thymeleaf.cache=false spring.template.cache=false spring.data.mongodb.port=0 +spring.mongodb.embedded.version=3.0.0 diff --git a/spring-session-samples/spring-session-sample-boot-mongodb-traditional/src/main/resources/templates/index.html b/spring-session-samples/spring-session-sample-boot-mongodb-traditional/src/main/resources/templates/index.html index 4d653a1c..b9051413 100644 --- a/spring-session-samples/spring-session-sample-boot-mongodb-traditional/src/main/resources/templates/index.html +++ b/spring-session-samples/spring-session-sample-boot-mongodb-traditional/src/main/resources/templates/index.html @@ -1,4 +1,4 @@ - + Secured Content diff --git a/spring-session-samples/spring-session-sample-boot-mongodb-traditional/src/main/resources/templates/layout.html b/spring-session-samples/spring-session-sample-boot-mongodb-traditional/src/main/resources/templates/layout.html index 8f6a961c..e0c8f1db 100644 --- a/spring-session-samples/spring-session-sample-boot-mongodb-traditional/src/main/resources/templates/layout.html +++ b/spring-session-samples/spring-session-sample-boot-mongodb-traditional/src/main/resources/templates/layout.html @@ -3,7 +3,7 @@ xmlns:th="https://www.thymeleaf.org" xmlns:layout="https://github.com/ultraq/thymeleaf-layout-dialect"> - Spring Session Sample + Spring Session Sample