JAVA-12732: move spring-ldap into spring-security-ldap
This commit is contained in:
sampadawagde
parent
acb9cc97cd
commit
6ae4a1aaf7
|
|
@ -16,7 +16,6 @@
|
||||||
|
|
||||||
<modules>
|
<modules>
|
||||||
<module>spring-5-security</module>
|
<module>spring-5-security</module>
|
||||||
<module>spring-ldap</module>
|
|
||||||
<module>spring-security-acl</module>
|
<module>spring-security-acl</module>
|
||||||
<module>spring-security-auth0</module>
|
<module>spring-security-auth0</module>
|
||||||
<module>spring-security-cognito</module>
|
<module>spring-security-cognito</module>
|
||||||
|
|
|
||||||
|
|
@ -1,13 +0,0 @@
|
||||||
*.class
|
|
||||||
|
|
||||||
#folders#
|
|
||||||
/target
|
|
||||||
/neoDb*
|
|
||||||
/data
|
|
||||||
/src/main/webapp/WEB-INF/classes
|
|
||||||
*/META-INF/*
|
|
||||||
|
|
||||||
# Packaged files #
|
|
||||||
*.jar
|
|
||||||
*.war
|
|
||||||
*.ear
|
|
||||||
|
|
@ -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)
|
|
||||||
|
|
@ -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>
|
|
||||||
|
|
@ -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
|
|
||||||
|
|
@ -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>
|
|
||||||
|
|
@ -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() {
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -9,6 +9,8 @@ The "Learn Spring Security" Classes: http://github.learnspringsecurity.com
|
||||||
### Relevant Article:
|
### Relevant Article:
|
||||||
|
|
||||||
- [Intro to Spring Security LDAP](https://www.baeldung.com/spring-security-ldap)
|
- [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
|
### Notes
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -44,6 +44,27 @@
|
||||||
<artifactId>apacheds-server-jndi</artifactId>
|
<artifactId>apacheds-server-jndi</artifactId>
|
||||||
<version>${apacheds.version}</version>
|
<version>${apacheds.version}</version>
|
||||||
</dependency>
|
</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>
|
</dependencies>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
|
|
|
||||||
|
|
@ -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
|
||||||
Loading…
Reference in New Issue