Rebase LDAP SDK to 5.6.0.

.gitignore

@@ -15,3 +15,4 @@ ldapjdk-4.18.tar.gz
 /ldap-sdk-5.4.1.tar.gz
 /ldap-sdk-5.5.0-alpha2.tar.gz
 /ldap-sdk-5.5.0.tar.gz
+/ldap-sdk-5.6.0.tar.gz

ldapjdk.spec

@@ -2,17 +2,18 @@
 Name:             ldapjdk
 ################################################################################
 
-%global           product_id dogtag-ldapjdk
+%global           vendor_id dogtag
+%global           product_id %{vendor_id}-ldapjdk
 
 # Upstream version number:
 %global           major_version 5
-%global           minor_version 5
+%global           minor_version 6
 %global           update_version 0
 
 # Downstream release number:
 # - development/stabilization (unsupported): 0.<n> where n >= 1
 # - GA/update (supported): <n> where n >= 1
-%global           release_number 2
+%global           release_number 1
 
 # Development phase:
 # - development (unsupported): alpha<n> where n >= 1
@@ -25,9 +26,9 @@ Name:             ldapjdk
 
 Summary:          LDAP SDK
 URL:              https://github.com/dogtagpki/ldap-sdk
-License:          MPL-1.1 or GPL-2.0-or-later or LGPL-2.1-or-later
+License:          MPL-1.1 OR GPL-2.0-or-later OR LGPL-2.1-or-later
 Version:          %{major_version}.%{minor_version}.%{update_version}
-Release:          %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist}.1
+Release:          %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist}
 
 # To create a tarball from a version tag:
 # $ git archive \
@@ -53,9 +54,26 @@ ExclusiveArch:    %{java_arches} noarch
 # Java
 ################################################################################
 
-%define java_devel java-devel
-%define java_headless java-headless
-%define java_home %{_jvmdir}/jre-openjdk
+# use Java 17 on Fedora 39 or older and RHEL 9 or older
+# otherwise, use Java 21
+
+# maven-local is a subpackage of javapackages-tools
+
+%if 0%{?fedora} && 0%{?fedora} <= 39 || 0%{?rhel} && 0%{?rhel} <= 9
+
+%define java_devel java-17-openjdk-devel
+%define java_headless java-17-openjdk-headless
+%define java_home %{_jvmdir}/jre-17-openjdk
+%define maven_local maven-local-openjdk17
+
+%else
+
+%define java_devel java-21-openjdk-devel
+%define java_headless java-21-openjdk-headless
+%define java_home %{_jvmdir}/jre-21-openjdk
+%define maven_local maven-local
+
+%endif
 
 ################################################################################
 # Build Dependencies
@@ -63,10 +81,10 @@ ExclusiveArch:    %{java_arches} noarch
 
 BuildRequires:    ant
 BuildRequires:    %{java_devel}
-BuildRequires:    maven-local
+BuildRequires:    %{maven_local}
 BuildRequires:    mvn(org.slf4j:slf4j-api)
 BuildRequires:    mvn(org.slf4j:slf4j-jdk14)
-BuildRequires:    mvn(org.dogtagpki.jss:jss-base) >= 5.5.0
+BuildRequires:    mvn(org.dogtagpki.jss:jss-base) >= 5.6.0
 
 %description
 The Mozilla LDAP SDKs enable you to write applications which access,
@@ -81,7 +99,7 @@ Summary:          LDAP SDK
 Requires:         %{java_headless}
 Requires:         mvn(org.slf4j:slf4j-api)
 Requires:         mvn(org.slf4j:slf4j-jdk14)
-Requires:         mvn(org.dogtagpki.jss:jss-base) >= 5.5.0
+Requires:         mvn(org.dogtagpki.jss:jss-base) >= 5.6.0
 
 Obsoletes:        ldapjdk < %{version}-%{release}
 Provides:         ldapjdk = %{version}-%{release}
@@ -160,6 +178,9 @@ ln -sf %{name}/ldaptools.pom %{buildroot}%{_mavenpomdir}/JPP-ldaptools.pom
 
 ################################################################################
 %changelog
+* Wed Mar 5 2025  Dogtag PKI Team <devel@lists.dogtagpki.org> - 5.6.0-1
+- Rebase to LDAP SDK 5.6.0
+
 * Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.5.0-2.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (ldap-sdk-5.5.0.tar.gz) = 8f3502a731cfd8275664bdef5413db2fadcb80252b847cd5835de4ff6ba75e975c65aa4ea068ae18d35ecfeccf086a113c2763cf3160144e12b4c58c9b698d59
+SHA512 (ldap-sdk-5.6.0.tar.gz) = 4e86246ecd0a772a09cfc09081319d4e32abd173ce167cfe7c569636d3bd323b75d1d90d9faf65b43ca67c4e123bfb5bff2620158fff3b011c580e6eca07515d