From 923a8e86b9891446d070c210d17fac78ea9ac922 Mon Sep 17 00:00:00 2001
From: Valery Kharseko <vharseko@3a-systems.ru>
Date: Tue, 15 Oct 2024 11:13:04 +0000
Subject: [PATCH] [#426] ADD maven.compiler.release=8 for cross compile compatibility (#430)
---
.github/workflows/build.yml | 15 +++++++++++++--
pom.xml | 19 +++++++++++++------
opendj-core/pom.xml | 15 +++++++++++++++
3 files changed, 41 insertions(+), 8 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7bb57a0..ddb9d5c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -65,16 +65,22 @@
opendj-server-legacy/target/package/opendj/bin/ldapsearch --hostname localhost --port 1636 --bindDN "cn=Directory Manager" --bindPassword password --useSsl --trustAll --baseDN "dc=example,dc=com" --searchScope base "(objectClass=*)" 1.1
opendj-server-legacy/target/package/opendj/bin/ldapsearch --hostname localhost --port 1636 --bindDN "cn=Directory Manager" --bindPassword password --useSsl --trustAll --baseDN "ou=people,dc=example,dc=com" --searchScope sub "(uid=user.*)" dn | grep ^dn: | wc -l | grep -q 5000
opendj-server-legacy/target/package/opendj/bin/stop-ds
- - name: Test LDAP in Cassandra
+ opendj-server-legacy/target/package/opendj/bin/makeldif -o /tmp/test.ldif opendj-server-legacy/target/package/opendj/config/MakeLDIF/example.template
+ opendj-server-legacy/target/package/opendj/bin/import-ldif --offline --ldifFile /tmp/test.ldif --backendID=userRoot
+ opendj-server-legacy/target/package/opendj/bin/start-ds
+ opendj-server-legacy/target/package/opendj/bin/ldapsearch --hostname localhost --port 1636 --bindDN "cn=Directory Manager" --bindPassword password --useSsl --trustAll --baseDN "ou=people,dc=example,dc=com" --searchScope sub "(uid=user.*)" dn | grep ^dn: | wc -l | grep -q 10000
+ opendj-server-legacy/target/package/opendj/bin/stop-ds
+ rm -rf opendj-server-legacy/target/package/opendj/config opendj-server-legacy/target/package/opendj/db opendj-server-legacy/target/package/opendj/changelogDb opendj-server-legacy/target/package/opendj/logs
+ - name: Test LDAP in Cassandra
if: runner.os == 'Linux'
run: |
- rm -rf opendj-server-legacy/target/package/opendj/config opendj-server-legacy/target/package/opendj/db opendj-server-legacy/target/package/opendj/changelogDb opendj-server-legacy/target/package/opendj/logs
export OPENDJ_JAVA_ARGS="-server -Xmx512m -Ddatastax-java-driver.basic.contact-points.0=localhost:9042 -Ddatastax-java-driver.basic.load-balancing-policy.local-datacenter=datacenter1"
opendj-server-legacy/target/package/opendj/setup --backendType cas -h localhost -p 1389 --ldapsPort 1636 --adminConnectorPort 4444 --enableStartTLS --generateSelfSignedCertificate --rootUserDN "cn=Directory Manager" --rootUserPassword password --baseDN dc=example,dc=com --sampleData 5000 --cli --acceptLicense --no-prompt
opendj-server-legacy/target/package/opendj/bin/status --bindDN "cn=Directory Manager" --bindPassword password
opendj-server-legacy/target/package/opendj/bin/ldapsearch --hostname localhost --port 1636 --bindDN "cn=Directory Manager" --bindPassword password --useSsl --trustAll --baseDN "dc=example,dc=com" --searchScope base "(objectClass=*)" 1.1
opendj-server-legacy/target/package/opendj/bin/ldapsearch --hostname localhost --port 1636 --bindDN "cn=Directory Manager" --bindPassword password --useSsl --trustAll --baseDN "ou=people,dc=example,dc=com" --searchScope sub "(uid=user.*)" dn | grep ^dn: | wc -l | grep -q 5000
opendj-server-legacy/target/package/opendj/bin/stop-ds
+ rm -rf opendj-server-legacy/target/package/opendj/config opendj-server-legacy/target/package/opendj/db opendj-server-legacy/target/package/opendj/changelogDb opendj-server-legacy/target/package/opendj/logs
- name: Test on Windows
if: runner.os == 'Windows'
run: |
@@ -84,6 +90,11 @@
opendj-server-legacy\target\package\opendj\bat\ldapsearch.bat --hostname localhost --port 1636 --bindDN "cn=Directory Manager" --bindPassword password --useSsl --trustAll --baseDN "dc=example,dc=com" --searchScope base "(objectClass=*)" 1.1
opendj-server-legacy\target\package\opendj\bat\ldapsearch.bat --hostname localhost --port 1636 --bindDN "cn=Directory Manager" --bindPassword password --useSsl --trustAll --baseDN "dc=example,dc=com" --searchScope sub "(uid=user.*)" dn | find /c '"dn:"' | findstr "5000"
opendj-server-legacy\target\package\opendj\bat\stop-ds.bat
+ opendj-server-legacy\target\package\opendj\bat\makeldif.bat -o test.ldif opendj-server-legacy\target\package\opendj\config\MakeLDIF\example.template
+ opendj-server-legacy\target\package\opendj\bat\import-ldif.bat --offline --ldifFile test.ldif --backendID=userRoot
+ opendj-server-legacy\target\package\opendj\bat\start-ds.bat
+ opendj-server-legacy\target\package\opendj\bat\ldapsearch.bat --hostname localhost --port 1636 --bindDN "cn=Directory Manager" --bindPassword password --useSsl --trustAll --baseDN "dc=example,dc=com" --searchScope sub "(uid=user.*)" dn | find /c '"dn:"' | findstr "10000"
+ opendj-server-legacy\target\package\opendj\bat\stop-ds.bat
- name: Upload artifacts OpenDJ Server
uses: actions/upload-artifact@v4
with:
diff --git a/opendj-core/pom.xml b/opendj-core/pom.xml
index fb677ee..925c9fb 100644
--- a/opendj-core/pom.xml
+++ b/opendj-core/pom.xml
@@ -216,6 +216,21 @@
<profiles>
<profile>
+ <id>set-compiler-release</id>
+ <activation>
+ <jdk>[9,)</jdk>
+ </activation>
+ <properties>
+ <maven.compiler.release>8</maven.compiler.release>
+ <!--
+ -release 8 dont allow hidden packages
+ package sun.security.tools.keytool does not exist
+ package sun.security.x509 does not exist
+ -->
+ <maven.compiler.testRelease></maven.compiler.testRelease>
+ </properties>
+ </profile>
+ <profile>
<!-- This profile provides API/ABI compatiblity checks and reports via Clirr -->
<id>clirr</id>
<activation>
diff --git a/pom.xml b/pom.xml
index d57e8b5..5f7a75d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,8 +39,8 @@
<freemarker.version>2.3.31</freemarker.version>
<grizzly-framework.version>2.3.35</grizzly-framework.version>
<metrics-core.version>3.1.2</metrics-core.version>
- <maven.compiler.target>1.8</maven.compiler.target>
- <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>8</maven.compiler.target>
+ <maven.compiler.source>8</maven.compiler.source>
<!-- OSGi bundles properties -->
<opendj.osgi.import.additional />
<!--
@@ -432,9 +432,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>3.8.0</version>
- <configuration>
- </configuration>
+ <version>3.10.1</version>
</plugin>
<plugin>
@@ -718,7 +716,16 @@
<module>opendj-packages</module>
</modules>
</profile>
- <profile>
+ <profile>
+ <id>set-compiler-release</id>
+ <activation>
+ <jdk>[9,)</jdk>
+ </activation>
+ <properties>
+ <maven.compiler.release>8</maven.compiler.release>
+ </properties>
+ </profile>
+ <profile>
<id>jdk16.options</id>
<activation>
<jdk>[16,)</jdk>
--
Gitblit v1.10.0