From 55edc25a6156ba32de83ad0a6ec39ffd3ecdfc90 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 `minimum-java-version` and
 `recommended-java-version`

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

diff --git a/build-parent/pom.xml b/build-parent/pom.xml
index af050bce240a9..3e4ef0f7188d9 100644
--- a/build-parent/pom.xml
+++ b/build-parent/pom.xml
@@ -53,6 +53,10 @@
         <!-- Enable APT by default for Eclipse -->
         <m2e.apt.activation>jdt_apt</m2e.apt.activation>
 
+        <!-- These 2 properties are used in catalog-overrides.json -->
+        <minimum-java-version>${maven.compiler.release}</minimum-java-version>
+        <recommended-java-version>17</recommended-java-version>
+
         <!--
         Supported Maven versions, interpreted as a version range (Also defined in quarkus-enforcer-rules)
          -->
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..c0553f850f90a 100644
--- a/devtools/bom-descriptor-json/src/main/resources/catalog-overrides.json
+++ b/devtools/bom-descriptor-json/src/main/resources/catalog-overrides.json
@@ -157,7 +157,9 @@
         "supported-maven-versions": "${supported-maven-versions}",
         "proposed-maven-version": "${proposed-maven-version}",
         "maven-wrapper-version": "${maven-wrapper.version}",
-        "gradle-wrapper-version": "${gradle-wrapper.version}"
+        "gradle-wrapper-version": "${gradle-wrapper.version}",
+        "minimum-java-version": "${minimum-java-version}",
+        "recommended-java-version": "${recommended-java-version}"
       }
     },
     "codestarts-artifacts": [