From 38c19dc435a875e3cd98f17422f1441559632d28 Mon Sep 17 00:00:00 2001
From: Guillaume Nodet <gnodet@gmail.com>
Date: Thu, 25 Jul 2024 12:48:11 +0200
Subject: [PATCH] Fix ldap

---
 pom.xml           | 10 ++++++++++
 sshd-ldap/pom.xml | 25 ++++++++-----------------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7e34e4233..c4a630240 100644
--- a/pom.xml
+++ b/pom.xml
@@ -174,6 +174,7 @@
                 </plugins>
             </build>
         </profile>
+
         <profile>
             <id>jdk8</id>
             <properties>
@@ -204,6 +205,15 @@
             </plugins>
             </build>
         </profile>
+        <profile>
+            <id>jdk11</id>
+        </profile>
+        <profile>
+            <id>jdk17</id>
+        </profile>
+        <profile>
+            <id>jdk21</id>
+        </profile>
 
         <profile>
             <id>ci</id>
diff --git a/sshd-ldap/pom.xml b/sshd-ldap/pom.xml
index 38609217f..441a42ff9 100644
--- a/sshd-ldap/pom.xml
+++ b/sshd-ldap/pom.xml
@@ -33,6 +33,7 @@
     <properties>
         <projectRoot>${project.basedir}/..</projectRoot>
         <apacheds.version>2.0.0.AM26</apacheds.version>
+        <surefire.argLine>--add-opens=java.base/sun.security.util=ALL-UNNAMED --add-opens=java.base/sun.security.x509=ALL-UNNAMED</surefire.argLine>
     </properties>
 
     <dependencyManagement>
@@ -127,6 +128,9 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
                     <redirectTestOutputToFile>true</redirectTestOutputToFile>
+                    <useModulePath>false</useModulePath>
+                    <!-- See https://issues.apache.org/jira/browse/DIRSTUDIO-1277 -->
+                    <argLine>${surefire.argLine}</argLine>
                 </configuration>
             </plugin>
             <plugin>
@@ -141,23 +145,10 @@
     
     <profiles>
         <profile>
-            <id>test-on-java16+</id>
-            <activation>
-                <jdk>[16,)</jdk>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <useModulePath>false</useModulePath>
-                            <!-- See https://issues.apache.org/jira/browse/DIRSTUDIO-1277 -->
-                            <argLine>--add-opens=java.base/sun.security.util=ALL-UNNAMED --add-opens=java.base/sun.security.x509=ALL-UNNAMED</argLine>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
+            <id>jdk8</id>
+            <properties>
+                <surefire.argLine />
+            </properties>
         </profile>
     </profiles>
 </project>