From 9177009ab64675aa896439e1b5d2fa72712ef3d4 Mon Sep 17 00:00:00 2001
From: vunamtien <vunamtien16@gmail.com>
Date: Tue, 23 Apr 2024 23:23:26 +0700
Subject: [PATCH] [JAVA-33634] Split-or-move-spring-security-core-2-module
 (#16447)

---
 spring-security-modules/pom.xml               |  1 +
 .../spring-security-core-2/README.md          |  3 -
 .../spring-security-core-3/README.md          | 10 +++
 .../spring-security-core-3/pom.xml            | 90 +++++++++++++++++++
 .../authorizationmanager/DemoController.java  |  0
 .../DemoSecurityConfig.java                   |  0
 ...ingSecurityAuthManagerDemoApplication.java |  0
 .../dsl/ClientErrorLoggingConfigurer.java     |  0
 .../dsl/ClientErrorLoggingFilter.java         |  0
 .../dsl/CustomConfigurerApplication.java      |  0
 .../java/com/baeldung/dsl/MyController.java   |  0
 .../java/com/baeldung/dsl/SecurityConfig.java |  0
 .../java/com/baeldung/xss/Application.java    |  0
 .../java/com/baeldung/xss/SecurityConf.java   |  0
 .../src/main/resources/application.properties |  0
 .../com/baeldung/dsl}/SpringContextTest.java  |  2 +-
 16 files changed, 102 insertions(+), 4 deletions(-)
 create mode 100644 spring-security-modules/spring-security-core-3/README.md
 create mode 100644 spring-security-modules/spring-security-core-3/pom.xml
 rename spring-security-modules/{spring-security-core-2 => spring-security-core-3}/src/main/java/com/baeldung/authorizationmanager/DemoController.java (100%)
 rename spring-security-modules/{spring-security-core-2 => spring-security-core-3}/src/main/java/com/baeldung/authorizationmanager/DemoSecurityConfig.java (100%)
 rename spring-security-modules/{spring-security-core-2 => spring-security-core-3}/src/main/java/com/baeldung/authorizationmanager/SpringSecurityAuthManagerDemoApplication.java (100%)
 rename spring-security-modules/{spring-security-core-2 => spring-security-core-3}/src/main/java/com/baeldung/dsl/ClientErrorLoggingConfigurer.java (100%)
 rename spring-security-modules/{spring-security-core-2 => spring-security-core-3}/src/main/java/com/baeldung/dsl/ClientErrorLoggingFilter.java (100%)
 rename spring-security-modules/{spring-security-core-2 => spring-security-core-3}/src/main/java/com/baeldung/dsl/CustomConfigurerApplication.java (100%)
 rename spring-security-modules/{spring-security-core-2 => spring-security-core-3}/src/main/java/com/baeldung/dsl/MyController.java (100%)
 rename spring-security-modules/{spring-security-core-2 => spring-security-core-3}/src/main/java/com/baeldung/dsl/SecurityConfig.java (100%)
 rename spring-security-modules/{spring-security-core-2 => spring-security-core-3}/src/main/java/com/baeldung/xss/Application.java (100%)
 rename spring-security-modules/{spring-security-core-2 => spring-security-core-3}/src/main/java/com/baeldung/xss/SecurityConf.java (100%)
 create mode 100644 spring-security-modules/spring-security-core-3/src/main/resources/application.properties
 rename spring-security-modules/{spring-security-core-2/src/test/java/com/baeldung => spring-security-core-3/src/test/java/com/baeldung/dsl}/SpringContextTest.java (94%)

diff --git a/spring-security-modules/pom.xml b/spring-security-modules/pom.xml
index d2f4a81ae6..048d67fa56 100644
--- a/spring-security-modules/pom.xml
+++ b/spring-security-modules/pom.xml
@@ -21,6 +21,7 @@
         <module>spring-security-cognito</module>
         <module>spring-security-core</module>
         <module>spring-security-core-2</module>
+        <module>spring-security-core-3</module>
         <!--        <module>spring-security-ldap</module>-->
         <module>spring-security-legacy-oidc</module> <!-- Ths module wasn't able to upgrade because is using Spring Security oauth2 which reached end of life. JAVA-29292-->
         <module>spring-security-oauth2</module> <!-- This module wasn't updated to spring boot 3 because of spring-oauth2 not supporting Jakarta and reaching end of life. JAVA-29293 -->
diff --git a/spring-security-modules/spring-security-core-2/README.md b/spring-security-modules/spring-security-core-2/README.md
index 77b72fce95..dca79e7395 100644
--- a/spring-security-modules/spring-security-core-2/README.md
+++ b/spring-security-modules/spring-security-core-2/README.md
@@ -5,11 +5,8 @@ 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)
 - [HttpSecurity vs. WebSecurity in Spring Security](https://www.baeldung.com/spring-security-httpsecurity-vs-websecurity)
-- [Spring Security AuthorizationManager](https://www.baeldung.com/spring-security-authorizationmanager)
 - [Migrate Application from Spring Security 5 to Spring Security 6/Spring Boot 3](https://www.baeldung.com/spring-security-migrate-5-to-6)
 - [Creating a Spring Security Key for Signing a JWT Token](https://www.baeldung.com/spring-security-sign-jwt-token)
  
diff --git a/spring-security-modules/spring-security-core-3/README.md b/spring-security-modules/spring-security-core-3/README.md
new file mode 100644
index 0000000000..6aa9ca7561
--- /dev/null
+++ b/spring-security-modules/spring-security-core-3/README.md
@@ -0,0 +1,10 @@
+## Spring Security Core
+
+This module contains articles about core Spring Security
+
+### Relevant Articles:
+- [Prevent Cross-Site Scripting (XSS) in a Spring Application](https://www.baeldung.com/spring-prevent-xss)
+- [A Custom Spring SecurityConfigurer](https://www.baeldung.com/spring-security-custom-configurer)
+- [Spring Security AuthorizationManager](https://www.baeldung.com/spring-security-authorizationmanager)
+
+More articles: [[<-- prev]](/spring-security-modules/spring-security-core-2) 
diff --git a/spring-security-modules/spring-security-core-3/pom.xml b/spring-security-modules/spring-security-core-3/pom.xml
new file mode 100644
index 0000000000..bfdec2eb3f
--- /dev/null
+++ b/spring-security-modules/spring-security-core-3/pom.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    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-security-core-3</artifactId>
+    <version>0.1-SNAPSHOT</version>
+    <name>spring-security-core-3</name>
+    <packaging>war</packaging>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-boot-3</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../../parent-boot-3</relativePath>
+    </parent>
+
+    <properties>
+        <start-class>com.baeldung.Application</start-class>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-test</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-core</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>spring-security-core-3</finalName>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>live</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <phase>integration-test</phase>
+                                <goals>
+                                    <goal>test</goal>
+                                </goals>
+                                <configuration>
+                                    <excludes>
+                                        <exclude>none</exclude>
+                                    </excludes>
+                                    <includes>
+                                        <include>**/*LiveTest.java</include>
+                                    </includes>
+                                    <systemPropertyVariables>
+                                        <webTarget>cargo</webTarget>
+                                    </systemPropertyVariables>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+</project>
diff --git a/spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/authorizationmanager/DemoController.java b/spring-security-modules/spring-security-core-3/src/main/java/com/baeldung/authorizationmanager/DemoController.java
similarity index 100%
rename from spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/authorizationmanager/DemoController.java
rename to spring-security-modules/spring-security-core-3/src/main/java/com/baeldung/authorizationmanager/DemoController.java
diff --git a/spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/authorizationmanager/DemoSecurityConfig.java b/spring-security-modules/spring-security-core-3/src/main/java/com/baeldung/authorizationmanager/DemoSecurityConfig.java
similarity index 100%
rename from spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/authorizationmanager/DemoSecurityConfig.java
rename to spring-security-modules/spring-security-core-3/src/main/java/com/baeldung/authorizationmanager/DemoSecurityConfig.java
diff --git a/spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/authorizationmanager/SpringSecurityAuthManagerDemoApplication.java b/spring-security-modules/spring-security-core-3/src/main/java/com/baeldung/authorizationmanager/SpringSecurityAuthManagerDemoApplication.java
similarity index 100%
rename from spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/authorizationmanager/SpringSecurityAuthManagerDemoApplication.java
rename to spring-security-modules/spring-security-core-3/src/main/java/com/baeldung/authorizationmanager/SpringSecurityAuthManagerDemoApplication.java
diff --git a/spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/dsl/ClientErrorLoggingConfigurer.java b/spring-security-modules/spring-security-core-3/src/main/java/com/baeldung/dsl/ClientErrorLoggingConfigurer.java
similarity index 100%
rename from spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/dsl/ClientErrorLoggingConfigurer.java
rename to spring-security-modules/spring-security-core-3/src/main/java/com/baeldung/dsl/ClientErrorLoggingConfigurer.java
diff --git a/spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/dsl/ClientErrorLoggingFilter.java b/spring-security-modules/spring-security-core-3/src/main/java/com/baeldung/dsl/ClientErrorLoggingFilter.java
similarity index 100%
rename from spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/dsl/ClientErrorLoggingFilter.java
rename to spring-security-modules/spring-security-core-3/src/main/java/com/baeldung/dsl/ClientErrorLoggingFilter.java
diff --git a/spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/dsl/CustomConfigurerApplication.java b/spring-security-modules/spring-security-core-3/src/main/java/com/baeldung/dsl/CustomConfigurerApplication.java
similarity index 100%
rename from spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/dsl/CustomConfigurerApplication.java
rename to spring-security-modules/spring-security-core-3/src/main/java/com/baeldung/dsl/CustomConfigurerApplication.java
diff --git a/spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/dsl/MyController.java b/spring-security-modules/spring-security-core-3/src/main/java/com/baeldung/dsl/MyController.java
similarity index 100%
rename from spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/dsl/MyController.java
rename to spring-security-modules/spring-security-core-3/src/main/java/com/baeldung/dsl/MyController.java
diff --git a/spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/dsl/SecurityConfig.java b/spring-security-modules/spring-security-core-3/src/main/java/com/baeldung/dsl/SecurityConfig.java
similarity index 100%
rename from spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/dsl/SecurityConfig.java
rename to spring-security-modules/spring-security-core-3/src/main/java/com/baeldung/dsl/SecurityConfig.java
diff --git a/spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/xss/Application.java b/spring-security-modules/spring-security-core-3/src/main/java/com/baeldung/xss/Application.java
similarity index 100%
rename from spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/xss/Application.java
rename to spring-security-modules/spring-security-core-3/src/main/java/com/baeldung/xss/Application.java
diff --git a/spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/xss/SecurityConf.java b/spring-security-modules/spring-security-core-3/src/main/java/com/baeldung/xss/SecurityConf.java
similarity index 100%
rename from spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/xss/SecurityConf.java
rename to spring-security-modules/spring-security-core-3/src/main/java/com/baeldung/xss/SecurityConf.java
diff --git a/spring-security-modules/spring-security-core-3/src/main/resources/application.properties b/spring-security-modules/spring-security-core-3/src/main/resources/application.properties
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/spring-security-modules/spring-security-core-2/src/test/java/com/baeldung/SpringContextTest.java b/spring-security-modules/spring-security-core-3/src/test/java/com/baeldung/dsl/SpringContextTest.java
similarity index 94%
rename from spring-security-modules/spring-security-core-2/src/test/java/com/baeldung/SpringContextTest.java
rename to spring-security-modules/spring-security-core-3/src/test/java/com/baeldung/dsl/SpringContextTest.java
index dc1dbf34f3..f139be5b9c 100644
--- a/spring-security-modules/spring-security-core-2/src/test/java/com/baeldung/SpringContextTest.java
+++ b/spring-security-modules/spring-security-core-3/src/test/java/com/baeldung/dsl/SpringContextTest.java
@@ -1,4 +1,4 @@
-package com.baeldung;
+package com.baeldung.dsl;
 
 
 import org.junit.Test;