Allow Java 11 as LTS for older streams and other platforms

(cherry picked from commit dcc6ff6)
quarkusio · Feb 13, 2024 · b8dd52a · b8dd52a
1 parent efca3e9
commit b8dd52a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/...projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/JavaVersion.java b/...projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/JavaVersion.java
@@ -62,7 +62,7 @@ public String toString() {
     }
 
     // ordering is important here, so let's keep them ordered
-    public static final SortedSet<Integer> JAVA_VERSIONS_LTS = new TreeSet<>(List.of(17, 21));
+    public static final SortedSet<Integer> JAVA_VERSIONS_LTS = new TreeSet<>(List.of(11, 17, 21));
     public static final int DEFAULT_JAVA_VERSION = 17;
     // we want to maximize the compatibility of extensions with the Quarkus ecosystem so let's stick to 17 by default
     public static final String DEFAULT_JAVA_VERSION_FOR_EXTENSION = "17";

diff --git a/...ects/tools/devtools-common/src/test/java/io/quarkus/devtools/project/JavaVersionTest.java b/...ects/tools/devtools-common/src/test/java/io/quarkus/devtools/project/JavaVersionTest.java
@@ -31,7 +31,8 @@ public void givenJavaVersion21ShouldReturn21() {
 
     @Test
     void shouldProperlyUseMinJavaVersion() {
-        assertThat(getCompatibleLTSVersions(new JavaVersion("17"))).isEqualTo(JAVA_VERSIONS_LTS);
+        assertThat(getCompatibleLTSVersions(new JavaVersion("11"))).isEqualTo(JAVA_VERSIONS_LTS);
+        assertThat(getCompatibleLTSVersions(new JavaVersion("17"))).containsExactly(17, 21);
         assertThat(getCompatibleLTSVersions(new JavaVersion("21"))).containsExactly(21);
         assertThat(getCompatibleLTSVersions(new JavaVersion("100"))).isEmpty();
         assertThat(getCompatibleLTSVersions(JavaVersion.NA)).isEqualTo(JAVA_VERSIONS_LTS);
@@ -46,7 +47,7 @@ public void givenAutoDetectShouldReturnAppropriateVersion() {
     @Test
     public void testDetermineBestLtsVersion() {
         assertEquals(17, determineBestJavaLtsVersion(8));
-        assertEquals(17, determineBestJavaLtsVersion(11));
+        assertEquals(11, determineBestJavaLtsVersion(11));
         assertEquals(17, determineBestJavaLtsVersion(17));
         assertEquals(17, determineBestJavaLtsVersion(18));
         assertEquals(21, determineBestJavaLtsVersion(21));