From c8bc22acab6eb756faeacf6c52ebdd2d17b707a0 Mon Sep 17 00:00:00 2001 From: sampadawagde Date: Thu, 30 Jun 2022 22:13:57 +0530 Subject: [PATCH 1/2] JAVA-12731: Move spring-session into spring-web-modules --- .../spring-session/README.md | 0 .../spring-session/pom.xml | 0 .../spring-session/spring-session-jdbc/README.md | 0 .../spring-session/spring-session-jdbc/pom.xml | 0 .../baeldung/springsessionjdbc/SpringSessionJdbcApplication.java | 0 .../springsessionjdbc/controller/SpringSessionJdbcController.java | 0 .../spring-session-jdbc/src/main/resources/application.properties | 0 .../spring-session-jdbc/src/main/resources/logback.xml | 0 .../src/test/java/com/baeldung/SpringContextTest.java | 0 .../springsessionjdbc/SpringSessionJdbcIntegrationTest.java | 0 .../spring-session/spring-session-mongodb/README.md | 0 .../spring-session/spring-session-mongodb/pom.xml | 0 .../springsessionmongodb/SpringSessionMongoDBApplication.java | 0 .../controller/SpringSessionMongoDBController.java | 0 .../src/main/resources/application.properties | 0 .../spring-session-mongodb/src/main/resources/logback.xml | 0 .../src/test/java/com/baeldung/SpringContextTest.java | 0 .../springsessionmongodb/SpringSessionMongoDBIntegrationTest.java | 0 .../src/test/resources/application.properties | 0 .../spring-session/spring-session-redis/README.md | 0 .../spring-session/spring-session-redis/pom.xml | 0 .../java/com/baeldung/spring/session/PasswordEncoderConfig.java | 0 .../src/main/java/com/baeldung/spring/session/SecurityConfig.java | 0 .../main/java/com/baeldung/spring/session/SessionController.java | 0 .../java/com/baeldung/spring/session/SessionWebApplication.java | 0 .../src/main/resources/application.properties | 0 .../spring-session-redis/src/main/resources/logback.xml | 0 .../src/test/java/com/baeldung/SpringContextLiveTest.java | 0 .../baeldung/spring/session/SessionControllerIntegrationTest.java | 0 29 files changed, 0 insertions(+), 0 deletions(-) rename {spring-security-modules => spring-web-modules}/spring-session/README.md (100%) rename {spring-security-modules => spring-web-modules}/spring-session/pom.xml (100%) rename {spring-security-modules => spring-web-modules}/spring-session/spring-session-jdbc/README.md (100%) rename {spring-security-modules => spring-web-modules}/spring-session/spring-session-jdbc/pom.xml (100%) rename {spring-security-modules => spring-web-modules}/spring-session/spring-session-jdbc/src/main/java/com/baeldung/springsessionjdbc/SpringSessionJdbcApplication.java (100%) rename {spring-security-modules => spring-web-modules}/spring-session/spring-session-jdbc/src/main/java/com/baeldung/springsessionjdbc/controller/SpringSessionJdbcController.java (100%) rename {spring-security-modules => spring-web-modules}/spring-session/spring-session-jdbc/src/main/resources/application.properties (100%) rename {spring-security-modules => spring-web-modules}/spring-session/spring-session-jdbc/src/main/resources/logback.xml (100%) rename {spring-security-modules => spring-web-modules}/spring-session/spring-session-jdbc/src/test/java/com/baeldung/SpringContextTest.java (100%) rename {spring-security-modules => spring-web-modules}/spring-session/spring-session-jdbc/src/test/java/com/baeldung/springsessionjdbc/SpringSessionJdbcIntegrationTest.java (100%) rename {spring-security-modules => spring-web-modules}/spring-session/spring-session-mongodb/README.md (100%) rename {spring-security-modules => spring-web-modules}/spring-session/spring-session-mongodb/pom.xml (100%) rename {spring-security-modules => spring-web-modules}/spring-session/spring-session-mongodb/src/main/java/com/baeldung/springsessionmongodb/SpringSessionMongoDBApplication.java (100%) rename {spring-security-modules => spring-web-modules}/spring-session/spring-session-mongodb/src/main/java/com/baeldung/springsessionmongodb/controller/SpringSessionMongoDBController.java (100%) rename {spring-security-modules => spring-web-modules}/spring-session/spring-session-mongodb/src/main/resources/application.properties (100%) rename {spring-security-modules => spring-web-modules}/spring-session/spring-session-mongodb/src/main/resources/logback.xml (100%) rename {spring-security-modules => spring-web-modules}/spring-session/spring-session-mongodb/src/test/java/com/baeldung/SpringContextTest.java (100%) rename {spring-security-modules => spring-web-modules}/spring-session/spring-session-mongodb/src/test/java/com/baeldung/springsessionmongodb/SpringSessionMongoDBIntegrationTest.java (100%) rename {spring-security-modules => spring-web-modules}/spring-session/spring-session-mongodb/src/test/resources/application.properties (100%) rename {spring-security-modules => spring-web-modules}/spring-session/spring-session-redis/README.md (100%) rename {spring-security-modules => spring-web-modules}/spring-session/spring-session-redis/pom.xml (100%) rename {spring-security-modules => spring-web-modules}/spring-session/spring-session-redis/src/main/java/com/baeldung/spring/session/PasswordEncoderConfig.java (100%) rename {spring-security-modules => spring-web-modules}/spring-session/spring-session-redis/src/main/java/com/baeldung/spring/session/SecurityConfig.java (100%) rename {spring-security-modules => spring-web-modules}/spring-session/spring-session-redis/src/main/java/com/baeldung/spring/session/SessionController.java (100%) rename {spring-security-modules => spring-web-modules}/spring-session/spring-session-redis/src/main/java/com/baeldung/spring/session/SessionWebApplication.java (100%) rename {spring-security-modules => spring-web-modules}/spring-session/spring-session-redis/src/main/resources/application.properties (100%) rename {spring-security-modules => spring-web-modules}/spring-session/spring-session-redis/src/main/resources/logback.xml (100%) rename {spring-security-modules => spring-web-modules}/spring-session/spring-session-redis/src/test/java/com/baeldung/SpringContextLiveTest.java (100%) rename {spring-security-modules => spring-web-modules}/spring-session/spring-session-redis/src/test/java/com/baeldung/spring/session/SessionControllerIntegrationTest.java (100%) diff --git a/spring-security-modules/spring-session/README.md b/spring-web-modules/spring-session/README.md similarity index 100% rename from spring-security-modules/spring-session/README.md rename to spring-web-modules/spring-session/README.md diff --git a/spring-security-modules/spring-session/pom.xml b/spring-web-modules/spring-session/pom.xml similarity index 100% rename from spring-security-modules/spring-session/pom.xml rename to spring-web-modules/spring-session/pom.xml diff --git a/spring-security-modules/spring-session/spring-session-jdbc/README.md b/spring-web-modules/spring-session/spring-session-jdbc/README.md similarity index 100% rename from spring-security-modules/spring-session/spring-session-jdbc/README.md rename to spring-web-modules/spring-session/spring-session-jdbc/README.md diff --git a/spring-security-modules/spring-session/spring-session-jdbc/pom.xml b/spring-web-modules/spring-session/spring-session-jdbc/pom.xml similarity index 100% rename from spring-security-modules/spring-session/spring-session-jdbc/pom.xml rename to spring-web-modules/spring-session/spring-session-jdbc/pom.xml diff --git a/spring-security-modules/spring-session/spring-session-jdbc/src/main/java/com/baeldung/springsessionjdbc/SpringSessionJdbcApplication.java b/spring-web-modules/spring-session/spring-session-jdbc/src/main/java/com/baeldung/springsessionjdbc/SpringSessionJdbcApplication.java similarity index 100% rename from spring-security-modules/spring-session/spring-session-jdbc/src/main/java/com/baeldung/springsessionjdbc/SpringSessionJdbcApplication.java rename to spring-web-modules/spring-session/spring-session-jdbc/src/main/java/com/baeldung/springsessionjdbc/SpringSessionJdbcApplication.java diff --git a/spring-security-modules/spring-session/spring-session-jdbc/src/main/java/com/baeldung/springsessionjdbc/controller/SpringSessionJdbcController.java b/spring-web-modules/spring-session/spring-session-jdbc/src/main/java/com/baeldung/springsessionjdbc/controller/SpringSessionJdbcController.java similarity index 100% rename from spring-security-modules/spring-session/spring-session-jdbc/src/main/java/com/baeldung/springsessionjdbc/controller/SpringSessionJdbcController.java rename to spring-web-modules/spring-session/spring-session-jdbc/src/main/java/com/baeldung/springsessionjdbc/controller/SpringSessionJdbcController.java diff --git a/spring-security-modules/spring-session/spring-session-jdbc/src/main/resources/application.properties b/spring-web-modules/spring-session/spring-session-jdbc/src/main/resources/application.properties similarity index 100% rename from spring-security-modules/spring-session/spring-session-jdbc/src/main/resources/application.properties rename to spring-web-modules/spring-session/spring-session-jdbc/src/main/resources/application.properties diff --git a/spring-security-modules/spring-session/spring-session-jdbc/src/main/resources/logback.xml b/spring-web-modules/spring-session/spring-session-jdbc/src/main/resources/logback.xml similarity index 100% rename from spring-security-modules/spring-session/spring-session-jdbc/src/main/resources/logback.xml rename to spring-web-modules/spring-session/spring-session-jdbc/src/main/resources/logback.xml diff --git a/spring-security-modules/spring-session/spring-session-jdbc/src/test/java/com/baeldung/SpringContextTest.java b/spring-web-modules/spring-session/spring-session-jdbc/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-security-modules/spring-session/spring-session-jdbc/src/test/java/com/baeldung/SpringContextTest.java rename to spring-web-modules/spring-session/spring-session-jdbc/src/test/java/com/baeldung/SpringContextTest.java diff --git a/spring-security-modules/spring-session/spring-session-jdbc/src/test/java/com/baeldung/springsessionjdbc/SpringSessionJdbcIntegrationTest.java b/spring-web-modules/spring-session/spring-session-jdbc/src/test/java/com/baeldung/springsessionjdbc/SpringSessionJdbcIntegrationTest.java similarity index 100% rename from spring-security-modules/spring-session/spring-session-jdbc/src/test/java/com/baeldung/springsessionjdbc/SpringSessionJdbcIntegrationTest.java rename to spring-web-modules/spring-session/spring-session-jdbc/src/test/java/com/baeldung/springsessionjdbc/SpringSessionJdbcIntegrationTest.java diff --git a/spring-security-modules/spring-session/spring-session-mongodb/README.md b/spring-web-modules/spring-session/spring-session-mongodb/README.md similarity index 100% rename from spring-security-modules/spring-session/spring-session-mongodb/README.md rename to spring-web-modules/spring-session/spring-session-mongodb/README.md diff --git a/spring-security-modules/spring-session/spring-session-mongodb/pom.xml b/spring-web-modules/spring-session/spring-session-mongodb/pom.xml similarity index 100% rename from spring-security-modules/spring-session/spring-session-mongodb/pom.xml rename to spring-web-modules/spring-session/spring-session-mongodb/pom.xml diff --git a/spring-security-modules/spring-session/spring-session-mongodb/src/main/java/com/baeldung/springsessionmongodb/SpringSessionMongoDBApplication.java b/spring-web-modules/spring-session/spring-session-mongodb/src/main/java/com/baeldung/springsessionmongodb/SpringSessionMongoDBApplication.java similarity index 100% rename from spring-security-modules/spring-session/spring-session-mongodb/src/main/java/com/baeldung/springsessionmongodb/SpringSessionMongoDBApplication.java rename to spring-web-modules/spring-session/spring-session-mongodb/src/main/java/com/baeldung/springsessionmongodb/SpringSessionMongoDBApplication.java diff --git a/spring-security-modules/spring-session/spring-session-mongodb/src/main/java/com/baeldung/springsessionmongodb/controller/SpringSessionMongoDBController.java b/spring-web-modules/spring-session/spring-session-mongodb/src/main/java/com/baeldung/springsessionmongodb/controller/SpringSessionMongoDBController.java similarity index 100% rename from spring-security-modules/spring-session/spring-session-mongodb/src/main/java/com/baeldung/springsessionmongodb/controller/SpringSessionMongoDBController.java rename to spring-web-modules/spring-session/spring-session-mongodb/src/main/java/com/baeldung/springsessionmongodb/controller/SpringSessionMongoDBController.java diff --git a/spring-security-modules/spring-session/spring-session-mongodb/src/main/resources/application.properties b/spring-web-modules/spring-session/spring-session-mongodb/src/main/resources/application.properties similarity index 100% rename from spring-security-modules/spring-session/spring-session-mongodb/src/main/resources/application.properties rename to spring-web-modules/spring-session/spring-session-mongodb/src/main/resources/application.properties diff --git a/spring-security-modules/spring-session/spring-session-mongodb/src/main/resources/logback.xml b/spring-web-modules/spring-session/spring-session-mongodb/src/main/resources/logback.xml similarity index 100% rename from spring-security-modules/spring-session/spring-session-mongodb/src/main/resources/logback.xml rename to spring-web-modules/spring-session/spring-session-mongodb/src/main/resources/logback.xml diff --git a/spring-security-modules/spring-session/spring-session-mongodb/src/test/java/com/baeldung/SpringContextTest.java b/spring-web-modules/spring-session/spring-session-mongodb/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-security-modules/spring-session/spring-session-mongodb/src/test/java/com/baeldung/SpringContextTest.java rename to spring-web-modules/spring-session/spring-session-mongodb/src/test/java/com/baeldung/SpringContextTest.java diff --git a/spring-security-modules/spring-session/spring-session-mongodb/src/test/java/com/baeldung/springsessionmongodb/SpringSessionMongoDBIntegrationTest.java b/spring-web-modules/spring-session/spring-session-mongodb/src/test/java/com/baeldung/springsessionmongodb/SpringSessionMongoDBIntegrationTest.java similarity index 100% rename from spring-security-modules/spring-session/spring-session-mongodb/src/test/java/com/baeldung/springsessionmongodb/SpringSessionMongoDBIntegrationTest.java rename to spring-web-modules/spring-session/spring-session-mongodb/src/test/java/com/baeldung/springsessionmongodb/SpringSessionMongoDBIntegrationTest.java diff --git a/spring-security-modules/spring-session/spring-session-mongodb/src/test/resources/application.properties b/spring-web-modules/spring-session/spring-session-mongodb/src/test/resources/application.properties similarity index 100% rename from spring-security-modules/spring-session/spring-session-mongodb/src/test/resources/application.properties rename to spring-web-modules/spring-session/spring-session-mongodb/src/test/resources/application.properties diff --git a/spring-security-modules/spring-session/spring-session-redis/README.md b/spring-web-modules/spring-session/spring-session-redis/README.md similarity index 100% rename from spring-security-modules/spring-session/spring-session-redis/README.md rename to spring-web-modules/spring-session/spring-session-redis/README.md diff --git a/spring-security-modules/spring-session/spring-session-redis/pom.xml b/spring-web-modules/spring-session/spring-session-redis/pom.xml similarity index 100% rename from spring-security-modules/spring-session/spring-session-redis/pom.xml rename to spring-web-modules/spring-session/spring-session-redis/pom.xml diff --git a/spring-security-modules/spring-session/spring-session-redis/src/main/java/com/baeldung/spring/session/PasswordEncoderConfig.java b/spring-web-modules/spring-session/spring-session-redis/src/main/java/com/baeldung/spring/session/PasswordEncoderConfig.java similarity index 100% rename from spring-security-modules/spring-session/spring-session-redis/src/main/java/com/baeldung/spring/session/PasswordEncoderConfig.java rename to spring-web-modules/spring-session/spring-session-redis/src/main/java/com/baeldung/spring/session/PasswordEncoderConfig.java diff --git a/spring-security-modules/spring-session/spring-session-redis/src/main/java/com/baeldung/spring/session/SecurityConfig.java b/spring-web-modules/spring-session/spring-session-redis/src/main/java/com/baeldung/spring/session/SecurityConfig.java similarity index 100% rename from spring-security-modules/spring-session/spring-session-redis/src/main/java/com/baeldung/spring/session/SecurityConfig.java rename to spring-web-modules/spring-session/spring-session-redis/src/main/java/com/baeldung/spring/session/SecurityConfig.java diff --git a/spring-security-modules/spring-session/spring-session-redis/src/main/java/com/baeldung/spring/session/SessionController.java b/spring-web-modules/spring-session/spring-session-redis/src/main/java/com/baeldung/spring/session/SessionController.java similarity index 100% rename from spring-security-modules/spring-session/spring-session-redis/src/main/java/com/baeldung/spring/session/SessionController.java rename to spring-web-modules/spring-session/spring-session-redis/src/main/java/com/baeldung/spring/session/SessionController.java diff --git a/spring-security-modules/spring-session/spring-session-redis/src/main/java/com/baeldung/spring/session/SessionWebApplication.java b/spring-web-modules/spring-session/spring-session-redis/src/main/java/com/baeldung/spring/session/SessionWebApplication.java similarity index 100% rename from spring-security-modules/spring-session/spring-session-redis/src/main/java/com/baeldung/spring/session/SessionWebApplication.java rename to spring-web-modules/spring-session/spring-session-redis/src/main/java/com/baeldung/spring/session/SessionWebApplication.java diff --git a/spring-security-modules/spring-session/spring-session-redis/src/main/resources/application.properties b/spring-web-modules/spring-session/spring-session-redis/src/main/resources/application.properties similarity index 100% rename from spring-security-modules/spring-session/spring-session-redis/src/main/resources/application.properties rename to spring-web-modules/spring-session/spring-session-redis/src/main/resources/application.properties diff --git a/spring-security-modules/spring-session/spring-session-redis/src/main/resources/logback.xml b/spring-web-modules/spring-session/spring-session-redis/src/main/resources/logback.xml similarity index 100% rename from spring-security-modules/spring-session/spring-session-redis/src/main/resources/logback.xml rename to spring-web-modules/spring-session/spring-session-redis/src/main/resources/logback.xml diff --git a/spring-security-modules/spring-session/spring-session-redis/src/test/java/com/baeldung/SpringContextLiveTest.java b/spring-web-modules/spring-session/spring-session-redis/src/test/java/com/baeldung/SpringContextLiveTest.java similarity index 100% rename from spring-security-modules/spring-session/spring-session-redis/src/test/java/com/baeldung/SpringContextLiveTest.java rename to spring-web-modules/spring-session/spring-session-redis/src/test/java/com/baeldung/SpringContextLiveTest.java diff --git a/spring-security-modules/spring-session/spring-session-redis/src/test/java/com/baeldung/spring/session/SessionControllerIntegrationTest.java b/spring-web-modules/spring-session/spring-session-redis/src/test/java/com/baeldung/spring/session/SessionControllerIntegrationTest.java similarity index 100% rename from spring-security-modules/spring-session/spring-session-redis/src/test/java/com/baeldung/spring/session/SessionControllerIntegrationTest.java rename to spring-web-modules/spring-session/spring-session-redis/src/test/java/com/baeldung/spring/session/SessionControllerIntegrationTest.java From 3d8bef19adeb9e24b27aaa67f58e9f2eba4231a6 Mon Sep 17 00:00:00 2001 From: sampadawagde Date: Thu, 30 Jun 2022 22:14:38 +0530 Subject: [PATCH 2/2] JAVA-12731: Modify parent pom files --- spring-security-modules/pom.xml | 3 +-- spring-web-modules/pom.xml | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-security-modules/pom.xml b/spring-security-modules/pom.xml index 8d98395ab7..ce718e5661 100644 --- a/spring-security-modules/pom.xml +++ b/spring-security-modules/pom.xml @@ -44,8 +44,7 @@ spring-security-web-rest spring-security-web-sockets spring-security-web-thymeleaf - spring-security-web-x509 - spring-session + spring-security-web-x509 spring-social-login spring-security-opa diff --git a/spring-web-modules/pom.xml b/spring-web-modules/pom.xml index a5c23c1649..a2bdc9035e 100644 --- a/spring-web-modules/pom.xml +++ b/spring-web-modules/pom.xml @@ -41,6 +41,7 @@ spring-resttemplate spring-resttemplate-2 spring-resttemplate-3 + spring-session spring-thymeleaf spring-thymeleaf-2 spring-thymeleaf-3