From e1003859aa39066bd3d052431e9a002e856ac5a3 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Jan 27 2022 13:29:46 +0000
Subject: Switch to OpenJDK 17 as default JDK/JRE


---

diff --git a/javapackages-config.json b/javapackages-config.json
index 28f6648..d06e353 100644
--- a/javapackages-config.json
+++ b/javapackages-config.json
@@ -2,7 +2,7 @@
     "maven.req": {
         "always_generate": [
             "javapackages-filesystem",
-            "(java-headless or java-11-headless)"
+            "(java-headless or java-17-headless)"
         ],
         "java_requires": {
             "skip": true
diff --git a/javapackages-tools.spec b/javapackages-tools.spec
index e9f7f3c..b3df52e 100644
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@ -13,12 +13,12 @@
 %global python_prefix python3
 %global python_interpreter %{?__python3}%{!?__python3:dummy}
 
-%global default_jdk %{_prefix}/lib/jvm/java-11-openjdk
-%global default_jre %{_prefix}/lib/jvm/jre-11-openjdk
+%global default_jdk %{_prefix}/lib/jvm/java-17-openjdk
+%global default_jre %{_prefix}/lib/jvm/jre-17-openjdk
 
 Name:           javapackages-tools
 Version:        6.0.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Macros and scripts for Java packaging support
 License:        BSD
 URL:            https://github.com/fedora-java/javapackages
@@ -50,7 +50,7 @@ Requires:       coreutils
 Requires:       findutils
 Requires:       which
 # default JRE
-Requires:       java-11-openjdk-headless
+Requires:       java-17-openjdk-headless
 
 Provides:       jpackage-utils = %{version}-%{release}
 # These could be generated automatically, but then we would need to
@@ -112,7 +112,7 @@ packaging in Linux distributions
 Summary:        Non-essential macros and scripts for Java packaging support
 Requires:       javapackages-generators = %{version}-%{release}
 # Java build systems don't have hard requirement on java-devel, so it should be there
-Requires:       java-11-openjdk-devel
+Requires:       java-17-openjdk-devel
 %if %{with bootstrap}
 Requires:       javapackages-bootstrap
 %else
@@ -228,6 +228,9 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/java/javapackages-config
 %license LICENSE
 
 %changelog
+* Thu Jan 27 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.0.0-7
+- Switch to OpenJDK 17 as default JDK/JRE
+
 * Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild