From 9fab7ade08087b8924a1b1187fde39fbe701c596 Mon Sep 17 00:00:00 2001 From: sampadawagde Date: Thu, 30 Jun 2022 20:05:54 +0530 Subject: [PATCH 1/8] JAVA-12732: rename spring-social-login to spring-security-social-login --- .../README.md | 0 .../pom.xml | 6 +++--- .../src/main/java/com/baeldung/config/Application.java | 0 .../src/main/java/com/baeldung/config/SecurityConfig.java | 0 .../src/main/java/com/baeldung/config/WebConfig.java | 0 .../java/com/baeldung/persistence/dao/UserRepository.java | 0 .../src/main/java/com/baeldung/persistence/model/User.java | 0 .../com/baeldung/security/FacebookConnectionSignup.java | 0 .../java/com/baeldung/security/FacebookSignInAdapter.java | 0 .../java/com/baeldung/security/MyUserDetailsService.java | 0 .../src/main/resources/application.properties | 0 .../src/main/resources/data.sql | 0 .../src/main/resources/logback.xml | 0 .../src/main/resources/templates/index.html | 0 .../src/main/resources/templates/login.html | 0 .../src/test/java/com/baeldung/SpringContextTest.java | 0 16 files changed, 3 insertions(+), 3 deletions(-) rename spring-security-modules/{spring-social-login => spring-security-social-login}/README.md (100%) rename spring-security-modules/{spring-social-login => spring-security-social-login}/pom.xml (94%) rename spring-security-modules/{spring-social-login => spring-security-social-login}/src/main/java/com/baeldung/config/Application.java (100%) rename spring-security-modules/{spring-social-login => spring-security-social-login}/src/main/java/com/baeldung/config/SecurityConfig.java (100%) rename spring-security-modules/{spring-social-login => spring-security-social-login}/src/main/java/com/baeldung/config/WebConfig.java (100%) rename spring-security-modules/{spring-social-login => spring-security-social-login}/src/main/java/com/baeldung/persistence/dao/UserRepository.java (100%) rename spring-security-modules/{spring-social-login => spring-security-social-login}/src/main/java/com/baeldung/persistence/model/User.java (100%) rename spring-security-modules/{spring-social-login => spring-security-social-login}/src/main/java/com/baeldung/security/FacebookConnectionSignup.java (100%) rename spring-security-modules/{spring-social-login => spring-security-social-login}/src/main/java/com/baeldung/security/FacebookSignInAdapter.java (100%) rename spring-security-modules/{spring-social-login => spring-security-social-login}/src/main/java/com/baeldung/security/MyUserDetailsService.java (100%) rename spring-security-modules/{spring-social-login => spring-security-social-login}/src/main/resources/application.properties (100%) rename spring-security-modules/{spring-social-login => spring-security-social-login}/src/main/resources/data.sql (100%) rename spring-security-modules/{spring-social-login => spring-security-social-login}/src/main/resources/logback.xml (100%) rename spring-security-modules/{spring-social-login => spring-security-social-login}/src/main/resources/templates/index.html (100%) rename spring-security-modules/{spring-social-login => spring-security-social-login}/src/main/resources/templates/login.html (100%) rename spring-security-modules/{spring-social-login => spring-security-social-login}/src/test/java/com/baeldung/SpringContextTest.java (100%) diff --git a/spring-security-modules/spring-social-login/README.md b/spring-security-modules/spring-security-social-login/README.md similarity index 100% rename from spring-security-modules/spring-social-login/README.md rename to spring-security-modules/spring-security-social-login/README.md diff --git a/spring-security-modules/spring-social-login/pom.xml b/spring-security-modules/spring-security-social-login/pom.xml similarity index 94% rename from spring-security-modules/spring-social-login/pom.xml rename to spring-security-modules/spring-security-social-login/pom.xml index ad4b7c72a6..ddda4235be 100644 --- a/spring-security-modules/spring-social-login/pom.xml +++ b/spring-security-modules/spring-security-social-login/pom.xml @@ -3,8 +3,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - spring-social-login - spring-social-login + spring-security-social-login + spring-security-social-login war @@ -66,7 +66,7 @@ - spring-social-login + spring-security-social-login src/main/resources diff --git a/spring-security-modules/spring-social-login/src/main/java/com/baeldung/config/Application.java b/spring-security-modules/spring-security-social-login/src/main/java/com/baeldung/config/Application.java similarity index 100% rename from spring-security-modules/spring-social-login/src/main/java/com/baeldung/config/Application.java rename to spring-security-modules/spring-security-social-login/src/main/java/com/baeldung/config/Application.java diff --git a/spring-security-modules/spring-social-login/src/main/java/com/baeldung/config/SecurityConfig.java b/spring-security-modules/spring-security-social-login/src/main/java/com/baeldung/config/SecurityConfig.java similarity index 100% rename from spring-security-modules/spring-social-login/src/main/java/com/baeldung/config/SecurityConfig.java rename to spring-security-modules/spring-security-social-login/src/main/java/com/baeldung/config/SecurityConfig.java diff --git a/spring-security-modules/spring-social-login/src/main/java/com/baeldung/config/WebConfig.java b/spring-security-modules/spring-security-social-login/src/main/java/com/baeldung/config/WebConfig.java similarity index 100% rename from spring-security-modules/spring-social-login/src/main/java/com/baeldung/config/WebConfig.java rename to spring-security-modules/spring-security-social-login/src/main/java/com/baeldung/config/WebConfig.java diff --git a/spring-security-modules/spring-social-login/src/main/java/com/baeldung/persistence/dao/UserRepository.java b/spring-security-modules/spring-security-social-login/src/main/java/com/baeldung/persistence/dao/UserRepository.java similarity index 100% rename from spring-security-modules/spring-social-login/src/main/java/com/baeldung/persistence/dao/UserRepository.java rename to spring-security-modules/spring-security-social-login/src/main/java/com/baeldung/persistence/dao/UserRepository.java diff --git a/spring-security-modules/spring-social-login/src/main/java/com/baeldung/persistence/model/User.java b/spring-security-modules/spring-security-social-login/src/main/java/com/baeldung/persistence/model/User.java similarity index 100% rename from spring-security-modules/spring-social-login/src/main/java/com/baeldung/persistence/model/User.java rename to spring-security-modules/spring-security-social-login/src/main/java/com/baeldung/persistence/model/User.java diff --git a/spring-security-modules/spring-social-login/src/main/java/com/baeldung/security/FacebookConnectionSignup.java b/spring-security-modules/spring-security-social-login/src/main/java/com/baeldung/security/FacebookConnectionSignup.java similarity index 100% rename from spring-security-modules/spring-social-login/src/main/java/com/baeldung/security/FacebookConnectionSignup.java rename to spring-security-modules/spring-security-social-login/src/main/java/com/baeldung/security/FacebookConnectionSignup.java diff --git a/spring-security-modules/spring-social-login/src/main/java/com/baeldung/security/FacebookSignInAdapter.java b/spring-security-modules/spring-security-social-login/src/main/java/com/baeldung/security/FacebookSignInAdapter.java similarity index 100% rename from spring-security-modules/spring-social-login/src/main/java/com/baeldung/security/FacebookSignInAdapter.java rename to spring-security-modules/spring-security-social-login/src/main/java/com/baeldung/security/FacebookSignInAdapter.java diff --git a/spring-security-modules/spring-social-login/src/main/java/com/baeldung/security/MyUserDetailsService.java b/spring-security-modules/spring-security-social-login/src/main/java/com/baeldung/security/MyUserDetailsService.java similarity index 100% rename from spring-security-modules/spring-social-login/src/main/java/com/baeldung/security/MyUserDetailsService.java rename to spring-security-modules/spring-security-social-login/src/main/java/com/baeldung/security/MyUserDetailsService.java diff --git a/spring-security-modules/spring-social-login/src/main/resources/application.properties b/spring-security-modules/spring-security-social-login/src/main/resources/application.properties similarity index 100% rename from spring-security-modules/spring-social-login/src/main/resources/application.properties rename to spring-security-modules/spring-security-social-login/src/main/resources/application.properties diff --git a/spring-security-modules/spring-social-login/src/main/resources/data.sql b/spring-security-modules/spring-security-social-login/src/main/resources/data.sql similarity index 100% rename from spring-security-modules/spring-social-login/src/main/resources/data.sql rename to spring-security-modules/spring-security-social-login/src/main/resources/data.sql diff --git a/spring-security-modules/spring-social-login/src/main/resources/logback.xml b/spring-security-modules/spring-security-social-login/src/main/resources/logback.xml similarity index 100% rename from spring-security-modules/spring-social-login/src/main/resources/logback.xml rename to spring-security-modules/spring-security-social-login/src/main/resources/logback.xml diff --git a/spring-security-modules/spring-social-login/src/main/resources/templates/index.html b/spring-security-modules/spring-security-social-login/src/main/resources/templates/index.html similarity index 100% rename from spring-security-modules/spring-social-login/src/main/resources/templates/index.html rename to spring-security-modules/spring-security-social-login/src/main/resources/templates/index.html diff --git a/spring-security-modules/spring-social-login/src/main/resources/templates/login.html b/spring-security-modules/spring-security-social-login/src/main/resources/templates/login.html similarity index 100% rename from spring-security-modules/spring-social-login/src/main/resources/templates/login.html rename to spring-security-modules/spring-security-social-login/src/main/resources/templates/login.html diff --git a/spring-security-modules/spring-social-login/src/test/java/com/baeldung/SpringContextTest.java b/spring-security-modules/spring-security-social-login/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-security-modules/spring-social-login/src/test/java/com/baeldung/SpringContextTest.java rename to spring-security-modules/spring-security-social-login/src/test/java/com/baeldung/SpringContextTest.java From e6faed98b67047bf1aa7660c52dda8b1886c2675 Mon Sep 17 00:00:00 2001 From: sampadawagde Date: Thu, 30 Jun 2022 20:06:28 +0530 Subject: [PATCH 2/8] JAVA-12732: rename spring-5-security-cognito to spring-security-cognito --- .../README.md | 0 .../pom.xml | 4 ++-- .../java/com/baeldung/cognito/CognitoWebConfiguration.java | 0 .../main/java/com/baeldung/cognito/SecurityConfiguration.java | 0 .../java/com/baeldung/cognito/SpringCognitoApplication.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/logback.xml | 0 .../src/main/resources/templates/home.html | 0 8 files changed, 2 insertions(+), 2 deletions(-) rename spring-security-modules/{spring-5-security-cognito => spring-security-cognito}/README.md (100%) rename spring-security-modules/{spring-5-security-cognito => spring-security-cognito}/pom.xml (95%) rename spring-security-modules/{spring-5-security-cognito => spring-security-cognito}/src/main/java/com/baeldung/cognito/CognitoWebConfiguration.java (100%) rename spring-security-modules/{spring-5-security-cognito => spring-security-cognito}/src/main/java/com/baeldung/cognito/SecurityConfiguration.java (100%) rename spring-security-modules/{spring-5-security-cognito => spring-security-cognito}/src/main/java/com/baeldung/cognito/SpringCognitoApplication.java (100%) rename spring-security-modules/{spring-5-security-cognito => spring-security-cognito}/src/main/resources/application.yml (100%) rename spring-security-modules/{spring-5-security-cognito => spring-security-cognito}/src/main/resources/logback.xml (100%) rename spring-security-modules/{spring-5-security-cognito => spring-security-cognito}/src/main/resources/templates/home.html (100%) diff --git a/spring-security-modules/spring-5-security-cognito/README.md b/spring-security-modules/spring-security-cognito/README.md similarity index 100% rename from spring-security-modules/spring-5-security-cognito/README.md rename to spring-security-modules/spring-security-cognito/README.md diff --git a/spring-security-modules/spring-5-security-cognito/pom.xml b/spring-security-modules/spring-security-cognito/pom.xml similarity index 95% rename from spring-security-modules/spring-5-security-cognito/pom.xml rename to spring-security-modules/spring-security-cognito/pom.xml index 4da8b2fae5..56754ddf99 100644 --- a/spring-security-modules/spring-5-security-cognito/pom.xml +++ b/spring-security-modules/spring-security-cognito/pom.xml @@ -3,9 +3,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - spring-5-security-cognito + spring-security-cognito 0.0.1-SNAPSHOT - spring-5-security-cognito + spring-security-cognito jar spring 5 security oauth cognito sample project diff --git a/spring-security-modules/spring-5-security-cognito/src/main/java/com/baeldung/cognito/CognitoWebConfiguration.java b/spring-security-modules/spring-security-cognito/src/main/java/com/baeldung/cognito/CognitoWebConfiguration.java similarity index 100% rename from spring-security-modules/spring-5-security-cognito/src/main/java/com/baeldung/cognito/CognitoWebConfiguration.java rename to spring-security-modules/spring-security-cognito/src/main/java/com/baeldung/cognito/CognitoWebConfiguration.java diff --git a/spring-security-modules/spring-5-security-cognito/src/main/java/com/baeldung/cognito/SecurityConfiguration.java b/spring-security-modules/spring-security-cognito/src/main/java/com/baeldung/cognito/SecurityConfiguration.java similarity index 100% rename from spring-security-modules/spring-5-security-cognito/src/main/java/com/baeldung/cognito/SecurityConfiguration.java rename to spring-security-modules/spring-security-cognito/src/main/java/com/baeldung/cognito/SecurityConfiguration.java diff --git a/spring-security-modules/spring-5-security-cognito/src/main/java/com/baeldung/cognito/SpringCognitoApplication.java b/spring-security-modules/spring-security-cognito/src/main/java/com/baeldung/cognito/SpringCognitoApplication.java similarity index 100% rename from spring-security-modules/spring-5-security-cognito/src/main/java/com/baeldung/cognito/SpringCognitoApplication.java rename to spring-security-modules/spring-security-cognito/src/main/java/com/baeldung/cognito/SpringCognitoApplication.java diff --git a/spring-security-modules/spring-5-security-cognito/src/main/resources/application.yml b/spring-security-modules/spring-security-cognito/src/main/resources/application.yml similarity index 100% rename from spring-security-modules/spring-5-security-cognito/src/main/resources/application.yml rename to spring-security-modules/spring-security-cognito/src/main/resources/application.yml diff --git a/spring-security-modules/spring-5-security-cognito/src/main/resources/logback.xml b/spring-security-modules/spring-security-cognito/src/main/resources/logback.xml similarity index 100% rename from spring-security-modules/spring-5-security-cognito/src/main/resources/logback.xml rename to spring-security-modules/spring-security-cognito/src/main/resources/logback.xml diff --git a/spring-security-modules/spring-5-security-cognito/src/main/resources/templates/home.html b/spring-security-modules/spring-security-cognito/src/main/resources/templates/home.html similarity index 100% rename from spring-security-modules/spring-5-security-cognito/src/main/resources/templates/home.html rename to spring-security-modules/spring-security-cognito/src/main/resources/templates/home.html From 2df103484d32f5fcdb8f34e6c9551893ce60e212 Mon Sep 17 00:00:00 2001 From: sampadawagde Date: Thu, 30 Jun 2022 20:07:18 +0530 Subject: [PATCH 3/8] JAVA-12732: rename spring-5-security-oauth to spring-security-oauth2 --- .../README.md | 0 .../pom.xml | 4 ++-- .../src/main/java/com/baeldung/jersey/JerseyApplication.java | 0 .../src/main/java/com/baeldung/jersey/JerseyResource.java | 0 .../src/main/java/com/baeldung/jersey/RestConfig.java | 0 .../src/main/java/com/baeldung/jersey/SecurityConfig.java | 0 .../java/com/baeldung/oauth2/CustomRequestSecurityConfig.java | 0 .../src/main/java/com/baeldung/oauth2/LoginController.java | 0 .../src/main/java/com/baeldung/oauth2/MvcConfig.java | 0 .../src/main/java/com/baeldung/oauth2/SecurityConfig.java | 0 .../main/java/com/baeldung/oauth2/SpringOAuthApplication.java | 0 .../com/baeldung/oauth2extractors/ExtractorsApplication.java | 0 .../oauth2extractors/configuration/SecurityConfig.java | 0 .../extractor/custom/BaeldungAuthoritiesExtractor.java | 0 .../extractor/custom/BaeldungPrincipalExtractor.java | 0 .../extractor/github/GithubAuthoritiesExtractor.java | 0 .../extractor/github/GithubPrincipalExtractor.java | 0 .../oauth2request/CustomAuthorizationRequestResolver.java | 0 .../baeldung/oauth2request/CustomRequestEntityConverter.java | 0 .../baeldung/oauth2request/CustomTokenResponseConverter.java | 0 .../oauth2request/LinkedinTokenResponseConverter.java | 0 .../java/com/baeldung/oauth2resttemplate/AppController.java | 0 .../main/java/com/baeldung/oauth2resttemplate/GithubRepo.java | 0 .../java/com/baeldung/oauth2resttemplate/SecurityConfig.java | 0 .../SpringSecurityOauth2ClientApplication.java | 0 .../application-oauth2-extractors-baeldung.properties | 0 .../resources/application-oauth2-extractors-github.properties | 0 .../resources/application-oauth2-rest-template.properties | 0 .../src/main/resources/application-oauth2.properties | 0 .../src/main/resources/application.properties | 0 .../src/main/resources/default-application.properties | 0 .../src/main/resources/jersey-application.properties | 0 .../src/main/resources/logback.xml | 0 .../src/main/resources/static/css/main.css | 0 .../src/main/resources/templates/index.html | 0 .../src/main/resources/templates/loginFailure.html | 0 .../src/main/resources/templates/loginSuccess.html | 0 .../src/main/resources/templates/oauth2_extractors.html | 0 .../main/resources/templates/oauth2resttemplate/error.html | 0 .../src/main/resources/templates/oauth2resttemplate/home.html | 0 .../main/resources/templates/oauth2resttemplate/index.html | 0 .../resources/templates/oauth2resttemplate/repositories.html | 0 .../src/main/resources/templates/oauth_login.html | 0 .../src/main/resources/templates/securedPage.html | 0 .../test/java/com/baeldung/jersey/JerseyResourceUnitTest.java | 0 .../com/baeldung/oauth2extractors/ExtractorsUnitTest.java | 0 46 files changed, 2 insertions(+), 2 deletions(-) rename spring-security-modules/{spring-5-security-oauth => spring-security-oauth2}/README.md (100%) rename spring-security-modules/{spring-5-security-oauth => spring-security-oauth2}/pom.xml (97%) rename spring-security-modules/{spring-5-security-oauth => spring-security-oauth2}/src/main/java/com/baeldung/jersey/JerseyApplication.java (100%) rename spring-security-modules/{spring-5-security-oauth => spring-security-oauth2}/src/main/java/com/baeldung/jersey/JerseyResource.java (100%) rename spring-security-modules/{spring-5-security-oauth => spring-security-oauth2}/src/main/java/com/baeldung/jersey/RestConfig.java (100%) rename spring-security-modules/{spring-5-security-oauth => spring-security-oauth2}/src/main/java/com/baeldung/jersey/SecurityConfig.java (100%) rename spring-security-modules/{spring-5-security-oauth => spring-security-oauth2}/src/main/java/com/baeldung/oauth2/CustomRequestSecurityConfig.java (100%) rename spring-security-modules/{spring-5-security-oauth => spring-security-oauth2}/src/main/java/com/baeldung/oauth2/LoginController.java (100%) rename spring-security-modules/{spring-5-security-oauth => spring-security-oauth2}/src/main/java/com/baeldung/oauth2/MvcConfig.java (100%) rename spring-security-modules/{spring-5-security-oauth => spring-security-oauth2}/src/main/java/com/baeldung/oauth2/SecurityConfig.java (100%) rename spring-security-modules/{spring-5-security-oauth => spring-security-oauth2}/src/main/java/com/baeldung/oauth2/SpringOAuthApplication.java (100%) rename spring-security-modules/{spring-5-security-oauth => spring-security-oauth2}/src/main/java/com/baeldung/oauth2extractors/ExtractorsApplication.java (100%) rename spring-security-modules/{spring-5-security-oauth => spring-security-oauth2}/src/main/java/com/baeldung/oauth2extractors/configuration/SecurityConfig.java (100%) rename spring-security-modules/{spring-5-security-oauth => spring-security-oauth2}/src/main/java/com/baeldung/oauth2extractors/extractor/custom/BaeldungAuthoritiesExtractor.java (100%) rename spring-security-modules/{spring-5-security-oauth => spring-security-oauth2}/src/main/java/com/baeldung/oauth2extractors/extractor/custom/BaeldungPrincipalExtractor.java (100%) rename spring-security-modules/{spring-5-security-oauth => spring-security-oauth2}/src/main/java/com/baeldung/oauth2extractors/extractor/github/GithubAuthoritiesExtractor.java (100%) rename spring-security-modules/{spring-5-security-oauth => spring-security-oauth2}/src/main/java/com/baeldung/oauth2extractors/extractor/github/GithubPrincipalExtractor.java (100%) rename spring-security-modules/{spring-5-security-oauth => spring-security-oauth2}/src/main/java/com/baeldung/oauth2request/CustomAuthorizationRequestResolver.java (100%) rename spring-security-modules/{spring-5-security-oauth => spring-security-oauth2}/src/main/java/com/baeldung/oauth2request/CustomRequestEntityConverter.java (100%) rename spring-security-modules/{spring-5-security-oauth => spring-security-oauth2}/src/main/java/com/baeldung/oauth2request/CustomTokenResponseConverter.java (100%) rename spring-security-modules/{spring-5-security-oauth => spring-security-oauth2}/src/main/java/com/baeldung/oauth2request/LinkedinTokenResponseConverter.java (100%) rename spring-security-modules/{spring-5-security-oauth => spring-security-oauth2}/src/main/java/com/baeldung/oauth2resttemplate/AppController.java (100%) rename spring-security-modules/{spring-5-security-oauth => spring-security-oauth2}/src/main/java/com/baeldung/oauth2resttemplate/GithubRepo.java (100%) rename spring-security-modules/{spring-5-security-oauth => spring-security-oauth2}/src/main/java/com/baeldung/oauth2resttemplate/SecurityConfig.java (100%) rename spring-security-modules/{spring-5-security-oauth => spring-security-oauth2}/src/main/java/com/baeldung/oauth2resttemplate/SpringSecurityOauth2ClientApplication.java (100%) rename spring-security-modules/{spring-5-security-oauth => spring-security-oauth2}/src/main/resources/application-oauth2-extractors-baeldung.properties (100%) rename spring-security-modules/{spring-5-security-oauth => spring-security-oauth2}/src/main/resources/application-oauth2-extractors-github.properties (100%) rename spring-security-modules/{spring-5-security-oauth => spring-security-oauth2}/src/main/resources/application-oauth2-rest-template.properties (100%) rename spring-security-modules/{spring-5-security-oauth => spring-security-oauth2}/src/main/resources/application-oauth2.properties (100%) rename spring-security-modules/{spring-5-security-oauth => spring-security-oauth2}/src/main/resources/application.properties (100%) rename spring-security-modules/{spring-5-security-oauth => spring-security-oauth2}/src/main/resources/default-application.properties (100%) rename spring-security-modules/{spring-5-security-oauth => spring-security-oauth2}/src/main/resources/jersey-application.properties (100%) rename spring-security-modules/{spring-5-security-oauth => spring-security-oauth2}/src/main/resources/logback.xml (100%) rename spring-security-modules/{spring-5-security-oauth => spring-security-oauth2}/src/main/resources/static/css/main.css (100%) rename spring-security-modules/{spring-5-security-oauth => spring-security-oauth2}/src/main/resources/templates/index.html (100%) rename spring-security-modules/{spring-5-security-oauth => spring-security-oauth2}/src/main/resources/templates/loginFailure.html (100%) rename spring-security-modules/{spring-5-security-oauth => spring-security-oauth2}/src/main/resources/templates/loginSuccess.html (100%) rename spring-security-modules/{spring-5-security-oauth => spring-security-oauth2}/src/main/resources/templates/oauth2_extractors.html (100%) rename spring-security-modules/{spring-5-security-oauth => spring-security-oauth2}/src/main/resources/templates/oauth2resttemplate/error.html (100%) rename spring-security-modules/{spring-5-security-oauth => spring-security-oauth2}/src/main/resources/templates/oauth2resttemplate/home.html (100%) rename spring-security-modules/{spring-5-security-oauth => spring-security-oauth2}/src/main/resources/templates/oauth2resttemplate/index.html (100%) rename spring-security-modules/{spring-5-security-oauth => spring-security-oauth2}/src/main/resources/templates/oauth2resttemplate/repositories.html (100%) rename spring-security-modules/{spring-5-security-oauth => spring-security-oauth2}/src/main/resources/templates/oauth_login.html (100%) rename spring-security-modules/{spring-5-security-oauth => spring-security-oauth2}/src/main/resources/templates/securedPage.html (100%) rename spring-security-modules/{spring-5-security-oauth => spring-security-oauth2}/src/test/java/com/baeldung/jersey/JerseyResourceUnitTest.java (100%) rename spring-security-modules/{spring-5-security-oauth => spring-security-oauth2}/src/test/java/com/baeldung/oauth2extractors/ExtractorsUnitTest.java (100%) diff --git a/spring-security-modules/spring-5-security-oauth/README.md b/spring-security-modules/spring-security-oauth2/README.md similarity index 100% rename from spring-security-modules/spring-5-security-oauth/README.md rename to spring-security-modules/spring-security-oauth2/README.md diff --git a/spring-security-modules/spring-5-security-oauth/pom.xml b/spring-security-modules/spring-security-oauth2/pom.xml similarity index 97% rename from spring-security-modules/spring-5-security-oauth/pom.xml rename to spring-security-modules/spring-security-oauth2/pom.xml index 8449b01ec0..e2ff51f98f 100644 --- a/spring-security-modules/spring-5-security-oauth/pom.xml +++ b/spring-security-modules/spring-security-oauth2/pom.xml @@ -3,9 +3,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - spring-5-security-oauth + spring-5-oauth2 0.0.1-SNAPSHOT - spring-5-security-oauth + spring-security-oauth2 jar spring 5 security oauth sample project diff --git a/spring-security-modules/spring-5-security-oauth/src/main/java/com/baeldung/jersey/JerseyApplication.java b/spring-security-modules/spring-security-oauth2/src/main/java/com/baeldung/jersey/JerseyApplication.java similarity index 100% rename from spring-security-modules/spring-5-security-oauth/src/main/java/com/baeldung/jersey/JerseyApplication.java rename to spring-security-modules/spring-security-oauth2/src/main/java/com/baeldung/jersey/JerseyApplication.java diff --git a/spring-security-modules/spring-5-security-oauth/src/main/java/com/baeldung/jersey/JerseyResource.java b/spring-security-modules/spring-security-oauth2/src/main/java/com/baeldung/jersey/JerseyResource.java similarity index 100% rename from spring-security-modules/spring-5-security-oauth/src/main/java/com/baeldung/jersey/JerseyResource.java rename to spring-security-modules/spring-security-oauth2/src/main/java/com/baeldung/jersey/JerseyResource.java diff --git a/spring-security-modules/spring-5-security-oauth/src/main/java/com/baeldung/jersey/RestConfig.java b/spring-security-modules/spring-security-oauth2/src/main/java/com/baeldung/jersey/RestConfig.java similarity index 100% rename from spring-security-modules/spring-5-security-oauth/src/main/java/com/baeldung/jersey/RestConfig.java rename to spring-security-modules/spring-security-oauth2/src/main/java/com/baeldung/jersey/RestConfig.java diff --git a/spring-security-modules/spring-5-security-oauth/src/main/java/com/baeldung/jersey/SecurityConfig.java b/spring-security-modules/spring-security-oauth2/src/main/java/com/baeldung/jersey/SecurityConfig.java similarity index 100% rename from spring-security-modules/spring-5-security-oauth/src/main/java/com/baeldung/jersey/SecurityConfig.java rename to spring-security-modules/spring-security-oauth2/src/main/java/com/baeldung/jersey/SecurityConfig.java diff --git a/spring-security-modules/spring-5-security-oauth/src/main/java/com/baeldung/oauth2/CustomRequestSecurityConfig.java b/spring-security-modules/spring-security-oauth2/src/main/java/com/baeldung/oauth2/CustomRequestSecurityConfig.java similarity index 100% rename from spring-security-modules/spring-5-security-oauth/src/main/java/com/baeldung/oauth2/CustomRequestSecurityConfig.java rename to spring-security-modules/spring-security-oauth2/src/main/java/com/baeldung/oauth2/CustomRequestSecurityConfig.java diff --git a/spring-security-modules/spring-5-security-oauth/src/main/java/com/baeldung/oauth2/LoginController.java b/spring-security-modules/spring-security-oauth2/src/main/java/com/baeldung/oauth2/LoginController.java similarity index 100% rename from spring-security-modules/spring-5-security-oauth/src/main/java/com/baeldung/oauth2/LoginController.java rename to spring-security-modules/spring-security-oauth2/src/main/java/com/baeldung/oauth2/LoginController.java diff --git a/spring-security-modules/spring-5-security-oauth/src/main/java/com/baeldung/oauth2/MvcConfig.java b/spring-security-modules/spring-security-oauth2/src/main/java/com/baeldung/oauth2/MvcConfig.java similarity index 100% rename from spring-security-modules/spring-5-security-oauth/src/main/java/com/baeldung/oauth2/MvcConfig.java rename to spring-security-modules/spring-security-oauth2/src/main/java/com/baeldung/oauth2/MvcConfig.java diff --git a/spring-security-modules/spring-5-security-oauth/src/main/java/com/baeldung/oauth2/SecurityConfig.java b/spring-security-modules/spring-security-oauth2/src/main/java/com/baeldung/oauth2/SecurityConfig.java similarity index 100% rename from spring-security-modules/spring-5-security-oauth/src/main/java/com/baeldung/oauth2/SecurityConfig.java rename to spring-security-modules/spring-security-oauth2/src/main/java/com/baeldung/oauth2/SecurityConfig.java diff --git a/spring-security-modules/spring-5-security-oauth/src/main/java/com/baeldung/oauth2/SpringOAuthApplication.java b/spring-security-modules/spring-security-oauth2/src/main/java/com/baeldung/oauth2/SpringOAuthApplication.java similarity index 100% rename from spring-security-modules/spring-5-security-oauth/src/main/java/com/baeldung/oauth2/SpringOAuthApplication.java rename to spring-security-modules/spring-security-oauth2/src/main/java/com/baeldung/oauth2/SpringOAuthApplication.java diff --git a/spring-security-modules/spring-5-security-oauth/src/main/java/com/baeldung/oauth2extractors/ExtractorsApplication.java b/spring-security-modules/spring-security-oauth2/src/main/java/com/baeldung/oauth2extractors/ExtractorsApplication.java similarity index 100% rename from spring-security-modules/spring-5-security-oauth/src/main/java/com/baeldung/oauth2extractors/ExtractorsApplication.java rename to spring-security-modules/spring-security-oauth2/src/main/java/com/baeldung/oauth2extractors/ExtractorsApplication.java diff --git a/spring-security-modules/spring-5-security-oauth/src/main/java/com/baeldung/oauth2extractors/configuration/SecurityConfig.java b/spring-security-modules/spring-security-oauth2/src/main/java/com/baeldung/oauth2extractors/configuration/SecurityConfig.java similarity index 100% rename from spring-security-modules/spring-5-security-oauth/src/main/java/com/baeldung/oauth2extractors/configuration/SecurityConfig.java rename to spring-security-modules/spring-security-oauth2/src/main/java/com/baeldung/oauth2extractors/configuration/SecurityConfig.java diff --git a/spring-security-modules/spring-5-security-oauth/src/main/java/com/baeldung/oauth2extractors/extractor/custom/BaeldungAuthoritiesExtractor.java b/spring-security-modules/spring-security-oauth2/src/main/java/com/baeldung/oauth2extractors/extractor/custom/BaeldungAuthoritiesExtractor.java similarity index 100% rename from spring-security-modules/spring-5-security-oauth/src/main/java/com/baeldung/oauth2extractors/extractor/custom/BaeldungAuthoritiesExtractor.java rename to spring-security-modules/spring-security-oauth2/src/main/java/com/baeldung/oauth2extractors/extractor/custom/BaeldungAuthoritiesExtractor.java diff --git a/spring-security-modules/spring-5-security-oauth/src/main/java/com/baeldung/oauth2extractors/extractor/custom/BaeldungPrincipalExtractor.java b/spring-security-modules/spring-security-oauth2/src/main/java/com/baeldung/oauth2extractors/extractor/custom/BaeldungPrincipalExtractor.java similarity index 100% rename from spring-security-modules/spring-5-security-oauth/src/main/java/com/baeldung/oauth2extractors/extractor/custom/BaeldungPrincipalExtractor.java rename to spring-security-modules/spring-security-oauth2/src/main/java/com/baeldung/oauth2extractors/extractor/custom/BaeldungPrincipalExtractor.java diff --git a/spring-security-modules/spring-5-security-oauth/src/main/java/com/baeldung/oauth2extractors/extractor/github/GithubAuthoritiesExtractor.java b/spring-security-modules/spring-security-oauth2/src/main/java/com/baeldung/oauth2extractors/extractor/github/GithubAuthoritiesExtractor.java similarity index 100% rename from spring-security-modules/spring-5-security-oauth/src/main/java/com/baeldung/oauth2extractors/extractor/github/GithubAuthoritiesExtractor.java rename to spring-security-modules/spring-security-oauth2/src/main/java/com/baeldung/oauth2extractors/extractor/github/GithubAuthoritiesExtractor.java diff --git a/spring-security-modules/spring-5-security-oauth/src/main/java/com/baeldung/oauth2extractors/extractor/github/GithubPrincipalExtractor.java b/spring-security-modules/spring-security-oauth2/src/main/java/com/baeldung/oauth2extractors/extractor/github/GithubPrincipalExtractor.java similarity index 100% rename from spring-security-modules/spring-5-security-oauth/src/main/java/com/baeldung/oauth2extractors/extractor/github/GithubPrincipalExtractor.java rename to spring-security-modules/spring-security-oauth2/src/main/java/com/baeldung/oauth2extractors/extractor/github/GithubPrincipalExtractor.java diff --git a/spring-security-modules/spring-5-security-oauth/src/main/java/com/baeldung/oauth2request/CustomAuthorizationRequestResolver.java b/spring-security-modules/spring-security-oauth2/src/main/java/com/baeldung/oauth2request/CustomAuthorizationRequestResolver.java similarity index 100% rename from spring-security-modules/spring-5-security-oauth/src/main/java/com/baeldung/oauth2request/CustomAuthorizationRequestResolver.java rename to spring-security-modules/spring-security-oauth2/src/main/java/com/baeldung/oauth2request/CustomAuthorizationRequestResolver.java diff --git a/spring-security-modules/spring-5-security-oauth/src/main/java/com/baeldung/oauth2request/CustomRequestEntityConverter.java b/spring-security-modules/spring-security-oauth2/src/main/java/com/baeldung/oauth2request/CustomRequestEntityConverter.java similarity index 100% rename from spring-security-modules/spring-5-security-oauth/src/main/java/com/baeldung/oauth2request/CustomRequestEntityConverter.java rename to spring-security-modules/spring-security-oauth2/src/main/java/com/baeldung/oauth2request/CustomRequestEntityConverter.java diff --git a/spring-security-modules/spring-5-security-oauth/src/main/java/com/baeldung/oauth2request/CustomTokenResponseConverter.java b/spring-security-modules/spring-security-oauth2/src/main/java/com/baeldung/oauth2request/CustomTokenResponseConverter.java similarity index 100% rename from spring-security-modules/spring-5-security-oauth/src/main/java/com/baeldung/oauth2request/CustomTokenResponseConverter.java rename to spring-security-modules/spring-security-oauth2/src/main/java/com/baeldung/oauth2request/CustomTokenResponseConverter.java diff --git a/spring-security-modules/spring-5-security-oauth/src/main/java/com/baeldung/oauth2request/LinkedinTokenResponseConverter.java b/spring-security-modules/spring-security-oauth2/src/main/java/com/baeldung/oauth2request/LinkedinTokenResponseConverter.java similarity index 100% rename from spring-security-modules/spring-5-security-oauth/src/main/java/com/baeldung/oauth2request/LinkedinTokenResponseConverter.java rename to spring-security-modules/spring-security-oauth2/src/main/java/com/baeldung/oauth2request/LinkedinTokenResponseConverter.java diff --git a/spring-security-modules/spring-5-security-oauth/src/main/java/com/baeldung/oauth2resttemplate/AppController.java b/spring-security-modules/spring-security-oauth2/src/main/java/com/baeldung/oauth2resttemplate/AppController.java similarity index 100% rename from spring-security-modules/spring-5-security-oauth/src/main/java/com/baeldung/oauth2resttemplate/AppController.java rename to spring-security-modules/spring-security-oauth2/src/main/java/com/baeldung/oauth2resttemplate/AppController.java diff --git a/spring-security-modules/spring-5-security-oauth/src/main/java/com/baeldung/oauth2resttemplate/GithubRepo.java b/spring-security-modules/spring-security-oauth2/src/main/java/com/baeldung/oauth2resttemplate/GithubRepo.java similarity index 100% rename from spring-security-modules/spring-5-security-oauth/src/main/java/com/baeldung/oauth2resttemplate/GithubRepo.java rename to spring-security-modules/spring-security-oauth2/src/main/java/com/baeldung/oauth2resttemplate/GithubRepo.java diff --git a/spring-security-modules/spring-5-security-oauth/src/main/java/com/baeldung/oauth2resttemplate/SecurityConfig.java b/spring-security-modules/spring-security-oauth2/src/main/java/com/baeldung/oauth2resttemplate/SecurityConfig.java similarity index 100% rename from spring-security-modules/spring-5-security-oauth/src/main/java/com/baeldung/oauth2resttemplate/SecurityConfig.java rename to spring-security-modules/spring-security-oauth2/src/main/java/com/baeldung/oauth2resttemplate/SecurityConfig.java diff --git a/spring-security-modules/spring-5-security-oauth/src/main/java/com/baeldung/oauth2resttemplate/SpringSecurityOauth2ClientApplication.java b/spring-security-modules/spring-security-oauth2/src/main/java/com/baeldung/oauth2resttemplate/SpringSecurityOauth2ClientApplication.java similarity index 100% rename from spring-security-modules/spring-5-security-oauth/src/main/java/com/baeldung/oauth2resttemplate/SpringSecurityOauth2ClientApplication.java rename to spring-security-modules/spring-security-oauth2/src/main/java/com/baeldung/oauth2resttemplate/SpringSecurityOauth2ClientApplication.java diff --git a/spring-security-modules/spring-5-security-oauth/src/main/resources/application-oauth2-extractors-baeldung.properties b/spring-security-modules/spring-security-oauth2/src/main/resources/application-oauth2-extractors-baeldung.properties similarity index 100% rename from spring-security-modules/spring-5-security-oauth/src/main/resources/application-oauth2-extractors-baeldung.properties rename to spring-security-modules/spring-security-oauth2/src/main/resources/application-oauth2-extractors-baeldung.properties diff --git a/spring-security-modules/spring-5-security-oauth/src/main/resources/application-oauth2-extractors-github.properties b/spring-security-modules/spring-security-oauth2/src/main/resources/application-oauth2-extractors-github.properties similarity index 100% rename from spring-security-modules/spring-5-security-oauth/src/main/resources/application-oauth2-extractors-github.properties rename to spring-security-modules/spring-security-oauth2/src/main/resources/application-oauth2-extractors-github.properties diff --git a/spring-security-modules/spring-5-security-oauth/src/main/resources/application-oauth2-rest-template.properties b/spring-security-modules/spring-security-oauth2/src/main/resources/application-oauth2-rest-template.properties similarity index 100% rename from spring-security-modules/spring-5-security-oauth/src/main/resources/application-oauth2-rest-template.properties rename to spring-security-modules/spring-security-oauth2/src/main/resources/application-oauth2-rest-template.properties diff --git a/spring-security-modules/spring-5-security-oauth/src/main/resources/application-oauth2.properties b/spring-security-modules/spring-security-oauth2/src/main/resources/application-oauth2.properties similarity index 100% rename from spring-security-modules/spring-5-security-oauth/src/main/resources/application-oauth2.properties rename to spring-security-modules/spring-security-oauth2/src/main/resources/application-oauth2.properties diff --git a/spring-security-modules/spring-5-security-oauth/src/main/resources/application.properties b/spring-security-modules/spring-security-oauth2/src/main/resources/application.properties similarity index 100% rename from spring-security-modules/spring-5-security-oauth/src/main/resources/application.properties rename to spring-security-modules/spring-security-oauth2/src/main/resources/application.properties diff --git a/spring-security-modules/spring-5-security-oauth/src/main/resources/default-application.properties b/spring-security-modules/spring-security-oauth2/src/main/resources/default-application.properties similarity index 100% rename from spring-security-modules/spring-5-security-oauth/src/main/resources/default-application.properties rename to spring-security-modules/spring-security-oauth2/src/main/resources/default-application.properties diff --git a/spring-security-modules/spring-5-security-oauth/src/main/resources/jersey-application.properties b/spring-security-modules/spring-security-oauth2/src/main/resources/jersey-application.properties similarity index 100% rename from spring-security-modules/spring-5-security-oauth/src/main/resources/jersey-application.properties rename to spring-security-modules/spring-security-oauth2/src/main/resources/jersey-application.properties diff --git a/spring-security-modules/spring-5-security-oauth/src/main/resources/logback.xml b/spring-security-modules/spring-security-oauth2/src/main/resources/logback.xml similarity index 100% rename from spring-security-modules/spring-5-security-oauth/src/main/resources/logback.xml rename to spring-security-modules/spring-security-oauth2/src/main/resources/logback.xml diff --git a/spring-security-modules/spring-5-security-oauth/src/main/resources/static/css/main.css b/spring-security-modules/spring-security-oauth2/src/main/resources/static/css/main.css similarity index 100% rename from spring-security-modules/spring-5-security-oauth/src/main/resources/static/css/main.css rename to spring-security-modules/spring-security-oauth2/src/main/resources/static/css/main.css diff --git a/spring-security-modules/spring-5-security-oauth/src/main/resources/templates/index.html b/spring-security-modules/spring-security-oauth2/src/main/resources/templates/index.html similarity index 100% rename from spring-security-modules/spring-5-security-oauth/src/main/resources/templates/index.html rename to spring-security-modules/spring-security-oauth2/src/main/resources/templates/index.html diff --git a/spring-security-modules/spring-5-security-oauth/src/main/resources/templates/loginFailure.html b/spring-security-modules/spring-security-oauth2/src/main/resources/templates/loginFailure.html similarity index 100% rename from spring-security-modules/spring-5-security-oauth/src/main/resources/templates/loginFailure.html rename to spring-security-modules/spring-security-oauth2/src/main/resources/templates/loginFailure.html diff --git a/spring-security-modules/spring-5-security-oauth/src/main/resources/templates/loginSuccess.html b/spring-security-modules/spring-security-oauth2/src/main/resources/templates/loginSuccess.html similarity index 100% rename from spring-security-modules/spring-5-security-oauth/src/main/resources/templates/loginSuccess.html rename to spring-security-modules/spring-security-oauth2/src/main/resources/templates/loginSuccess.html diff --git a/spring-security-modules/spring-5-security-oauth/src/main/resources/templates/oauth2_extractors.html b/spring-security-modules/spring-security-oauth2/src/main/resources/templates/oauth2_extractors.html similarity index 100% rename from spring-security-modules/spring-5-security-oauth/src/main/resources/templates/oauth2_extractors.html rename to spring-security-modules/spring-security-oauth2/src/main/resources/templates/oauth2_extractors.html diff --git a/spring-security-modules/spring-5-security-oauth/src/main/resources/templates/oauth2resttemplate/error.html b/spring-security-modules/spring-security-oauth2/src/main/resources/templates/oauth2resttemplate/error.html similarity index 100% rename from spring-security-modules/spring-5-security-oauth/src/main/resources/templates/oauth2resttemplate/error.html rename to spring-security-modules/spring-security-oauth2/src/main/resources/templates/oauth2resttemplate/error.html diff --git a/spring-security-modules/spring-5-security-oauth/src/main/resources/templates/oauth2resttemplate/home.html b/spring-security-modules/spring-security-oauth2/src/main/resources/templates/oauth2resttemplate/home.html similarity index 100% rename from spring-security-modules/spring-5-security-oauth/src/main/resources/templates/oauth2resttemplate/home.html rename to spring-security-modules/spring-security-oauth2/src/main/resources/templates/oauth2resttemplate/home.html diff --git a/spring-security-modules/spring-5-security-oauth/src/main/resources/templates/oauth2resttemplate/index.html b/spring-security-modules/spring-security-oauth2/src/main/resources/templates/oauth2resttemplate/index.html similarity index 100% rename from spring-security-modules/spring-5-security-oauth/src/main/resources/templates/oauth2resttemplate/index.html rename to spring-security-modules/spring-security-oauth2/src/main/resources/templates/oauth2resttemplate/index.html diff --git a/spring-security-modules/spring-5-security-oauth/src/main/resources/templates/oauth2resttemplate/repositories.html b/spring-security-modules/spring-security-oauth2/src/main/resources/templates/oauth2resttemplate/repositories.html similarity index 100% rename from spring-security-modules/spring-5-security-oauth/src/main/resources/templates/oauth2resttemplate/repositories.html rename to spring-security-modules/spring-security-oauth2/src/main/resources/templates/oauth2resttemplate/repositories.html diff --git a/spring-security-modules/spring-5-security-oauth/src/main/resources/templates/oauth_login.html b/spring-security-modules/spring-security-oauth2/src/main/resources/templates/oauth_login.html similarity index 100% rename from spring-security-modules/spring-5-security-oauth/src/main/resources/templates/oauth_login.html rename to spring-security-modules/spring-security-oauth2/src/main/resources/templates/oauth_login.html diff --git a/spring-security-modules/spring-5-security-oauth/src/main/resources/templates/securedPage.html b/spring-security-modules/spring-security-oauth2/src/main/resources/templates/securedPage.html similarity index 100% rename from spring-security-modules/spring-5-security-oauth/src/main/resources/templates/securedPage.html rename to spring-security-modules/spring-security-oauth2/src/main/resources/templates/securedPage.html diff --git a/spring-security-modules/spring-5-security-oauth/src/test/java/com/baeldung/jersey/JerseyResourceUnitTest.java b/spring-security-modules/spring-security-oauth2/src/test/java/com/baeldung/jersey/JerseyResourceUnitTest.java similarity index 100% rename from spring-security-modules/spring-5-security-oauth/src/test/java/com/baeldung/jersey/JerseyResourceUnitTest.java rename to spring-security-modules/spring-security-oauth2/src/test/java/com/baeldung/jersey/JerseyResourceUnitTest.java diff --git a/spring-security-modules/spring-5-security-oauth/src/test/java/com/baeldung/oauth2extractors/ExtractorsUnitTest.java b/spring-security-modules/spring-security-oauth2/src/test/java/com/baeldung/oauth2extractors/ExtractorsUnitTest.java similarity index 100% rename from spring-security-modules/spring-5-security-oauth/src/test/java/com/baeldung/oauth2extractors/ExtractorsUnitTest.java rename to spring-security-modules/spring-security-oauth2/src/test/java/com/baeldung/oauth2extractors/ExtractorsUnitTest.java From d5d2705ac329ef7042bb1b2aebee44ba53c1ccae Mon Sep 17 00:00:00 2001 From: sampadawagde Date: Thu, 30 Jun 2022 20:08:15 +0530 Subject: [PATCH 4/8] JAVA-12732: modify parent pom --- spring-security-modules/pom.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/spring-security-modules/pom.xml b/spring-security-modules/pom.xml index 8d98395ab7..2123c03016 100644 --- a/spring-security-modules/pom.xml +++ b/spring-security-modules/pom.xml @@ -15,20 +15,21 @@ - spring-5-security - spring-5-security-cognito - spring-5-security-oauth + spring-5-security spring-ldap spring-security-acl spring-security-auth0 + spring-security-cognito spring-security-core spring-security-core-2 spring-security-ldap spring-security-legacy-oidc + spring-security-oauth2 spring-security-oauth2-sso spring-security-oidc spring-security-okta spring-security-saml + spring-security-social-login spring-security-web-angular spring-security-web-boot-1 spring-security-web-boot-2 @@ -45,8 +46,7 @@ spring-security-web-sockets spring-security-web-thymeleaf spring-security-web-x509 - spring-session - spring-social-login + spring-session spring-security-opa From acb9cc97cdd94d1d724edd92ad8c8191af29b23f Mon Sep 17 00:00:00 2001 From: sampadawagde Date: Wed, 6 Jul 2022 15:10:08 +0530 Subject: [PATCH 5/8] JAVA-12732: move security filters article to spring-security-web-mvc --- spring-security-modules/spring-security-ldap/README.md | 1 - spring-security-modules/spring-security-web-mvc/README.md | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-security-modules/spring-security-ldap/README.md b/spring-security-modules/spring-security-ldap/README.md index 288791b389..f75c1bbaef 100644 --- a/spring-security-modules/spring-security-ldap/README.md +++ b/spring-security-modules/spring-security-ldap/README.md @@ -8,7 +8,6 @@ The "Learn Spring Security" Classes: http://github.learnspringsecurity.com ### Relevant Article: -- [Spring Security – security none, filters none, access permitAll](https://www.baeldung.com/security-none-filters-none-access-permitAll) - [Intro to Spring Security LDAP](https://www.baeldung.com/spring-security-ldap) ### Notes diff --git a/spring-security-modules/spring-security-web-mvc/README.md b/spring-security-modules/spring-security-web-mvc/README.md index bb4cfe1a4f..49831ea970 100644 --- a/spring-security-modules/spring-security-web-mvc/README.md +++ b/spring-security-modules/spring-security-web-mvc/README.md @@ -11,6 +11,7 @@ The "Learn Spring Security" Classes: http://github.learnspringsecurity.com - [HttpSessionListener Example – Monitoring](https://www.baeldung.com/httpsessionlistener_with_metrics) - [Control the Session with Spring Security](https://www.baeldung.com/spring-security-session) - [The Clear-Site-Data Header in Spring Security](https://www.baeldung.com/spring-security-clear-site-data-header) +- [Spring Security – security none, filters none, access permitAll](https://www.baeldung.com/security-none-filters-none-access-permitAll) ### Build the Project From 6ae4a1aaf78e94078577ce0eaa4f4702e5c0b075 Mon Sep 17 00:00:00 2001 From: sampadawagde Date: Wed, 6 Jul 2022 15:25:12 +0530 Subject: [PATCH 6/8] JAVA-12732: move spring-ldap into spring-security-ldap --- spring-security-modules/pom.xml | 1 - .../spring-ldap/.gitignore | 13 -- spring-security-modules/spring-ldap/README.md | 8 - spring-security-modules/spring-ldap/pom.xml | 141 ------------------ .../src/main/resources/application.properties | 6 - .../src/main/resources/logback.xml | 19 --- .../java/org/baeldung/SpringContextTest.java | 17 --- .../spring-security-ldap/README.md | 2 + .../spring-security-ldap/pom.xml | 21 +++ .../com/baeldung/ldap/client/LdapClient.java | 0 .../baeldung/ldap/data/repository/User.java | 0 .../ldap/data/repository/UserRepository.java | 0 .../ldap/data/service/LdapClient.java | 0 .../ldap/data/service/UserService.java | 0 .../baeldung/ldap/javaconfig/AppConfig.java | 0 .../src/main/resources/application.properties | 9 +- .../ldap/client/LdapClientLiveTest.java | 0 .../LdapDataRepositoryIntegrationTest.java | 0 .../baeldung/ldap/javaconfig/TestConfig.java | 0 .../src/test/resources/test.ldif | 0 .../resources/test_application.properties | 0 21 files changed, 31 insertions(+), 206 deletions(-) delete mode 100644 spring-security-modules/spring-ldap/.gitignore delete mode 100644 spring-security-modules/spring-ldap/README.md delete mode 100644 spring-security-modules/spring-ldap/pom.xml delete mode 100644 spring-security-modules/spring-ldap/src/main/resources/application.properties delete mode 100644 spring-security-modules/spring-ldap/src/main/resources/logback.xml delete mode 100644 spring-security-modules/spring-ldap/src/test/java/org/baeldung/SpringContextTest.java rename spring-security-modules/{spring-ldap => spring-security-ldap}/src/main/java/com/baeldung/ldap/client/LdapClient.java (100%) rename spring-security-modules/{spring-ldap => spring-security-ldap}/src/main/java/com/baeldung/ldap/data/repository/User.java (100%) rename spring-security-modules/{spring-ldap => spring-security-ldap}/src/main/java/com/baeldung/ldap/data/repository/UserRepository.java (100%) rename spring-security-modules/{spring-ldap => spring-security-ldap}/src/main/java/com/baeldung/ldap/data/service/LdapClient.java (100%) rename spring-security-modules/{spring-ldap => spring-security-ldap}/src/main/java/com/baeldung/ldap/data/service/UserService.java (100%) rename spring-security-modules/{spring-ldap => spring-security-ldap}/src/main/java/com/baeldung/ldap/javaconfig/AppConfig.java (100%) rename spring-security-modules/{spring-ldap => spring-security-ldap}/src/test/java/com/baeldung/ldap/client/LdapClientLiveTest.java (100%) rename spring-security-modules/{spring-ldap => spring-security-ldap}/src/test/java/com/baeldung/ldap/client/LdapDataRepositoryIntegrationTest.java (100%) rename spring-security-modules/{spring-ldap => spring-security-ldap}/src/test/java/com/baeldung/ldap/javaconfig/TestConfig.java (100%) rename spring-security-modules/{spring-ldap => spring-security-ldap}/src/test/resources/test.ldif (100%) rename spring-security-modules/{spring-ldap => spring-security-ldap}/src/test/resources/test_application.properties (100%) diff --git a/spring-security-modules/pom.xml b/spring-security-modules/pom.xml index 2123c03016..c82614a3af 100644 --- a/spring-security-modules/pom.xml +++ b/spring-security-modules/pom.xml @@ -16,7 +16,6 @@ spring-5-security - spring-ldap spring-security-acl spring-security-auth0 spring-security-cognito diff --git a/spring-security-modules/spring-ldap/.gitignore b/spring-security-modules/spring-ldap/.gitignore deleted file mode 100644 index 83c05e60c8..0000000000 --- a/spring-security-modules/spring-ldap/.gitignore +++ /dev/null @@ -1,13 +0,0 @@ -*.class - -#folders# -/target -/neoDb* -/data -/src/main/webapp/WEB-INF/classes -*/META-INF/* - -# Packaged files # -*.jar -*.war -*.ear \ No newline at end of file diff --git a/spring-security-modules/spring-ldap/README.md b/spring-security-modules/spring-ldap/README.md deleted file mode 100644 index 4872f897e1..0000000000 --- a/spring-security-modules/spring-ldap/README.md +++ /dev/null @@ -1,8 +0,0 @@ -## Spring LDAP - -This module contains articles about Spring LDAP - -### Relevant articles - -- [Spring LDAP Overview](https://www.baeldung.com/spring-ldap) -- [Guide to Spring Data LDAP](https://www.baeldung.com/spring-data-ldap) diff --git a/spring-security-modules/spring-ldap/pom.xml b/spring-security-modules/spring-ldap/pom.xml deleted file mode 100644 index 086be2df5a..0000000000 --- a/spring-security-modules/spring-ldap/pom.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - 4.0.0 - spring-ldap - 0.1-SNAPSHOT - spring-ldap - jar - - - com.baeldung - spring-security-modules - 0.0.1-SNAPSHOT - - - - - org.springframework.ldap - spring-ldap-core - ${spring-ldap.version} - - - commons-logging - commons-logging - - - - - org.springframework - spring-context - ${spring-context.version} - - - - org.springframework.ldap - spring-ldap-test - ${spring-ldap.version} - test - - - commons-logging - commons-logging - - - - - - org.apache.directory.server - apacheds-core - ${apacheds.version} - test - - - org.apache.directory.server - apacheds-core-entry - ${apacheds.version} - test - - - org.apache.directory.server - apacheds-protocol-shared - ${apacheds.version} - test - - - org.apache.directory.server - apacheds-protocol-ldap - ${apacheds.version} - test - - - org.apache.directory.server - apacheds-server-jndi - ${apacheds.version} - test - - - org.apache.directory.shared - shared-ldap - ${shared-ldap.version} - test - - - - org.springframework.data - spring-data-ldap - ${spring-data-ldap.version} - - - org.springframework.data - spring-data-jpa - ${spring-data-jpa.version} - - - - - spring-ldap - - - - - live - - - - org.apache.maven.plugins - maven-surefire-plugin - - - integration-test - - test - - - - **/*IntegrationTest.java - **/*IntTest.java - - - **/*LiveTest.java - - - - - - - - - - - - 2.3.1.RELEASE - 4.3.6.RELEASE - 1.5.5 - 0.9.15 - 1.0.6.RELEASE - 1.11.6.RELEASE - - - \ No newline at end of file diff --git a/spring-security-modules/spring-ldap/src/main/resources/application.properties b/spring-security-modules/spring-ldap/src/main/resources/application.properties deleted file mode 100644 index 670fb79234..0000000000 --- a/spring-security-modules/spring-ldap/src/main/resources/application.properties +++ /dev/null @@ -1,6 +0,0 @@ -ldap.partitionSuffix=dc=example,dc=com -ldap.partition=example -ldap.principal=uid=admin,ou=system -ldap.password=secret -ldap.port=18889 -ldap.url=ldap://localhost:18889 \ No newline at end of file diff --git a/spring-security-modules/spring-ldap/src/main/resources/logback.xml b/spring-security-modules/spring-ldap/src/main/resources/logback.xml deleted file mode 100644 index 7bd5154680..0000000000 --- a/spring-security-modules/spring-ldap/src/main/resources/logback.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-security-modules/spring-ldap/src/test/java/org/baeldung/SpringContextTest.java b/spring-security-modules/spring-ldap/src/test/java/org/baeldung/SpringContextTest.java deleted file mode 100644 index 8f0c3d4612..0000000000 --- a/spring-security-modules/spring-ldap/src/test/java/org/baeldung/SpringContextTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - -import com.baeldung.ldap.javaconfig.AppConfig; - -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes = AppConfig.class) -public class SpringContextTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-security-modules/spring-security-ldap/README.md b/spring-security-modules/spring-security-ldap/README.md index f75c1bbaef..d396d67f56 100644 --- a/spring-security-modules/spring-security-ldap/README.md +++ b/spring-security-modules/spring-security-ldap/README.md @@ -9,6 +9,8 @@ The "Learn Spring Security" Classes: http://github.learnspringsecurity.com ### Relevant Article: - [Intro to Spring Security LDAP](https://www.baeldung.com/spring-security-ldap) +- [Spring LDAP Overview](https://www.baeldung.com/spring-ldap) +- [Guide to Spring Data LDAP](https://www.baeldung.com/spring-data-ldap) ### Notes diff --git a/spring-security-modules/spring-security-ldap/pom.xml b/spring-security-modules/spring-security-ldap/pom.xml index 3755c33125..73b77184d1 100644 --- a/spring-security-modules/spring-security-ldap/pom.xml +++ b/spring-security-modules/spring-security-ldap/pom.xml @@ -44,6 +44,27 @@ apacheds-server-jndi ${apacheds.version} + + + org.springframework.data + spring-data-ldap + + + org.springframework.data + spring-data-jpa + + + + org.springframework.ldap + spring-ldap-test + test + + + commons-logging + commons-logging + + + diff --git a/spring-security-modules/spring-ldap/src/main/java/com/baeldung/ldap/client/LdapClient.java b/spring-security-modules/spring-security-ldap/src/main/java/com/baeldung/ldap/client/LdapClient.java similarity index 100% rename from spring-security-modules/spring-ldap/src/main/java/com/baeldung/ldap/client/LdapClient.java rename to spring-security-modules/spring-security-ldap/src/main/java/com/baeldung/ldap/client/LdapClient.java diff --git a/spring-security-modules/spring-ldap/src/main/java/com/baeldung/ldap/data/repository/User.java b/spring-security-modules/spring-security-ldap/src/main/java/com/baeldung/ldap/data/repository/User.java similarity index 100% rename from spring-security-modules/spring-ldap/src/main/java/com/baeldung/ldap/data/repository/User.java rename to spring-security-modules/spring-security-ldap/src/main/java/com/baeldung/ldap/data/repository/User.java diff --git a/spring-security-modules/spring-ldap/src/main/java/com/baeldung/ldap/data/repository/UserRepository.java b/spring-security-modules/spring-security-ldap/src/main/java/com/baeldung/ldap/data/repository/UserRepository.java similarity index 100% rename from spring-security-modules/spring-ldap/src/main/java/com/baeldung/ldap/data/repository/UserRepository.java rename to spring-security-modules/spring-security-ldap/src/main/java/com/baeldung/ldap/data/repository/UserRepository.java diff --git a/spring-security-modules/spring-ldap/src/main/java/com/baeldung/ldap/data/service/LdapClient.java b/spring-security-modules/spring-security-ldap/src/main/java/com/baeldung/ldap/data/service/LdapClient.java similarity index 100% rename from spring-security-modules/spring-ldap/src/main/java/com/baeldung/ldap/data/service/LdapClient.java rename to spring-security-modules/spring-security-ldap/src/main/java/com/baeldung/ldap/data/service/LdapClient.java diff --git a/spring-security-modules/spring-ldap/src/main/java/com/baeldung/ldap/data/service/UserService.java b/spring-security-modules/spring-security-ldap/src/main/java/com/baeldung/ldap/data/service/UserService.java similarity index 100% rename from spring-security-modules/spring-ldap/src/main/java/com/baeldung/ldap/data/service/UserService.java rename to spring-security-modules/spring-security-ldap/src/main/java/com/baeldung/ldap/data/service/UserService.java diff --git a/spring-security-modules/spring-ldap/src/main/java/com/baeldung/ldap/javaconfig/AppConfig.java b/spring-security-modules/spring-security-ldap/src/main/java/com/baeldung/ldap/javaconfig/AppConfig.java similarity index 100% rename from spring-security-modules/spring-ldap/src/main/java/com/baeldung/ldap/javaconfig/AppConfig.java rename to spring-security-modules/spring-security-ldap/src/main/java/com/baeldung/ldap/javaconfig/AppConfig.java diff --git a/spring-security-modules/spring-security-ldap/src/main/resources/application.properties b/spring-security-modules/spring-security-ldap/src/main/resources/application.properties index 3d0221bb7b..cbe57f420f 100644 --- a/spring-security-modules/spring-security-ldap/src/main/resources/application.properties +++ b/spring-security-modules/spring-security-ldap/src/main/resources/application.properties @@ -1 +1,8 @@ -management.health.ldap.enabled=false \ No newline at end of file +management.health.ldap.enabled=false + +ldap.partitionSuffix=dc=example,dc=com +ldap.partition=example +ldap.principal=uid=admin,ou=system +ldap.password=secret +ldap.port=18889 +ldap.url=ldap://localhost:18889 \ No newline at end of file diff --git a/spring-security-modules/spring-ldap/src/test/java/com/baeldung/ldap/client/LdapClientLiveTest.java b/spring-security-modules/spring-security-ldap/src/test/java/com/baeldung/ldap/client/LdapClientLiveTest.java similarity index 100% rename from spring-security-modules/spring-ldap/src/test/java/com/baeldung/ldap/client/LdapClientLiveTest.java rename to spring-security-modules/spring-security-ldap/src/test/java/com/baeldung/ldap/client/LdapClientLiveTest.java diff --git a/spring-security-modules/spring-ldap/src/test/java/com/baeldung/ldap/client/LdapDataRepositoryIntegrationTest.java b/spring-security-modules/spring-security-ldap/src/test/java/com/baeldung/ldap/client/LdapDataRepositoryIntegrationTest.java similarity index 100% rename from spring-security-modules/spring-ldap/src/test/java/com/baeldung/ldap/client/LdapDataRepositoryIntegrationTest.java rename to spring-security-modules/spring-security-ldap/src/test/java/com/baeldung/ldap/client/LdapDataRepositoryIntegrationTest.java diff --git a/spring-security-modules/spring-ldap/src/test/java/com/baeldung/ldap/javaconfig/TestConfig.java b/spring-security-modules/spring-security-ldap/src/test/java/com/baeldung/ldap/javaconfig/TestConfig.java similarity index 100% rename from spring-security-modules/spring-ldap/src/test/java/com/baeldung/ldap/javaconfig/TestConfig.java rename to spring-security-modules/spring-security-ldap/src/test/java/com/baeldung/ldap/javaconfig/TestConfig.java diff --git a/spring-security-modules/spring-ldap/src/test/resources/test.ldif b/spring-security-modules/spring-security-ldap/src/test/resources/test.ldif similarity index 100% rename from spring-security-modules/spring-ldap/src/test/resources/test.ldif rename to spring-security-modules/spring-security-ldap/src/test/resources/test.ldif diff --git a/spring-security-modules/spring-ldap/src/test/resources/test_application.properties b/spring-security-modules/spring-security-ldap/src/test/resources/test_application.properties similarity index 100% rename from spring-security-modules/spring-ldap/src/test/resources/test_application.properties rename to spring-security-modules/spring-security-ldap/src/test/resources/test_application.properties From 6f91643aa2452516cbc575b6972f300c70b5de4b Mon Sep 17 00:00:00 2001 From: sampadawagde Date: Wed, 6 Jul 2022 15:34:15 +0530 Subject: [PATCH 7/8] resolve conflict --- spring-security-modules/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/spring-security-modules/pom.xml b/spring-security-modules/pom.xml index c82614a3af..16eb288200 100644 --- a/spring-security-modules/pom.xml +++ b/spring-security-modules/pom.xml @@ -45,7 +45,6 @@ spring-security-web-sockets spring-security-web-thymeleaf spring-security-web-x509 - spring-session spring-security-opa From 7b1b24ad7c736a376c665d9aa9be2cc27621ae8c Mon Sep 17 00:00:00 2001 From: freelansam <79205526+freelansam@users.noreply.github.com> Date: Thu, 7 Jul 2022 19:08:27 +0530 Subject: [PATCH 8/8] update pom to remove spring-social-login --- spring-security-modules/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/spring-security-modules/pom.xml b/spring-security-modules/pom.xml index 303968c52e..a75638d085 100644 --- a/spring-security-modules/pom.xml +++ b/spring-security-modules/pom.xml @@ -45,7 +45,6 @@ spring-security-web-sockets spring-security-web-thymeleaf spring-security-web-x509 - spring-social-login spring-security-opa