From 3a91cd4b37b37ee87b6ec74858996dd1b8b26f44 Mon Sep 17 00:00:00 2001
From: Andrew Hughes <gnu.andrew@redhat.com>
Date: Thu, 15 Aug 2024 00:11:57 +0100
Subject: [PATCH] Rebuilt with java-21-openjdk as default JDK:
 https://issues.redhat.com/browse/RHEL-34597

- Resolves: RHEL-54331
---
 jss.spec | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/jss.spec b/jss.spec
index 3399c21..dca23f6 100644
--- a/jss.spec
+++ b/jss.spec
@@ -12,7 +12,7 @@ Name:           jss
 # 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 3
 
 # Development phase:
 # - development (unsupported): alpha<n> where n >= 1
@@ -27,7 +27,7 @@ Summary:        Java Security Services (JSS)
 URL:            https://github.com/dogtagpki/jss
 License:        (MPL-1.1 or GPL-2.0-or-later or LGPL-2.1-or-later) and Apache-2.0
 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 generate the source tarball:
 # $ git clone https://github.com/dogtagpki/jss.git
@@ -55,9 +55,9 @@ ExcludeArch: i686
 # Java
 ################################################################################
 
-%define java_devel java-17-openjdk-devel
-%define java_headless java-17-openjdk-headless
-%define java_home %{_jvmdir}/jre-17-openjdk
+%define java_devel java-21-openjdk-devel
+%define java_headless java-21-openjdk-headless
+%define java_home %{_jvmdir}/jre-21-openjdk
 
 ################################################################################
 # Build Options
@@ -351,6 +351,11 @@ cp base/target/jss-tests.jar %{buildroot}%{_datadir}/jss/tests/lib
 
 ################################################################################
 %changelog
+* Wed Aug 14 2024 Andrew Hughes <gnu.andrew@redhat.com> - 5.5.0-3
+- Rebuilt with java-21-openjdk as default JDK:
+  https://issues.redhat.com/browse/RHEL-34597
+- Resolves: RHEL-54331
+
 * Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 5.5.0-2.1
 - Bump release for June 2024 mass rebuild