From 47a66b2cc3ecae3535e6c2233d091d8be3a05ef5 Mon Sep 17 00:00:00 2001 From: sampadawagde Date: Thu, 30 Jun 2022 20:07:18 +0530 Subject: [PATCH] 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