Merge pull request #12513 from freelansam/JAVA-12754

JAVA-12754: Dissolve module spring-security-5

spring-security-modules/pom.xml

@@ -14,8 +14,7 @@
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
-    <modules>
-        <module>spring-5-security</module>        
+    <modules>        
         <module>spring-security-acl</module>
         <module>spring-security-auth0</module>
         <module>spring-security-cognito</module>
@@ -35,6 +34,7 @@
         <module>spring-security-web-boot-3</module>
         <module>spring-security-web-digest-auth</module>
         <module>spring-security-web-login</module>
+        <module>spring-security-web-login-2</module>
         <module>spring-security-web-mvc-custom</module>
         <module>spring-security-web-mvc</module>
         <module>spring-security-web-persistent-login</module>

spring-security-modules/spring-5-security/README.md

@@ -1,13 +0,0 @@
-## Spring 5 Security
-
-This module contains articles about Spring Security 5
-
-## Relevant articles:
-
-- [A Custom Spring SecurityConfigurer](https://www.baeldung.com/spring-security-custom-configurer)
-- [New Password Storage In Spring Security 5](https://www.baeldung.com/spring-security-5-password-storage)
-- [Default Password Encoder in Spring Security 5](https://www.baeldung.com/spring-security-5-default-password-encoder)
-- [Guide to the AuthenticationManagerResolver in Spring Security](https://www.baeldung.com/spring-security-authenticationmanagerresolver)
-- [Manual Logout With Spring Security](https://www.baeldung.com/spring-security-manual-logout)
-- [How to Disable Spring Security Logout Redirects](https://www.baeldung.com/spring-security-disable-logout-redirects)
-- [Prevent Cross-Site Scripting (XSS) in a Spring Application](https://www.baeldung.com/spring-prevent-xss)

spring-security-modules/spring-5-security/src/main/resources/templates/index.html

@@ -1,11 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-    <title>Home</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-</head>
-<body>
-   Home
-   Welcome!
-</body>
-</html>

spring-security-modules/spring-security-core-2/README.md

@@ -5,6 +5,9 @@ This module contains articles about core Spring Security
 ### Relevant Articles:
 - [Handle Spring Security Exceptions](https://www.baeldung.com/spring-security-exceptions)
 - [Handle Spring Security Exceptions With @ExceptionHandler](https://www.baeldung.com/spring-security-exceptionhandler)
+- [Prevent Cross-Site Scripting (XSS) in a Spring Application](https://www.baeldung.com/spring-prevent-xss)
+- [Guide to the AuthenticationManagerResolver in Spring Security](https://www.baeldung.com/spring-security-authenticationmanagerresolver)
+- [A Custom Spring SecurityConfigurer|https://www.baeldung.com/spring-security-custom-configurer]
 
 ### Build the Project
 

spring-security-modules/spring-security-core-2/src/test/java/com/baeldung/SpringContextTest.java

@@ -1,5 +1,6 @@
 package com.baeldung;
 
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;

spring-security-modules/spring-security-web-login-2/README.md

@@ -0,0 +1,9 @@
+## Spring Security Login - 2
+
+This module contains articles about login/logout mechanisms with Spring Security.
+
+## Relevant articles:
+
+- [Manual Logout With Spring Security](https://www.baeldung.com/spring-security-manual-logout)
+- [How to Disable Spring Security Logout Redirects](https://www.baeldung.com/spring-security-disable-logout-redirects)
+- More articles: [[<-- prev]](/spring-security-modules/spring-security-web-login)

spring-security-modules/spring-security-web-login-2/pom.xml

@@ -3,11 +3,10 @@
     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">
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>spring-5-security</artifactId>
+    <artifactId>spring-security-web-login-2</artifactId>
     <version>0.0.1-SNAPSHOT</version>
-    <name>spring-5-security</name>
-    <packaging>jar</packaging>
-    <description>spring 5 security sample project</description>
+    <name>spring-security-web-login-2</name>
+    <packaging>jar</packaging>   
 
     <parent>
         <groupId>com.baeldung</groupId>
@@ -47,21 +46,6 @@
             <artifactId>spring-security-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.owasp.esapi</groupId>
-            <artifactId>esapi</artifactId>
-            <version>${esapi.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jsoup</groupId>
-            <artifactId>jsoup</artifactId>
-            <version>${jsoup.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>${commons-io.version}</version>
-        </dependency>
     </dependencies>
 
     <build>
@@ -69,16 +53,8 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <configuration>
-                    <mainClass>com.baeldung.passwordstorage.PasswordStorageApplication</mainClass>
-                    <layout>JAR</layout>
-                </configuration>
             </plugin>
         </plugins>
     </build>
 
-    <properties>
-        <jsoup.version>1.13.1</jsoup.version>
-    </properties>
-
 </project>

spring-security-modules/spring-security-web-login-2/src/main/resources/application.properties

@@ -2,6 +2,4 @@ server.port=8081
 
 logging.level.root=INFO
 
-logging.level.com.baeldung.dsl.ClientErrorLoggingFilter=DEBUG
-
 logging.level.org.springframework.security=DEBUG

spring-security-modules/spring-security-web-login/README.md

@@ -13,6 +13,7 @@ The "Learn Spring Security" Classes: http://github.learnspringsecurity.com
 - [Spring Security – Redirect to the Previous URL After Login](https://www.baeldung.com/spring-security-redirect-login)
 - [Spring Security Custom AuthenticationFailureHandler](https://www.baeldung.com/spring-security-custom-authentication-failure-handler)
 - [Extra Login Fields with Spring Security](https://www.baeldung.com/spring-security-extra-login-fields)
+- More articles: [[next -->]](/spring-security-modules/spring-security-web-login-2)
 
 ### Build the Project
 ```

spring-security-modules/spring-security-web-rest-basic-auth/README.md

@@ -11,3 +11,6 @@ The "Learn Spring Security" Classes: http://github.learnspringsecurity.com
 - [Basic Authentication with the RestTemplate](https://www.baeldung.com/how-to-use-resttemplate-with-basic-authentication-in-spring)
 - [A Custom Filter in the Spring Security Filter Chain](https://www.baeldung.com/spring-security-custom-filter)
 - [Spring Security Basic Authentication](https://www.baeldung.com/spring-security-basic-authentication)
+- [New Password Storage In Spring Security 5](https://www.baeldung.com/spring-security-5-password-storage)
+- [Default Password Encoder in Spring Security 5](https://www.baeldung.com/spring-security-5-default-password-encoder)
+