From 7da48b5e9834d8e106e14025605ac9c2d92abbdd Mon Sep 17 00:00:00 2001
From: George Gastaldi <gegastaldi@gmail.com>
Date: Tue, 10 Jan 2023 14:35:14 -0300
Subject: [PATCH] Introduce `proposed-java-version` and
 `supported-java-versions`

- Fixes #28497
---
 build-parent/pom.xml                                       | 7 ++++++-
 .../src/main/resources/catalog-overrides.json              | 2 ++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/build-parent/pom.xml b/build-parent/pom.xml
index 7d82508203de4..108f98dc3e077 100644
--- a/build-parent/pom.xml
+++ b/build-parent/pom.xml
@@ -58,6 +58,11 @@
          -->
         <supported-maven-versions>[3.6.2,)</supported-maven-versions>
 
+        <!-- These 2 properties are used in catalog-overrides.json -->
+        <!-- Supported Java versions, interpreted as a version range -->
+        <supported-java-versions>[11,)</supported-java-versions>
+        <proposed-java-version>17</proposed-java-version>
+
         <!-- These 2 properties are used by CreateProjectMojo to add the Maven Wrapper -->
         <proposed-maven-version>3.8.6</proposed-maven-version>
         <maven-wrapper.version>3.1.1</maven-wrapper.version>
@@ -173,7 +178,7 @@
         <!-- google cloud functions invoker-->
         <gcf-invoker.version>1.1.1</gcf-invoker.version>
     </properties>
-
+    
     <dependencyManagement>
         <dependencies>
 
diff --git a/devtools/bom-descriptor-json/src/main/resources/catalog-overrides.json b/devtools/bom-descriptor-json/src/main/resources/catalog-overrides.json
index 9bee169af979f..25b8f3f7ab7e3 100644
--- a/devtools/bom-descriptor-json/src/main/resources/catalog-overrides.json
+++ b/devtools/bom-descriptor-json/src/main/resources/catalog-overrides.json
@@ -156,6 +156,8 @@
         "gradle-plugin-version": "${quarkus-gradle-plugin.version}",
         "supported-maven-versions": "${supported-maven-versions}",
         "proposed-maven-version": "${proposed-maven-version}",
+        "supported-java-versions": "${supported-java-versions}",
+        "proposed-java-version": "${proposed-java-version}",
         "maven-wrapper-version": "${maven-wrapper.version}",
         "gradle-wrapper-version": "${gradle-wrapper.version}"
       }