(karaf) branch main updated: Support Java 21 in Builder.JavaVersion

[jbonofre]

This is an automated email from the ASF dual-hosted git repository.

jbonofre pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/karaf.git


The following commit(s) were added to refs/heads/main by this push:
     new e9914f8267 Support Java 21 in Builder.JavaVersion
     new bd66435e8e Merge pull request #1810 from rovarga/builder-javaversion
e9914f8267 is described below

commit e9914f8267c9358c762eac84116bed48f4985358
Author: Robert Varga <robert.va...@pantheon.tech>
AuthorDate: Sat Dec 16 11:28:32 2023 +0100

    Support Java 21 in Builder.JavaVersion
    
    We have jre-21 defined in jre.properties, but the Builder would not
    recognize them. Update the enumeration and eliminate manuall-maintained
    ordinal, deferring to Enum.compareTo() instead.
    
    Signed-off-by: Robert Varga <robert.va...@pantheon.tech>
---
 .../org/apache/karaf/profile/assembly/Builder.java | 35 +++++++++++-----------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git 
a/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java 
b/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java
index 1f96027866..52088ed7f2 100644
--- a/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java
+++ b/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java
@@ -184,26 +184,27 @@ public class Builder {
      * supported versions are defined.</p>
      */
     public enum JavaVersion {
-        Java6("1.6", 1),
-        Java7("1.7", 2),
-        Java8("1.8", 3),
-        Java9("9", 4),
-        Java10("10", 5),
-        Java11("11", 6),
-        Java12("12", 7),
-        Java13("13", 8),
-        Java14("14", 9),
-        Java15("15", 10),
-        Java16("16", 11),
-        Java17("17", 12),
-        Java18("18", 13);
+        Java6("1.6"),
+        Java7("1.7"),
+        Java8("1.8"),
+        Java9("9"),
+        Java10("10"),
+        Java11("11"),
+        Java12("12"),
+        Java13("13"),
+        Java14("14"),
+        Java15("15"),
+        Java16("16"),
+        Java17("17"),
+        Java18("18"),
+        Java19("19"),
+        Java20("20"),
+        Java21("21");
 
         private String version;
-        private int ordinal;
 
-        JavaVersion(String version, int ordinal) {
+        JavaVersion(String version) {
             this.version = version;
-            this.ordinal = ordinal;
         }
 
         public static JavaVersion from(String version) {
@@ -216,7 +217,7 @@ public class Builder {
         }
 
         public boolean supportsEndorsedAndExtLibraries() {
-            return this.ordinal < Java9.ordinal;
+            return compareTo(Java9) < 0;
         }
     }