Merge pull request #41210 from gsmet/java-1.8

Avoid NumberFormatException for Java 1.8
quarkusio · Jun 15, 2024 · 801260e · 801260e
2 parents c761702 + c41dd13
commit 801260e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
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
@@ -19,7 +19,11 @@ private JavaVersion() {
     }
 
     public JavaVersion(String version) {
-        this.version = version;
+        if (version != null && version.startsWith("1.")) {
+            this.version = version.substring(2);
+        } else {
+            this.version = version;
+        }
     }
 
     public boolean isEmpty() {

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
@@ -14,6 +14,12 @@
 
 class JavaVersionTest {
 
+    @Test
+    public void givenJavaVersion8ShouldReturn8() {
+        assertEquals(8, new JavaVersion("8").getAsInt());
+        assertEquals(8, new JavaVersion("1.8").getAsInt());
+    }
+
     @Test
     public void givenJavaVersion17ShouldReturn17() {
         assertEquals("17", computeJavaVersion(JAVA, "17"));