Skip to content

Commit 83ec312

Browse files
authored
Merge pull request #6891 from chrisrueger/future-jdk-version-support
#6858 add enums up to JDK50
2 parents 18db555 + 9572a5a commit 83ec312

2 files changed

Lines changed: 44 additions & 2 deletions

File tree

biz.aQute.bndlib/src/aQute/bnd/build/model/EE.java

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,30 @@ public enum EE {
7878
JavaSE_28(28),
7979
JavaSE_29(29),
8080
JavaSE_30(30),
81+
JavaSE_31(31),
82+
JavaSE_32(32),
83+
JavaSE_33(33),
84+
JavaSE_34(34),
85+
JavaSE_35(35),
86+
JavaSE_36(36),
87+
JavaSE_37(37),
88+
JavaSE_38(38),
89+
JavaSE_39(39),
90+
JavaSE_40(40),
91+
JavaSE_41(41),
92+
JavaSE_42(42),
93+
JavaSE_43(43),
94+
JavaSE_44(44),
95+
JavaSE_45(45),
96+
JavaSE_46(46),
97+
JavaSE_47(47),
98+
JavaSE_48(48),
99+
JavaSE_49(49),
100+
JavaSE_50(50),
81101

82102
UNKNOWN("<UNKNOWN>", "UNKNOWN", "0", 0);
83103

84-
final public static int MAX_SUPPORTED_RELEASE = 24;
104+
final public static int MAX_SUPPORTED_RELEASE = 50;
85105

86106
private final String eeName;
87107
private final String capabilityName;
@@ -309,7 +329,9 @@ public static SortedSet<EE> getEEsFromRequirement(String requirement) {
309329
UNKNOWN, JRE_1_1, J2SE_1_2, J2SE_1_3, J2SE_1_4, J2SE_1_5, JavaSE_1_6, JavaSE_1_7, JavaSE_1_8, JavaSE_9,
310330
JavaSE_10, JavaSE_11, JavaSE_12, JavaSE_13, JavaSE_14, JavaSE_15, JavaSE_16, JavaSE_17, JavaSE_18, JavaSE_19,
311331
JavaSE_20, JavaSE_21, JavaSE_22, JavaSE_23, JavaSE_24, JavaSE_25, JavaSE_26, JavaSE_27, JavaSE_28, JavaSE_29,
312-
JavaSE_30
332+
JavaSE_30, JavaSE_31, JavaSE_32, JavaSE_33, JavaSE_34, JavaSE_35, JavaSE_36, JavaSE_37, JavaSE_38, JavaSE_39,
333+
JavaSE_40, JavaSE_41, JavaSE_42, JavaSE_43, JavaSE_44, JavaSE_45, JavaSE_46, JavaSE_47, JavaSE_48, JavaSE_49,
334+
JavaSE_50
313335
};
314336

315337
/**

biz.aQute.bndlib/src/aQute/bnd/osgi/Clazz.java

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,26 @@ public Map<String, Set<String>> getProfiles() throws IOException {
165165
Java_28,
166166
Java_29,
167167
Java_30,
168+
Java_31,
169+
Java_32,
170+
Java_33,
171+
Java_34,
172+
Java_35,
173+
Java_36,
174+
Java_37,
175+
Java_38,
176+
Java_39,
177+
Java_40,
178+
Java_41,
179+
Java_42,
180+
Java_43,
181+
Java_44,
182+
Java_45,
183+
Java_46,
184+
Java_47,
185+
Java_48,
186+
Java_49,
187+
Java_50,
168188
UNKNOWN(Integer.MAX_VALUE, "<UNKNOWN>", "(osgi.ee=UNKNOWN)");
169189

170190
private final int major;

0 commit comments

Comments
 (0)