Merge branch 'master' of https://gitbox.apache.org/repos/asf/directory-server
diff --git a/Jenkinsfile b/Jenkinsfile
index c839e5f..c0662c7 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -34,7 +34,7 @@
}
agent {
docker {
- label 'ubuntu'
+ label 'ubuntu && !H28 && !H36 && !H40'
image 'apachedirectory/maven-build:jdk-8'
args '-v $HOME/.m2:/home/hnelson/.m2'
}
@@ -57,7 +57,7 @@
}
agent {
docker {
- label 'ubuntu'
+ label 'ubuntu && !H28 && !H36 && !H40'
image 'apachedirectory/maven-build:jdk-8'
args '-v $HOME/.m2:/home/hnelson/.m2'
}
@@ -81,7 +81,7 @@
}
agent {
docker {
- label 'ubuntu'
+ label 'ubuntu && !H28 && !H36 && !H40'
image 'apachedirectory/maven-build:jdk-11'
args '-v $HOME/.m2:/home/hnelson/.m2'
}
@@ -103,7 +103,7 @@
}
agent {
docker {
- label 'ubuntu'
+ label 'ubuntu && !H28 && !H36 && !H40'
image 'apachedirectory/maven-build:jdk-12'
args '-v $HOME/.m2:/home/hnelson/.m2'
}
@@ -149,7 +149,7 @@
retry(2)
}
agent {
- label 'ubuntu'
+ label 'ubuntu && !H28 && !H36 && !H40'
}
// https://cwiki.apache.org/confluence/display/INFRA/JDK+Installation+Matrix
// https://cwiki.apache.org/confluence/display/INFRA/Maven+Installation+Matrix
@@ -173,7 +173,7 @@
}
agent {
docker {
- label 'ubuntu'
+ label 'ubuntu && !H28 && !H36 && !H40'
image 'apachedirectory/maven-build:jdk-8'
args '-v $HOME/.m2:/home/hnelson/.m2'
alwaysPull true
@@ -201,7 +201,7 @@
retry(2)
}
agent {
- label 'ubuntu'
+ label 'ubuntu && !H28 && !H36 && !H40'
}
steps {
unstash 'deb'
@@ -219,7 +219,7 @@
retry(2)
}
agent {
- label 'ubuntu'
+ label 'ubuntu && !H28 && !H36 && !H40'
}
steps {
unstash 'rpm'
@@ -237,7 +237,7 @@
retry(2)
}
agent {
- label 'ubuntu'
+ label 'ubuntu && !H28 && !H36 && !H40'
}
steps {
unstash 'bin'
@@ -255,7 +255,7 @@
retry(2)
}
agent {
- label 'ubuntu'
+ label 'ubuntu && !H28 && !H36 && !H40'
}
steps {
unstash 'archive'
diff --git a/server-integ/src/test/java/org/apache/directory/server/replication/ClientInitialRefreshIT.java b/server-integ/src/test/java/org/apache/directory/server/replication/ClientInitialRefreshIT.java
index b9a6d39..3f3e70e 100644
--- a/server-integ/src/test/java/org/apache/directory/server/replication/ClientInitialRefreshIT.java
+++ b/server-integ/src/test/java/org/apache/directory/server/replication/ClientInitialRefreshIT.java
@@ -142,7 +142,7 @@
}
- @CreateDS(allowAnonAccess = true, name = "provider-replication", partitions =
+ @CreateDS(allowAnonAccess = true, name = "ClientInitialRefreshIT-provider-replication", partitions =
{
@CreatePartition(
name = "example",
@@ -159,7 +159,7 @@
"dc: example"))
})
@CreateLdapServer(transports =
- { @CreateTransport(port = 16000, protocol = "LDAP") })
+ { @CreateTransport(port = -1, protocol = "LDAP") })
public static void startProvider() throws Exception
{
DirectoryService provDirService = DSAnnotationProcessor.getDirectoryService();
@@ -237,7 +237,7 @@
final MockSyncReplConsumer syncreplClient = new MockSyncReplConsumer();
final SyncReplConfiguration config = new SyncReplConfiguration();
config.setRemoteHost( Network.LOOPBACK_HOSTNAME );
- config.setRemotePort( 16000 );
+ config.setRemotePort( providerServer.getPort() );
config.setReplUserDn( "uid=admin,ou=system" );
config.setReplUserPassword( Strings.getBytesUtf8( "secret" ) );
config.setUseTls( false );
diff --git a/server-integ/src/test/java/org/apache/directory/server/replication/ClientServerReplicationIT.java b/server-integ/src/test/java/org/apache/directory/server/replication/ClientServerReplicationIT.java
index ebec5bb..f23a9da 100644
--- a/server-integ/src/test/java/org/apache/directory/server/replication/ClientServerReplicationIT.java
+++ b/server-integ/src/test/java/org/apache/directory/server/replication/ClientServerReplicationIT.java
@@ -538,7 +538,7 @@
@CreateDS(
allowAnonAccess = true,
- name = "provider-replication",
+ name = "ClientServerReplicationIT-provider-replication",
enableChangeLog = false,
partitions =
{
@@ -600,7 +600,7 @@
@CreateDS(
allowAnonAccess = true,
enableChangeLog = false,
- name = "consumer-replication",
+ name = "ClientServerReplicationIT-consumer-replication",
partitions =
{
@CreatePartition(
diff --git a/server-integ/src/test/java/org/apache/directory/server/replication/StaleEventLogDetectionIT.java b/server-integ/src/test/java/org/apache/directory/server/replication/StaleEventLogDetectionIT.java
index 0139e61..3dee37f 100644
--- a/server-integ/src/test/java/org/apache/directory/server/replication/StaleEventLogDetectionIT.java
+++ b/server-integ/src/test/java/org/apache/directory/server/replication/StaleEventLogDetectionIT.java
@@ -148,7 +148,7 @@
}
- @CreateDS(allowAnonAccess = true, name = "provider-replication", partitions =
+ @CreateDS(allowAnonAccess = true, name = "StaleEventLogDetectionIT-provider-replication", partitions =
{
@CreatePartition(
name = "example",
@@ -165,7 +165,7 @@
"dc: example"))
})
@CreateLdapServer(transports =
- { @CreateTransport(port = 16000, protocol = "LDAP") })
+ { @CreateTransport(port = -1, protocol = "LDAP") })
public static void startProvider() throws Exception
{
DirectoryService provDirService = DSAnnotationProcessor.getDirectoryService();
@@ -244,7 +244,7 @@
final ReplicationConsumer syncreplClient = new MockSyncReplConsumer();
final SyncReplConfiguration config = new SyncReplConfiguration();
config.setRemoteHost( Network.LOOPBACK_HOSTNAME );
- config.setRemotePort( 16000 );
+ config.setRemotePort( providerServer.getPort() );
config.setReplUserDn( "uid=admin,ou=system" );
config.setReplUserPassword( Strings.getBytesUtf8( "secret" ) );
config.setUseTls( false );
diff --git a/server-integ/src/test/java/org/apache/directory/server/schema/MavibotSchemaIT.java b/server-integ/src/test/java/org/apache/directory/server/schema/MavibotSchemaIT.java
index ba2949c..1f70ecc 100644
--- a/server-integ/src/test/java/org/apache/directory/server/schema/MavibotSchemaIT.java
+++ b/server-integ/src/test/java/org/apache/directory/server/schema/MavibotSchemaIT.java
@@ -94,7 +94,7 @@
},
enableChangeLog = false)
@CreateLdapServer(transports =
- { @CreateTransport(port = 10389, protocol = "LDAP") })
+ { @CreateTransport(port = -1, protocol = "LDAP") })
public class MavibotSchemaIT extends AbstractLdapTestUnit
{
private static final String SUBSCHEMA_SUBENTRY = "subschemaSubentry";