[karaf] branch main 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 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 0cf7801  [KARAF-7401] Recognize Java versions up to 18
0cf7801 is described below

commit 0cf780107b252eaed1188c400c1a857d3f7b1c94
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;