From 748340b712218bfd0638a888ee843ebca7542e5d Mon Sep 17 00:00:00 2001
From: Yaakov Selkowitz <yselkowi@redhat.com>
Date: Mar 27 2024 20:39:09 +0000
Subject: Switch Java packages from 17 to 21


https://fedoraproject.org/wiki/Changes/Java21
https://github.com/minimization/content-resolver-input/pull/1059

Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>

---

diff --git a/prepopulate.json b/prepopulate.json
index 33b217d..e2ec8ae 100644
--- a/prepopulate.json
+++ b/prepopulate.json
@@ -1989,16 +1989,16 @@
       "jasper": [
         "jasper-libs.aarch64"
       ],
-      "java-17-openjdk": [
-        "java-17-openjdk-demo.aarch64",
-        "java-17-openjdk-devel.aarch64",
-        "java-17-openjdk-headless.aarch64",
-        "java-17-openjdk-javadoc-zip.aarch64",
-        "java-17-openjdk-javadoc.aarch64",
-        "java-17-openjdk-jmods.aarch64",
-        "java-17-openjdk-src.aarch64",
-        "java-17-openjdk-static-libs.aarch64",
-        "java-17-openjdk.aarch64"
+      "java-21-openjdk": [
+        "java-21-openjdk-demo.aarch64",
+        "java-21-openjdk-devel.aarch64",
+        "java-21-openjdk-headless.aarch64",
+        "java-21-openjdk-javadoc-zip.aarch64",
+        "java-21-openjdk-javadoc.aarch64",
+        "java-21-openjdk-jmods.aarch64",
+        "java-21-openjdk-src.aarch64",
+        "java-21-openjdk-static-libs.aarch64",
+        "java-21-openjdk.aarch64"
       ],
       "javapackages-tools": [
         "javapackages-filesystem.noarch",
@@ -3162,7 +3162,7 @@
       ],
       "maven": [
         "maven-lib.noarch",
-        "maven-openjdk17.noarch",
+        "maven-openjdk21.noarch",
         "maven.noarch"
       ],
       "maven-resolver": [
@@ -8291,16 +8291,16 @@
       "jasper": [
         "jasper-libs.ppc64le"
       ],
-      "java-17-openjdk": [
-        "java-17-openjdk-demo.ppc64le",
-        "java-17-openjdk-devel.ppc64le",
-        "java-17-openjdk-headless.ppc64le",
-        "java-17-openjdk-javadoc-zip.ppc64le",
-        "java-17-openjdk-javadoc.ppc64le",
-        "java-17-openjdk-jmods.ppc64le",
-        "java-17-openjdk-src.ppc64le",
-        "java-17-openjdk-static-libs.ppc64le",
-        "java-17-openjdk.ppc64le"
+      "java-21-openjdk": [
+        "java-21-openjdk-demo.ppc64le",
+        "java-21-openjdk-devel.ppc64le",
+        "java-21-openjdk-headless.ppc64le",
+        "java-21-openjdk-javadoc-zip.ppc64le",
+        "java-21-openjdk-javadoc.ppc64le",
+        "java-21-openjdk-jmods.ppc64le",
+        "java-21-openjdk-src.ppc64le",
+        "java-21-openjdk-static-libs.ppc64le",
+        "java-21-openjdk.ppc64le"
       ],
       "javapackages-tools": [
         "javapackages-filesystem.noarch",
@@ -9454,7 +9454,7 @@
       ],
       "maven": [
         "maven-lib.noarch",
-        "maven-openjdk17.noarch",
+        "maven-openjdk21.noarch",
         "maven.noarch"
       ],
       "maven-resolver": [
@@ -14526,16 +14526,16 @@
       "jasper": [
         "jasper-libs.s390x"
       ],
-      "java-17-openjdk": [
-        "java-17-openjdk-demo.s390x",
-        "java-17-openjdk-devel.s390x",
-        "java-17-openjdk-headless.s390x",
-        "java-17-openjdk-javadoc-zip.s390x",
-        "java-17-openjdk-javadoc.s390x",
-        "java-17-openjdk-jmods.s390x",
-        "java-17-openjdk-src.s390x",
-        "java-17-openjdk-static-libs.s390x",
-        "java-17-openjdk.s390x"
+      "java-21-openjdk": [
+        "java-21-openjdk-demo.s390x",
+        "java-21-openjdk-devel.s390x",
+        "java-21-openjdk-headless.s390x",
+        "java-21-openjdk-javadoc-zip.s390x",
+        "java-21-openjdk-javadoc.s390x",
+        "java-21-openjdk-jmods.s390x",
+        "java-21-openjdk-src.s390x",
+        "java-21-openjdk-static-libs.s390x",
+        "java-21-openjdk.s390x"
       ],
       "javapackages-tools": [
         "javapackages-filesystem.noarch",
@@ -15685,7 +15685,7 @@
       ],
       "maven": [
         "maven-lib.noarch",
-        "maven-openjdk17.noarch",
+        "maven-openjdk21.noarch",
         "maven.noarch"
       ],
       "maven-resolver": [
@@ -20848,16 +20848,16 @@
       "jasper": [
         "jasper-libs.x86_64"
       ],
-      "java-17-openjdk": [
-        "java-17-openjdk-demo.x86_64",
-        "java-17-openjdk-devel.x86_64",
-        "java-17-openjdk-headless.x86_64",
-        "java-17-openjdk-javadoc-zip.x86_64",
-        "java-17-openjdk-javadoc.x86_64",
-        "java-17-openjdk-jmods.x86_64",
-        "java-17-openjdk-src.x86_64",
-        "java-17-openjdk-static-libs.x86_64",
-        "java-17-openjdk.x86_64"
+      "java-21-openjdk": [
+        "java-21-openjdk-demo.x86_64",
+        "java-21-openjdk-devel.x86_64",
+        "java-21-openjdk-headless.x86_64",
+        "java-21-openjdk-javadoc-zip.x86_64",
+        "java-21-openjdk-javadoc.x86_64",
+        "java-21-openjdk-jmods.x86_64",
+        "java-21-openjdk-src.x86_64",
+        "java-21-openjdk-static-libs.x86_64",
+        "java-21-openjdk.x86_64"
       ],
       "javapackages-tools": [
         "javapackages-filesystem.noarch",
@@ -22045,7 +22045,7 @@
       ],
       "maven": [
         "maven-lib.noarch",
-        "maven-openjdk17.noarch",
+        "maven-openjdk21.noarch",
         "maven.noarch"
       ],
       "maven-resolver": [
@@ -31830,21 +31830,21 @@
       "jasper": [
         "jasper-devel.aarch64"
       ],
-      "java-17-openjdk": [
-        "java-17-openjdk-demo-fastdebug.aarch64",
-        "java-17-openjdk-demo-slowdebug.aarch64",
-        "java-17-openjdk-devel-fastdebug.aarch64",
-        "java-17-openjdk-devel-slowdebug.aarch64",
-        "java-17-openjdk-fastdebug.aarch64",
-        "java-17-openjdk-headless-fastdebug.aarch64",
-        "java-17-openjdk-headless-slowdebug.aarch64",
-        "java-17-openjdk-jmods-fastdebug.aarch64",
-        "java-17-openjdk-jmods-slowdebug.aarch64",
-        "java-17-openjdk-slowdebug.aarch64",
-        "java-17-openjdk-src-fastdebug.aarch64",
-        "java-17-openjdk-src-slowdebug.aarch64",
-        "java-17-openjdk-static-libs-fastdebug.aarch64",
-        "java-17-openjdk-static-libs-slowdebug.aarch64"
+      "java-21-openjdk": [
+        "java-21-openjdk-demo-fastdebug.aarch64",
+        "java-21-openjdk-demo-slowdebug.aarch64",
+        "java-21-openjdk-devel-fastdebug.aarch64",
+        "java-21-openjdk-devel-slowdebug.aarch64",
+        "java-21-openjdk-fastdebug.aarch64",
+        "java-21-openjdk-headless-fastdebug.aarch64",
+        "java-21-openjdk-headless-slowdebug.aarch64",
+        "java-21-openjdk-jmods-fastdebug.aarch64",
+        "java-21-openjdk-jmods-slowdebug.aarch64",
+        "java-21-openjdk-slowdebug.aarch64",
+        "java-21-openjdk-src-fastdebug.aarch64",
+        "java-21-openjdk-src-slowdebug.aarch64",
+        "java-21-openjdk-static-libs-fastdebug.aarch64",
+        "java-21-openjdk-static-libs-slowdebug.aarch64"
       ],
       "javapackages-tools": [
         "javapackages-generators.noarch",
@@ -33057,21 +33057,21 @@
       "jasper": [
         "jasper-devel.ppc64le"
       ],
-      "java-17-openjdk": [
-        "java-17-openjdk-demo-fastdebug.ppc64le",
-        "java-17-openjdk-demo-slowdebug.ppc64le",
-        "java-17-openjdk-devel-fastdebug.ppc64le",
-        "java-17-openjdk-devel-slowdebug.ppc64le",
-        "java-17-openjdk-fastdebug.ppc64le",
-        "java-17-openjdk-headless-fastdebug.ppc64le",
-        "java-17-openjdk-headless-slowdebug.ppc64le",
-        "java-17-openjdk-jmods-fastdebug.ppc64le",
-        "java-17-openjdk-jmods-slowdebug.ppc64le",
-        "java-17-openjdk-slowdebug.ppc64le",
-        "java-17-openjdk-src-fastdebug.ppc64le",
-        "java-17-openjdk-src-slowdebug.ppc64le",
-        "java-17-openjdk-static-libs-fastdebug.ppc64le",
-        "java-17-openjdk-static-libs-slowdebug.ppc64le"
+      "java-21-openjdk": [
+        "java-21-openjdk-demo-fastdebug.ppc64le",
+        "java-21-openjdk-demo-slowdebug.ppc64le",
+        "java-21-openjdk-devel-fastdebug.ppc64le",
+        "java-21-openjdk-devel-slowdebug.ppc64le",
+        "java-21-openjdk-fastdebug.ppc64le",
+        "java-21-openjdk-headless-fastdebug.ppc64le",
+        "java-21-openjdk-headless-slowdebug.ppc64le",
+        "java-21-openjdk-jmods-fastdebug.ppc64le",
+        "java-21-openjdk-jmods-slowdebug.ppc64le",
+        "java-21-openjdk-slowdebug.ppc64le",
+        "java-21-openjdk-src-fastdebug.ppc64le",
+        "java-21-openjdk-src-slowdebug.ppc64le",
+        "java-21-openjdk-static-libs-fastdebug.ppc64le",
+        "java-21-openjdk-static-libs-slowdebug.ppc64le"
       ],
       "javapackages-tools": [
         "javapackages-generators.noarch",
@@ -34278,14 +34278,14 @@
       "jasper": [
         "jasper-devel.s390x"
       ],
-      "java-17-openjdk": [
-        "java-17-openjdk-demo-slowdebug.s390x",
-        "java-17-openjdk-devel-slowdebug.s390x",
-        "java-17-openjdk-headless-slowdebug.s390x",
-        "java-17-openjdk-jmods-slowdebug.s390x",
-        "java-17-openjdk-slowdebug.s390x",
-        "java-17-openjdk-src-slowdebug.s390x",
-        "java-17-openjdk-static-libs-slowdebug.s390x"
+      "java-21-openjdk": [
+        "java-21-openjdk-demo-slowdebug.s390x",
+        "java-21-openjdk-devel-slowdebug.s390x",
+        "java-21-openjdk-headless-slowdebug.s390x",
+        "java-21-openjdk-jmods-slowdebug.s390x",
+        "java-21-openjdk-slowdebug.s390x",
+        "java-21-openjdk-src-slowdebug.s390x",
+        "java-21-openjdk-static-libs-slowdebug.s390x"
       ],
       "javapackages-tools": [
         "javapackages-generators.noarch",
@@ -35505,21 +35505,21 @@
       "jasper": [
         "jasper-devel.x86_64"
       ],
-      "java-17-openjdk": [
-        "java-17-openjdk-demo-fastdebug.x86_64",
-        "java-17-openjdk-demo-slowdebug.x86_64",
-        "java-17-openjdk-devel-fastdebug.x86_64",
-        "java-17-openjdk-devel-slowdebug.x86_64",
-        "java-17-openjdk-fastdebug.x86_64",
-        "java-17-openjdk-headless-fastdebug.x86_64",
-        "java-17-openjdk-headless-slowdebug.x86_64",
-        "java-17-openjdk-jmods-fastdebug.x86_64",
-        "java-17-openjdk-jmods-slowdebug.x86_64",
-        "java-17-openjdk-slowdebug.x86_64",
-        "java-17-openjdk-src-fastdebug.x86_64",
-        "java-17-openjdk-src-slowdebug.x86_64",
-        "java-17-openjdk-static-libs-fastdebug.x86_64",
-        "java-17-openjdk-static-libs-slowdebug.x86_64"
+      "java-21-openjdk": [
+        "java-21-openjdk-demo-fastdebug.x86_64",
+        "java-21-openjdk-demo-slowdebug.x86_64",
+        "java-21-openjdk-devel-fastdebug.x86_64",
+        "java-21-openjdk-devel-slowdebug.x86_64",
+        "java-21-openjdk-fastdebug.x86_64",
+        "java-21-openjdk-headless-fastdebug.x86_64",
+        "java-21-openjdk-headless-slowdebug.x86_64",
+        "java-21-openjdk-jmods-fastdebug.x86_64",
+        "java-21-openjdk-jmods-slowdebug.x86_64",
+        "java-21-openjdk-slowdebug.x86_64",
+        "java-21-openjdk-src-fastdebug.x86_64",
+        "java-21-openjdk-src-slowdebug.x86_64",
+        "java-21-openjdk-static-libs-fastdebug.x86_64",
+        "java-21-openjdk-static-libs-slowdebug.x86_64"
       ],
       "javapackages-tools": [
         "javapackages-generators.noarch",