Merge pull request #12429 from freelansam/JAVA-12732

JAVA-12732: Rename modules to match the spring-security-* pattern

spring-security-modules/pom.xml

@@ -15,20 +15,20 @@
     </parent>
 
     <modules>
-        <module>spring-5-security</module>
+        <module>spring-5-security</module>        
-        <module>spring-5-security-cognito</module>
-        <module>spring-5-security-oauth</module>
-        <module>spring-ldap</module>
         <module>spring-security-acl</module>
         <module>spring-security-auth0</module>
+        <module>spring-security-cognito</module>
         <module>spring-security-core</module>
         <module>spring-security-core-2</module>
         <module>spring-security-ldap</module>
         <module>spring-security-legacy-oidc</module>
+        <module>spring-security-oauth2</module>
         <module>spring-security-oauth2-sso</module>
         <module>spring-security-oidc</module>
         <module>spring-security-okta</module>
         <module>spring-security-saml</module>
+        <module>spring-security-social-login</module>
         <module>spring-security-web-angular</module>
         <module>spring-security-web-boot-1</module>
         <module>spring-security-web-boot-2</module>
@@ -45,7 +45,6 @@
         <module>spring-security-web-sockets</module>
         <module>spring-security-web-thymeleaf</module>
         <module>spring-security-web-x509</module>        
-        <module>spring-social-login</module>
         <module>spring-security-opa</module>
     </modules>
 

spring-security-modules/spring-ldap/.gitignore

@@ -1,13 +0,0 @@
-*.class
-
-#folders#
-/target
-/neoDb*
-/data
-/src/main/webapp/WEB-INF/classes
-*/META-INF/*
-
-# Packaged files #
-*.jar
-*.war
-*.ear

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

@@ -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)

spring-security-modules/spring-ldap/pom.xml

@@ -1,141 +0,0 @@
-<?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-ldap</artifactId>
-    <version>0.1-SNAPSHOT</version>
-    <name>spring-ldap</name>
-    <packaging>jar</packaging>
-
-    <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>spring-security-modules</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-    </parent>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.ldap</groupId>
-            <artifactId>spring-ldap-core</artifactId>
-            <version>${spring-ldap.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-            <version>${spring-context.version}</version>
-        </dependency>
-        <!-- spring ldap test -->
-        <dependency>
-            <groupId>org.springframework.ldap</groupId>
-            <artifactId>spring-ldap-test</artifactId>
-            <version>${spring-ldap.version}</version>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <artifactId>commons-logging</artifactId>
-                    <groupId>commons-logging</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <!-- apacheds for test -->
-        <dependency>
-            <groupId>org.apache.directory.server</groupId>
-            <artifactId>apacheds-core</artifactId>
-            <version>${apacheds.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.directory.server</groupId>
-            <artifactId>apacheds-core-entry</artifactId>
-            <version>${apacheds.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.directory.server</groupId>
-            <artifactId>apacheds-protocol-shared</artifactId>
-            <version>${apacheds.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.directory.server</groupId>
-            <artifactId>apacheds-protocol-ldap</artifactId>
-            <version>${apacheds.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.directory.server</groupId>
-            <artifactId>apacheds-server-jndi</artifactId>
-            <version>${apacheds.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.directory.shared</groupId>
-            <artifactId>shared-ldap</artifactId>
-            <version>${shared-ldap.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <!-- Spring Data LDAP -->
-        <dependency>
-            <groupId>org.springframework.data</groupId>
-            <artifactId>spring-data-ldap</artifactId>
-            <version>${spring-data-ldap.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.data</groupId>
-            <artifactId>spring-data-jpa</artifactId>
-            <version>${spring-data-jpa.version}</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <finalName>spring-ldap</finalName>
-    </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>**/*IntegrationTest.java</exclude>
-                                        <exclude>**/*IntTest.java</exclude>
-                                    </excludes>
-                                    <includes>
-                                        <include>**/*LiveTest.java</include>
-                                    </includes>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-    <properties>
-        <spring-ldap.version>2.3.1.RELEASE</spring-ldap.version>
-        <spring-context.version>4.3.6.RELEASE</spring-context.version>
-        <apacheds.version>1.5.5</apacheds.version>
-        <shared-ldap.version>0.9.15</shared-ldap.version>
-        <spring-data-ldap.version>1.0.6.RELEASE</spring-data-ldap.version>
-        <spring-data-jpa.version>1.11.6.RELEASE</spring-data-jpa.version>
-    </properties>
-
-</project>

spring-security-modules/spring-ldap/src/main/resources/application.properties

@@ -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

spring-security-modules/spring-ldap/src/main/resources/logback.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
-            </pattern>
-        </encoder>
-    </appender>
-
-    <logger name="org.springframework" level="WARN"/>
-    <logger name="org.springframework.transaction" level="WARN"/>
-
-    <!-- in order to debug some marshalling issues, this needs to be TRACE -->
-    <logger name="org.springframework.web.servlet.mvc" level="WARN"/>
-
-    <root level="INFO">
-        <appender-ref ref="STDOUT"/>
-    </root>
-</configuration>

spring-security-modules/spring-ldap/src/test/java/org/baeldung/SpringContextTest.java

@@ -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() {
-    }
-}

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">
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>spring-5-security-cognito</artifactId>
+    <artifactId>spring-security-cognito</artifactId>
     <version>0.0.1-SNAPSHOT</version>
-    <name>spring-5-security-cognito</name>
+    <name>spring-security-cognito</name>
     <packaging>jar</packaging>
     <description>spring 5 security oauth cognito sample project</description>
 

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

@@ -8,8 +8,9 @@ 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)
+- [Spring LDAP Overview](https://www.baeldung.com/spring-ldap)
+- [Guide to Spring Data LDAP](https://www.baeldung.com/spring-data-ldap)
 
 ### Notes
 

spring-security-modules/spring-security-ldap/pom.xml

@@ -44,6 +44,27 @@
             <artifactId>apacheds-server-jndi</artifactId>
             <version>${apacheds.version}</version>
         </dependency>
+         <!-- Spring Data LDAP -->
+        <dependency>
+            <groupId>org.springframework.data</groupId>
+            <artifactId>spring-data-ldap</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.data</groupId>
+            <artifactId>spring-data-jpa</artifactId>
+        </dependency>
+        <!-- spring ldap test -->
+        <dependency>
+            <groupId>org.springframework.ldap</groupId>
+            <artifactId>spring-ldap-test</artifactId>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <artifactId>commons-logging</artifactId>
+                    <groupId>commons-logging</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>

spring-security-modules/spring-security-ldap/src/main/resources/application.properties

@@ -1 +1,8 @@
-management.health.ldap.enabled=false
+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

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">
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>spring-5-security-oauth</artifactId>
+    <artifactId>spring-5-oauth2</artifactId>
     <version>0.0.1-SNAPSHOT</version>
-    <name>spring-5-security-oauth</name>
+    <name>spring-security-oauth2</name>
     <packaging>jar</packaging>
     <description>spring 5 security oauth sample project</description>
 

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">
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>spring-social-login</artifactId>
+    <artifactId>spring-security-social-login</artifactId>
-    <name>spring-social-login</name>
+    <name>spring-security-social-login</name>
     <packaging>war</packaging>
 
     <parent>
@@ -66,7 +66,7 @@
     </dependencies>
 
     <build>
-        <finalName>spring-social-login</finalName>
+        <finalName>spring-security-social-login</finalName>
         <resources>
             <resource>
                 <directory>src/main/resources</directory>

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