From 8f14ea2d217f07e6ff07bb5ec2efcd9e44ffc3dc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 28 Nov 2023 03:38:47 +0000 Subject: [PATCH 1/3] Bump org-springframework-boot from 3.0.7 to 3.0.13 Bumps `org-springframework-boot` from 3.0.7 to 3.0.13. Updates `org.springframework.boot:spring-boot-dependencies` from 3.0.7 to 3.0.13 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.0.7...v3.0.13) Updates `org.springframework.boot:spring-boot-gradle-plugin` from 3.0.7 to 3.0.13 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.0.7...v3.0.13) --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-dependencies dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework.boot:spring-boot-gradle-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d091121f..d1cf046a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,7 +9,7 @@ org-mockito = "4.8.1" org-mongodb = "4.8.2" org-slf4j = "2.0.9" org-springframework = "6.0.14" -org-springframework-boot = "3.0.7" +org-springframework-boot = "3.0.13" org-testcontainers = "1.17.6" org-junit = "5.8.2" From dcd5e231c2fd03e8c922609a11bf2025a6fbaec4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 29 Nov 2023 03:50:44 +0000 Subject: [PATCH 2/3] Bump ch-qos-logback from 1.4.11 to 1.4.13 Bumps `ch-qos-logback` from 1.4.11 to 1.4.13. Updates `ch.qos.logback:logback-classic` from 1.4.11 to 1.4.13 - [Commits](https://github.com/qos-ch/logback/compare/v_1.4.11...v_1.4.13) Updates `ch.qos.logback:logback-core` from 1.4.11 to 1.4.13 - [Commits](https://github.com/qos-ch/logback/compare/v_1.4.11...v_1.4.13) --- updated-dependencies: - dependency-name: ch.qos.logback:logback-classic dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: ch.qos.logback:logback-core dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d1cf046a..7bbc8673 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -ch-qos-logback = "1.4.11" +ch-qos-logback = "1.4.13" com-fasterxml-jackson = "2.14.3" jakarta-websocket = "2.1.1" org-apache-derby = "10.16.1.1" From 20fbf859e7d51791f0c78f8c8e80bedbe2ffa129 Mon Sep 17 00:00:00 2001 From: Marcus Hert Da Coregio Date: Mon, 27 Nov 2023 10:42:39 -0300 Subject: [PATCH 3/3] Fix tests (cherry picked from commit f9b321c42999a8f0cc2c570401ed62dc1b104d93) --- .../spring-session-sample-boot-redis-json.gradle | 1 - .../src/main/java/sample/web/HomeController.java | 6 +++++- .../src/main/resources/templates/home.html | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/spring-session-samples/spring-session-sample-boot-redis-json/spring-session-sample-boot-redis-json.gradle b/spring-session-samples/spring-session-sample-boot-redis-json/spring-session-sample-boot-redis-json.gradle index afc7784d..2d5137c5 100644 --- a/spring-session-samples/spring-session-sample-boot-redis-json/spring-session-sample-boot-redis-json.gradle +++ b/spring-session-samples/spring-session-sample-boot-redis-json/spring-session-sample-boot-redis-json.gradle @@ -12,7 +12,6 @@ dependencies { implementation "org.webjars:bootstrap" implementation "org.webjars:html5shiv" implementation "org.webjars:webjars-locator-core" - implementation "org.apache.httpcomponents:httpclient" testImplementation "org.springframework.boot:spring-boot-starter-test" testImplementation "org.assertj:assertj-core" diff --git a/spring-session-samples/spring-session-sample-boot-redis-json/src/main/java/sample/web/HomeController.java b/spring-session-samples/spring-session-sample-boot-redis-json/src/main/java/sample/web/HomeController.java index 81d14db1..76e9aa17 100644 --- a/spring-session-samples/spring-session-sample-boot-redis-json/src/main/java/sample/web/HomeController.java +++ b/spring-session-samples/spring-session-sample-boot-redis-json/src/main/java/sample/web/HomeController.java @@ -16,9 +16,12 @@ package sample.web; +import java.util.Collections; + import jakarta.servlet.http.HttpServletRequest; import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; import org.springframework.util.ObjectUtils; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -31,10 +34,11 @@ public class HomeController { @RequestMapping("/setValue") public String setValue(@RequestParam(name = "key", required = false) String key, - @RequestParam(name = "value", required = false) String value, HttpServletRequest request) { + @RequestParam(name = "value", required = false) String value, HttpServletRequest request, Model model) { if (!ObjectUtils.isEmpty(key) && !ObjectUtils.isEmpty(value)) { request.getSession().setAttribute(key, value); } + model.addAttribute("sessionAttributeNames", Collections.list(request.getSession().getAttributeNames())); return "home"; } diff --git a/spring-session-samples/spring-session-sample-boot-redis-json/src/main/resources/templates/home.html b/spring-session-samples/spring-session-sample-boot-redis-json/src/main/resources/templates/home.html index 3345c95f..d8823abf 100644 --- a/spring-session-samples/spring-session-sample-boot-redis-json/src/main/resources/templates/home.html +++ b/spring-session-samples/spring-session-sample-boot-redis-json/src/main/resources/templates/home.html @@ -23,7 +23,7 @@ - +