Skip to content

Commit 6550282

Browse files
committed
Split the JUnit 4 rule and JUnit 5 extension into separate Maven modules
1 parent 251e6db commit 6550282

File tree

49 files changed

+263
-157
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+263
-157
lines changed

embedded-ldap-core/pom.xml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
7+
<parent>
8+
<artifactId>embedded-ldap-parent</artifactId>
9+
<groupId>org.zapodot</groupId>
10+
<version>0.9-SNAPSHOT</version>
11+
</parent>
12+
13+
<artifactId>embedded-ldap-core</artifactId>
14+
15+
<dependencies>
16+
<dependency>
17+
<groupId>com.unboundid</groupId>
18+
<artifactId>unboundid-ldapsdk</artifactId>
19+
<version>${unboundid-ldapsdk.version}</version>
20+
</dependency>
21+
<dependency>
22+
<groupId>com.google.guava</groupId>
23+
<artifactId>guava</artifactId>
24+
<version>${guava.version}</version>
25+
</dependency>
26+
<dependency>
27+
<groupId>net.bytebuddy</groupId>
28+
<artifactId>byte-buddy</artifactId>
29+
<version>${byte-buddy.version}</version>
30+
</dependency>
31+
<dependency>
32+
<groupId>org.slf4j</groupId>
33+
<artifactId>slf4j-api</artifactId>
34+
<version>${slf4j.version}</version>
35+
</dependency>
36+
</dependencies>
37+
</project>

src/main/java/org/zapodot/junit/ldap/EmbeddedLdapServer.java renamed to embedded-ldap-core/src/main/java/org/zapodot/junit/ldap/EmbeddedLdapServer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public interface EmbeddedLdapServer {
5353
* </p>
5454
*
5555
* @return the port number that the embedded server is listening to
56-
* @see org.zapodot.junit.ldap.EmbeddedLdapRuleBuilder#bindingToAddress(String)
56+
* @see org.zapodot.junit.ldap.internal.AbstractEmbeddedLdapBuilder#bindingToAddress(String)
5757
*/
5858
int embeddedServerPort();
5959

src/main/java/org/zapodot/junit/ldap/internal/AbstractEmbeddedLdapBuilder.java renamed to embedded-ldap-core/src/main/java/org/zapodot/junit/ldap/internal/AbstractEmbeddedLdapBuilder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
import java.util.Objects;
2121

2222
/**
23-
* A builder providing a fluent way of defining {@link org.zapodot.junit.ldap.EmbeddedLdapRule}
24-
* or {@link org.zapodot.junit.ldap.junit5.EmbeddedLdapExtension} instances.
23+
* A builder providing a fluent way of defining EmbeddedLdapRule
24+
* or EmbeddedLdapExtension instances.
2525
*/
2626
public abstract class AbstractEmbeddedLdapBuilder<Self extends AbstractEmbeddedLdapBuilder<Self>> {
2727

src/main/java/org/zapodot/junit/ldap/internal/EmbeddedLdapServerImpl.java renamed to embedded-ldap-core/src/main/java/org/zapodot/junit/ldap/internal/EmbeddedLdapServerImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ abstract class EmbeddedLdapServerImpl implements EmbeddedLdapServer {
2828

2929
private static final String JAVA_RT_CONTEXT_FACTORY = "com.sun.jndi.ldap.LdapCtxFactory";
3030

31-
private static Logger logger = LoggerFactory.getLogger(EmbeddedLdapExtensionImpl.class);
31+
private static Logger logger = LoggerFactory.getLogger(EmbeddedLdapServerImpl.class);
3232
private final InMemoryDirectoryServer inMemoryDirectoryServer;
3333
private final AuthenticationConfiguration authenticationConfiguration;
3434
private LDAPConnection ldapConnection;

0 commit comments

Comments
 (0)