[karaf] branch karaf-4.3.x updated: [KARAF-7401] Recognize Java versions up to 18

[jb...@apache.org]

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

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


The following commit(s) were added to refs/heads/karaf-4.3.x by this push:
     new 3635c02  [KARAF-7401] Recognize Java versions up to 18
     new d2134a17 Merge pull request #1493 from rovarga/karaf7401
3635c02 is described below

commit 3635c02bb7d86b2b4cb612c1099660dc7ea6e60a
Author: Robert Varga <ro...@pantheon.tech>
AuthorDate: Mon Mar 7 10:22:45 2022 +0100

    [KARAF-7401] Recognize Java versions up to 18
    
    javase versions larger than 11 are not recognized, but can be
    encountered when the classese require them. Add constants for up to Java
    18.
    
    Signed-off-by: Robert Varga <ro...@pantheon.tech>
---
 .../java/org/apache/karaf/profile/assembly/Builder.java | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 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 30511b1..14c4b8d 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,12 +184,19 @@ public class Builder {
      * supported versions are defined.</p>
      */
     public enum JavaVersion {
-        Java16("1.6", 1),
-        Java17("1.7", 2),
-        Java18("1.8", 3),
+        Java6("1.6", 1),
+        Java7("1.7", 2),
+        Java8("1.8", 3),
         Java9("9", 4),
         Java10("10", 5),
-        Java11("11", 6);
+        Java11("11", 6),
+        Java12("12", 7),
+        Java13("13", 8),
+        Java14("14", 9),
+        Java15("15", 10),
+        Java16("16", 11),
+        Java17("17", 12),
+        Java18("18", 13);
 
         private String version;
         private int ordinal;
@@ -288,7 +295,7 @@ public class Builder {
     List<String> blacklistedRepositoryURIs = new ArrayList<>();
     BlacklistPolicy blacklistPolicy = BlacklistPolicy.Discard;
     List<String> libraries = new ArrayList<>();
-    JavaVersion javase = JavaVersion.Java18;
+    JavaVersion javase = JavaVersion.Java8;
     KarafVersion karafVersion = KarafVersion.v4x;
     String environment = null;
     boolean useReferenceUrls;