From bbdee999ba583a4cf70ae77280ea1fca554abded Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Thu, 23 May 2024 11:18:40 +0200 Subject: [PATCH] Drop generated Requires on JRE See: https://pagure.io/fesco/issue/3207 Resolves: RHEL-51454 --- javapackages-config.json | 3 +-- javapackages-tools.spec | 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/javapackages-config.json b/javapackages-config.json index 1a419d9..22f0259 100644 --- a/javapackages-config.json +++ b/javapackages-config.json @@ -1,8 +1,7 @@ { "maven.req": { "always_generate": [ - "javapackages-filesystem", - "(java-headless or java-21-headless or java-17-headless or java-11-headless or java-1.8.0-headless)" + "javapackages-filesystem" ], "java_requires": { "skip": true diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 77f06af..ba8ccd0 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -16,7 +16,7 @@ Name: javapackages-tools Version: 6.2.0 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Macros and scripts for Java packaging support License: BSD-3-Clause URL: https://github.com/fedora-java/javapackages @@ -259,7 +259,8 @@ ln -s %{_datadir}/java-utils %{buildroot}%{_usr}/share/java-utils %changelog * Mon Aug 05 2024 Mikolaj Izdebski - 6.2.0-10 - Switch to OpenJDK 21 as default JDK/JRE -- Resolves: RHEL-49822 +- Drop generated Requires on JRE +- Resolves: RHEL-49822, RHEL-51276 * Thu Aug 01 2024 Troy Dawson - 6.2.0-10 - Bump release for Aug 2024 java mass rebuild