fix(repoclosure): retarget openjdk21 references to openjdk25

base/comps/apache-ivy/apache-ivy.comp.toml

@@ -9,4 +9,11 @@ overlays = [
     { type = "spec-search-replace", regex = "dos2unix src/java/org/apache/ivy/ant/IvyAntSettings.java", replacement = "dos2unix src/java/org/apache/ivy/ant/IvyAntSettings.java asciidoc/release-notes.adoc ivy.xml optional.patterns src/java/org/apache/ivy/core/pack/PackagingManager.java src/java/org/apache/ivy/core/pack/PackingRegistry.java src/java/org/apache/ivy/core/settings/IvySettings.java src/java/org/apache/ivy/core/pack/ArchivePacking.java src/java/org/apache/ivy/core/pack/OsgiBundlePacking.java src/java/org/apache/ivy/core/pack/Pack200Packing.java src/java/org/apache/ivy/core/pack/StreamPacking.java src/java/org/apache/ivy/core/pack/ZipPacking.java src/java/org/apache/ivy/util/FileUtil.java test/java/org/apache/ivy/core/retrieve/RetrieveTest.java test/java/org/apache/ivy/core/pack/ZipPackingTest.java version.properties" },
 
     { type = "spec-search-replace", regex = "patch -p1 -l < %{SOURCE3}", replacement = "patch -p1 -l < %{SOURCE3}\npatch -p1 -l < %{SOURCE4}\npatch -p1 -l < %{SOURCE5}" },
+
+    # AZL ships only java-25-openjdk; there is no java-21-openjdk, so the
+    # upstream references to ant-openjdk21 and java-21-openjdk are
+    # unsatisfiable. Retarget to the openjdk25 variant.
+    { description = "Remove BuildRequires on ant-openjdk21 — AZL does not ship java-21-openjdk", type = "spec-remove-tag", tag = "BuildRequires", value = "ant-openjdk21" },
+    { description = "Add BuildRequires on ant-openjdk25 in place of ant-openjdk21", type = "spec-add-tag", tag = "BuildRequires", value = "ant-openjdk25" },
+    { description = "Retarget JAVA_HOME from java-21-openjdk to java-25-openjdk in %build", type = "spec-search-replace", section = "%build", regex = "java-21-openjdk", replacement = "java-25-openjdk" },
 ]

base/comps/apache-sshd/apache-sshd.comp.toml

@@ -23,3 +23,18 @@ description = "Remove explicit %patch call now handled by %autosetup"
 type = "spec-search-replace"
 regex = '%patch -P0 -p1'
 replacement = ''
+
+# AZL ships only java-25-openjdk; there is no java-21-openjdk, so the
+# upstream BuildRequires on maven-local-openjdk21 is unsatisfiable.
+# Retarget to the openjdk25 variant.
+[[components.apache-sshd.overlays]]
+description = "Remove BuildRequires on maven-local-openjdk21 — AZL does not ship java-21-openjdk"
+type = "spec-remove-tag"
+tag = "BuildRequires"
+value = "maven-local-openjdk21"
+
+[[components.apache-sshd.overlays]]
+description = "Add BuildRequires on maven-local-openjdk25 in place of maven-local-openjdk21"
+type = "spec-add-tag"
+tag = "BuildRequires"
+value = "maven-local-openjdk25"

base/comps/components-publish-channels.toml

@@ -768,7 +768,6 @@ components = [
     "libb2",
     "libblkio",
     "libblockdev",
-    "libbluray",
     "libbpf",
     "libbsd",
     "libburn",
@@ -960,7 +959,6 @@ components = [
     "libtracecmd",
     "libtraceevent",
     "libtracefs",
-    "libudfread",
     "libunistring",
     "libunwind",
     "liburing",

base/comps/components.toml

@@ -1162,7 +1162,6 @@ includes = ["**/*.comp.toml", "component-check-disablement.toml", "component-min
 [components.gumbo-parser]
 [components.gupnp]
 [components.gupnp-igd]
-[components.gvfs]
 [components.gzip]
 [components.h5py]
 [components.half]
@@ -1699,7 +1698,6 @@ includes = ["**/*.comp.toml", "component-check-disablement.toml", "component-min
 [components.libb2]
 [components.libblkio]
 [components.libblockdev]
-[components.libbluray]
 [components.libbpf]
 [components.libbs2b]
 [components.libbsd]
@@ -1953,7 +1951,6 @@ includes = ["**/*.comp.toml", "component-check-disablement.toml", "component-min
 [components.libtracecmd]
 [components.libtraceevent]
 [components.libtracefs]
-[components.libudfread]
 [components.libunibreak]
 [components.libunistring]
 [components.libunwind]
@@ -3339,7 +3336,6 @@ includes = ["**/*.comp.toml", "component-check-disablement.toml", "component-min
 [components.plexus-testing]
 [components.plexus-utils]
 [components.plexus-utils4]
-[components.plexus-velocity]
 [components.plexus-xml]
 [components.plocate]
 [components.plotutils]
@@ -4555,7 +4551,6 @@ includes = ["**/*.comp.toml", "component-check-disablement.toml", "component-min
 [components.replacer]
 [components.resolv_wrapper]
 [components.rest]
-[components.resteasy]
 [components.rgb]
 [components.rhash]
 [components.rit-meera-new-fonts]
@@ -6799,7 +6794,6 @@ includes = ["**/*.comp.toml", "component-check-disablement.toml", "component-min
 [components.stress-ng]
 [components.string-template-maven-plugin]
 [components.stringtemplate]
-[components.stringtemplate4]
 [components.stunnel]
 [components.subversion]
 [components.sudo]
@@ -6970,7 +6964,6 @@ includes = ["**/*.comp.toml", "component-check-disablement.toml", "component-min
 [components.xapian-bindings]
 [components.xapian-core]
 [components.xapps]
-[components.xbean]
 [components.xcb-proto]
 [components.xcb-util]
 [components.xcb-util-cursor]

base/comps/dogtag-pki/dogtag-pki.comp.toml

@@ -1,3 +1,39 @@
 [components.dogtag-pki]
 # Release: %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist}
 release = { calculation = "manual" }
+
+# AZL ships only java-25-openjdk; there is no java-21-openjdk, so the
+# upstream %else branch (taken when %fedora and %rhel are both unset, as
+# in AZL) references unsatisfiable openjdk21 packages. Retarget each
+# %define line individually so we don't accidentally rewrite historical
+# %changelog entries that mention these monikers (spec-search-replace
+# cannot be scoped to the preamble alone).
+[[components.dogtag-pki.overlays]]
+description = "Retarget java_runtime to java-25-openjdk"
+type = "spec-search-replace"
+regex = '^%define java_runtime java-21-openjdk$'
+replacement = "%define java_runtime java-25-openjdk"
+
+[[components.dogtag-pki.overlays]]
+description = "Retarget java_devel to java-25-openjdk-devel"
+type = "spec-search-replace"
+regex = '^%define java_devel java-21-openjdk-devel$'
+replacement = "%define java_devel java-25-openjdk-devel"
+
+[[components.dogtag-pki.overlays]]
+description = "Retarget java_headless to java-25-openjdk-headless"
+type = "spec-search-replace"
+regex = '^%define java_headless java-21-openjdk-headless$'
+replacement = "%define java_headless java-25-openjdk-headless"
+
+[[components.dogtag-pki.overlays]]
+description = "Retarget java_home to jre-25-openjdk"
+type = "spec-search-replace"
+regex = '^%define java_home %\{_jvmdir\}/jre-21-openjdk$'
+replacement = "%define java_home %{_jvmdir}/jre-25-openjdk"
+
+[[components.dogtag-pki.overlays]]
+description = "Retarget maven_local to maven-local-openjdk25"
+type = "spec-search-replace"
+regex = '^%define maven_local maven-local-openjdk21$'
+replacement = "%define maven_local maven-local-openjdk25"

base/comps/gvfs/gvfs.comp.toml

@@ -0,0 +1,16 @@
+[components.gvfs]
+
+# AZL does not ship libbluray — Blu-Ray playback support is dropped from gvfs.
+
+[[components.gvfs.overlays]]
+description = "Drop BuildRequires: pkgconfig(libbluray) (libbluray not available in AZL)"
+type = "spec-remove-tag"
+tag = "BuildRequires"
+value = "pkgconfig(libbluray)"
+
+[[components.gvfs.overlays]]
+description = "Pass -Dbluray=false to meson unconditionally (libbluray not available in AZL)"
+type = "spec-search-replace"
+section = "%build"
+regex = '-Dman=true \\'
+replacement = "-Dman=true \\\n       -Dbluray=false \\"

base/comps/jss/jss.comp.toml

@@ -11,3 +11,27 @@ release = { calculation = "manual" }
 # See: https://src.fedoraproject.org/rpms/jss/blob/rawhide/f/jss.spec (line ~28)
 [components.jss.build]
 defines = { enable_nss_version_pqc_def_flag = "-DENABLE_NSS_VERSION_PQC_DEF=ON" }
+
+# AZL ships only java-25-openjdk; there is no java-21-openjdk, so the
+# upstream %else branch (taken when %fedora is unset, as in AZL)
+# references unsatisfiable openjdk21 packages. Retarget each %define
+# line individually so we don't accidentally rewrite historical
+# %changelog entries (spec-search-replace cannot be scoped to the
+# preamble alone).
+[[components.jss.overlays]]
+description = "Retarget java_devel to java-25-openjdk-devel"
+type = "spec-search-replace"
+regex = '^%define java_devel java-21-openjdk-devel$'
+replacement = "%define java_devel java-25-openjdk-devel"
+
+[[components.jss.overlays]]
+description = "Retarget java_headless to java-25-openjdk-headless"
+type = "spec-search-replace"
+regex = '^%define java_headless java-21-openjdk-headless$'
+replacement = "%define java_headless java-25-openjdk-headless"
+
+[[components.jss.overlays]]
+description = "Retarget java_home to jre-25-openjdk"
+type = "spec-search-replace"
+regex = '^%define java_home %\{_jvmdir\}/jre-21-openjdk$'
+replacement = "%define java_home %{_jvmdir}/jre-25-openjdk"

base/comps/plexus-velocity/plexus-velocity.comp.toml

@@ -0,0 +1,16 @@
+[components.plexus-velocity]
+
+# AZL ships only java-25-openjdk; there is no java-21-openjdk, so the
+# upstream BuildRequires on maven-local-openjdk21 is unsatisfiable.
+# Retarget to the openjdk25 variant.
+[[components.plexus-velocity.overlays]]
+description = "Remove BuildRequires on maven-local-openjdk21 — AZL does not ship java-21-openjdk"
+type = "spec-remove-tag"
+tag = "BuildRequires"
+value = "maven-local-openjdk21"
+
+[[components.plexus-velocity.overlays]]
+description = "Add BuildRequires on maven-local-openjdk25 in place of maven-local-openjdk21"
+type = "spec-add-tag"
+tag = "BuildRequires"
+value = "maven-local-openjdk25"

base/comps/resteasy/resteasy.comp.toml

@@ -0,0 +1,16 @@
+[components.resteasy]
+
+# AZL ships only java-25-openjdk; there is no java-21-openjdk, so the
+# upstream BuildRequires on maven-local-openjdk21 is unsatisfiable.
+# Retarget to the openjdk25 variant.
+[[components.resteasy.overlays]]
+description = "Remove BuildRequires on maven-local-openjdk21 — AZL does not ship java-21-openjdk"
+type = "spec-remove-tag"
+tag = "BuildRequires"
+value = "maven-local-openjdk21"
+
+[[components.resteasy.overlays]]
+description = "Add BuildRequires on maven-local-openjdk25 in place of maven-local-openjdk21"
+type = "spec-add-tag"
+tag = "BuildRequires"
+value = "maven-local-openjdk25"

base/comps/stringtemplate4/stringtemplate4.comp.toml

@@ -0,0 +1,9 @@
+[components.stringtemplate4]
+
+# AZL otherwise tracks Fedora 43, but the f43 stringtemplate4 still
+# BuildRequires maven-local-openjdk21, which AZL does not ship (we only
+# ship java-25-openjdk). Pin to a Fedora 44 commit on the f44 branch that
+# moves the package forward to openjdk25 and includes the corresponding
+# build fixes.
+# Fedora commit: https://src.fedoraproject.org/rpms/stringtemplate4/c/0a6adaa584f3670857a931ff971b283213dfcfd7?branch=f44
+spec = { type = "upstream", upstream-distro = { name = "fedora", version = "44" }, upstream-commit = "0a6adaa584f3670857a931ff971b283213dfcfd7" }

base/comps/xbean/xbean.comp.toml

@@ -0,0 +1,30 @@
+[components.xbean]
+
+# AZL ships only java-25-openjdk; there is no java-21-openjdk, so the
+# upstream BuildRequires on maven-local-openjdk21 is unsatisfiable.
+# Retarget to the openjdk25 variant.
+[[components.xbean.overlays]]
+description = "Remove BuildRequires on maven-local-openjdk21 — AZL does not ship java-21-openjdk"
+type = "spec-remove-tag"
+tag = "BuildRequires"
+value = "maven-local-openjdk21"
+
+[[components.xbean.overlays]]
+description = "Add BuildRequires on maven-local-openjdk25 in place of maven-local-openjdk21"
+type = "spec-add-tag"
+tag = "BuildRequires"
+value = "maven-local-openjdk25"
+
+# Backport from Fedora rawhide commit (the test-skip portion of):
+#   https://src.fedoraproject.org/rpms/xbean/c/1df289d87c3617482e813a5dac348b01c67d271f?branch=rawhide
+# Upstream tests fail under jdk25; rawhide added `--force` to `%mvn_build`
+# so the build proceeds despite test failures. The openjdk21 -> openjdk25
+# portion of that same commit is handled by the BuildRequires overlays
+# above. Drop this overlay once the default Fedora 43 snapshot in
+# distro/azurelinux.distro.toml advances past a commit that includes this
+# change.
+[[components.xbean.overlays]]
+description = "Pass --force to %mvn_build to skip tests that fail under jdk25 (backport from Fedora rawhide)"
+type = "spec-search-replace"
+regex = '^%mvn_build -- '
+replacement = '%mvn_build --force -- '

locks/apache-ivy.lock

@@ -2,5 +2,5 @@
 version = 1
 import-commit = '2d9ffb29ba8f8ff9324fa5d2900bb17abcd9e3fc'
 upstream-commit = '2d9ffb29ba8f8ff9324fa5d2900bb17abcd9e3fc'
-input-fingerprint = 'sha256:642ee997123fccdfc4d69889dd80db4cd9aa42e80765cd41bcea85d6e8c8de3f'
+input-fingerprint = 'sha256:181b4a2371115ad410bdb074bc4f0867011999bf7d3f7d674bdcb99cd3cdc614'
 resolution-input-hash = 'sha256:466421704711c4fd3c71f0b2ed715a0e61d49e3e26f3a2637fee755795849c8e'

locks/apache-sshd.lock

@@ -2,5 +2,5 @@
 version = 1
 import-commit = '7d331bbfc695a430f36ed29a212394444e515a0a'
 upstream-commit = '7d331bbfc695a430f36ed29a212394444e515a0a'
-input-fingerprint = 'sha256:1ab3b53daf9c82a517a309099ce334b123aed93d4b26f54b0203de144d7c6a8c'
+input-fingerprint = 'sha256:58a5f31c2f281fb10d30d99a72c492f0fdc949a29cd909b1fe4bac8d29b5eea1'
 resolution-input-hash = 'sha256:466421704711c4fd3c71f0b2ed715a0e61d49e3e26f3a2637fee755795849c8e'

locks/dogtag-pki.lock

@@ -2,5 +2,5 @@
 version = 1
 import-commit = '960bfe6bd5106dc81083f79f10819dd2bd8ec0d4'
 upstream-commit = '960bfe6bd5106dc81083f79f10819dd2bd8ec0d4'
-input-fingerprint = 'sha256:7234b3bf768cace4b8923e553ddcb009a169459a9fabb20d2d63d903753ce605'
+input-fingerprint = 'sha256:375eeea66353c243285d781f6ceb90bae856e4a940c64064ae85f4912d711244'
 resolution-input-hash = 'sha256:466421704711c4fd3c71f0b2ed715a0e61d49e3e26f3a2637fee755795849c8e'

locks/gvfs.lock

@@ -2,5 +2,5 @@
 version = 1
 import-commit = '815f4bf080254ef8b50adeace2941af5db321b84'
 upstream-commit = '815f4bf080254ef8b50adeace2941af5db321b84'
-input-fingerprint = 'sha256:4f73d2e00dbd5560661a81416b858a75f04d91cb15fcae80617b85411cdd9b70'
+input-fingerprint = 'sha256:5dddc83bfa090ab408d7af1381b061f1b8ae084883b0f03577a7cdea1127edc9'
 resolution-input-hash = 'sha256:466421704711c4fd3c71f0b2ed715a0e61d49e3e26f3a2637fee755795849c8e'

locks/jss.lock

@@ -2,5 +2,5 @@
 version = 1
 import-commit = '7d99ce785209a62462c0389ae489c55e7fb35368'
 upstream-commit = '7d99ce785209a62462c0389ae489c55e7fb35368'
-input-fingerprint = 'sha256:5f726d2b9d4dd62ae8ac757bf3fbc63d600b6bd6c0dc8e98af5ddd12deaf6f84'
+input-fingerprint = 'sha256:8877009eeb10be1f34cb864e100dd9a94d1df4b0d865bcb092388037eff87a6b'
 resolution-input-hash = 'sha256:466421704711c4fd3c71f0b2ed715a0e61d49e3e26f3a2637fee755795849c8e'

locks/plexus-velocity.lock

@@ -2,5 +2,5 @@
 version = 1
 import-commit = '79df2a9ed23f51b8809d54fb3d2e3452363d9e83'
 upstream-commit = '79df2a9ed23f51b8809d54fb3d2e3452363d9e83'
-input-fingerprint = 'sha256:0e1d4fe68141622fdddf6dac8164769fa9a86053f8654cc6ac64275a384e3c0d'
+input-fingerprint = 'sha256:06463a904d32dd8eb2abced91fb43fa80705b8bc2addd5963e4a17552d622bf9'
 resolution-input-hash = 'sha256:466421704711c4fd3c71f0b2ed715a0e61d49e3e26f3a2637fee755795849c8e'

locks/resteasy.lock

@@ -2,5 +2,5 @@
 version = 1
 import-commit = 'ebe56f37b2fda99bffb86a7df917175e49df4975'
 upstream-commit = 'ebe56f37b2fda99bffb86a7df917175e49df4975'
-input-fingerprint = 'sha256:d74b08614ee6b9ac9e1320d5ed0563b3c52d2938d3456fbbdafe18bcb413a21a'
+input-fingerprint = 'sha256:76c5f4447824c762ab9bb0c81c80fd4693a7296a7d7890460e9e2accd0a18b2b'
 resolution-input-hash = 'sha256:466421704711c4fd3c71f0b2ed715a0e61d49e3e26f3a2637fee755795849c8e'

locks/stringtemplate4.lock

@@ -1,6 +1,6 @@
 # Managed by azldev component update. Do not edit manually.
 version = 1
 import-commit = 'bdb23f939020f7916ed21c9033ecfd6b83b575d9'
-upstream-commit = 'bdb23f939020f7916ed21c9033ecfd6b83b575d9'
-input-fingerprint = 'sha256:32d618b9d809fb99c1c2fbc331cae4f259d76a8f5191e510eced8b4ff04dd2dd'
-resolution-input-hash = 'sha256:466421704711c4fd3c71f0b2ed715a0e61d49e3e26f3a2637fee755795849c8e'
+upstream-commit = '0a6adaa584f3670857a931ff971b283213dfcfd7'
+input-fingerprint = 'sha256:a25850dc7fb6041bff0e72d9d5666ac7085790a02ae3bfb81a3082580024bfcd'
+resolution-input-hash = 'sha256:3dfbb4dd503c0097e2fcb6dee544a989bace0bbc21d2db478554d18dae1daece'

locks/xbean.lock

@@ -2,5 +2,5 @@
 version = 1
 import-commit = '6bc9e95d9b3ecab78b21fa99289fce6e6e021310'
 upstream-commit = '6bc9e95d9b3ecab78b21fa99289fce6e6e021310'
-input-fingerprint = 'sha256:6b6e61d77f9a3ef52c2db9df757c2ed95c110807ec9615483cb1088a8bcdeb94'
+input-fingerprint = 'sha256:6593103dd513795adf785435e1b656017fe93ede5ff2f7546889fbe6c02024a6'
 resolution-input-hash = 'sha256:466421704711c4fd3c71f0b2ed715a0e61d49e3e26f3a2637fee755795849c8e'

specs/a/apache-ivy/apache-ivy.spec

@@ -10,7 +10,7 @@
 
 Name:           apache-%{jarname}
 Version:        2.5.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary:        Java-based dependency manager
 License:        Apache-2.0
 URL:            https://ant.apache.org/ivy
@@ -27,7 +27,6 @@ Source2:        https://archive.apache.org/dist/ant/KEYS
 Source3:         00-global-settings.patch
 
 BuildRequires:  gnupg2
-BuildRequires:  ant-openjdk21
 BuildRequires:  ivy-local
 BuildRequires:  dos2unix
 BuildRequires:  mvn(org.apache.ant:ant)
@@ -56,6 +55,7 @@ Provides:       ivy = %{version}-%{release}
 
 Source4: IMPROVEMENT-use-Apache-Commons-Compress-for-pack200-.patch
 Source5: remove-Pack200Packing-java.patch
+BuildRequires: ant-openjdk25
 %description
 Apache Ivy is a tool for managing (recording, tracking, resolving and
 reporting) project dependencies.  It is designed as process agnostic and is
@@ -144,7 +144,7 @@ rm -rf asciidoc
 # create custom ant configuration
 mkdir -p ~/.ant
 cp /etc/ant.conf ~/.ant
-sed -i '$a JAVA_HOME=/usr/lib/jvm/java-21-openjdk' ~/.ant/ant.conf
+sed -i '$a JAVA_HOME=/usr/lib/jvm/java-25-openjdk' ~/.ant/ant.conf
 
 ant -Divy.mode=local \
     -f build-release.xml \