Skip to content

Commit 245fd3e

Browse files
committed
generate JDK .properties files up to 24
- using https://github.com/chrisrueger/jdk-packages and https://github.com/bjhargrave/java-platform-packages e.g. ./download_jdk.sh 24 mac aarch64 ./list_jdk_packages_for_bnd.sh 24 mac aarch64 > "JavaSE_24.properties" - compile classes with newer JDKs up to 24 - Update compilerversions.jar (via bnd buildx compilerversions.bnd) - Update MultiReleaseTest.java - add enums for more future JAVA versions - remove properties for JDK 18,20,23 because packages are equal to the prior version - CI Build: remove deprecated security manager - CI Build: build with LTS JDK 21 and JDK23 - CI Build: JDK 24 will come later as it is not supported by gradle yet (maybe in 8.14) Signed-off-by: Christoph Rueger <chrisrueger@gmail.com>
1 parent 0f3651e commit 245fd3e

27 files changed

+2288
-9
lines changed

.github/workflows/cibuild.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ jobs:
4545
os:
4646
- 'ubuntu-latest'
4747
java:
48-
- '20'
48+
- '21'
49+
- '23'
4950
runner:
5051
- '{0}' # 'xvfb-run --auto-servernum {0}'
5152
include:

.github/workflows/rebuild.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,8 @@ jobs:
8888
- 'ubuntu-latest'
8989
java:
9090
- '17'
91-
- '20'
91+
- '21'
92+
- '23'
9293
runner:
9394
- '{0}' # 'xvfb-run --auto-servernum {0}'
9495
name: Rebuild JDK${{ matrix.java }} ${{ matrix.os }}

biz.aQute.bndlib.tests/compilerversions/compile.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,11 @@
3535
# javac --release 17 -cp src src/jdk_17/*.java
3636
# javac --release 18 -cp src src/jdk_18/*.java
3737
# javac --release 19 -cp src src/jdk_19/*.java
38+
# javac --release 20 -cp src src/jdk_20/*.java
39+
# javac --release 21 -cp src src/jdk_21/*.java
40+
# javac --release 22 -cp src src/jdk_22/*.java
41+
# javac --release 23 -cp src src/jdk_23/*.java
42+
# javac --release 24 -cp src src/jdk_24/*.java
3843

3944
# java -jar ../jar/ecj_3.2.2.jar -target 1.1 -source 1.3 -cp src src/eclipse_1_1/*.java
4045
# java -jar ../jar/ecj_3.2.2.jar -target 1.2 -source 1.3 -cp src src/eclipse_1_2/*.java
Binary file not shown.
Binary file not shown.
Binary file not shown.
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package jdk_20;
2+
3+
public class ClassRef {
4+
class Inner {
5+
};
6+
static {
7+
System.out.println(Inner.class);
8+
}
9+
10+
public static void main() {
11+
System.out.println(javax.swing.Box.class);
12+
}
13+
}
Binary file not shown.
Binary file not shown.
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package jdk_21;
2+
3+
public class ClassRef {
4+
class Inner {
5+
};
6+
static {
7+
System.out.println(Inner.class);
8+
}
9+
10+
public static void main() {
11+
System.out.println(javax.swing.Box.class);
12+
}
13+
}
Binary file not shown.
Binary file not shown.
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package jdk_22;
2+
3+
public class ClassRef {
4+
class Inner {
5+
};
6+
static {
7+
System.out.println(Inner.class);
8+
}
9+
10+
public static void main() {
11+
System.out.println(javax.swing.Box.class);
12+
}
13+
}
Binary file not shown.
Binary file not shown.
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package jdk_23;
2+
3+
public class ClassRef {
4+
class Inner {
5+
};
6+
static {
7+
System.out.println(Inner.class);
8+
}
9+
10+
public static void main() {
11+
System.out.println(javax.swing.Box.class);
12+
}
13+
}
Binary file not shown.
Binary file not shown.
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package jdk_24;
2+
3+
public class ClassRef {
4+
class Inner {
5+
};
6+
static {
7+
System.out.println(Inner.class);
8+
}
9+
10+
public static void main() {
11+
System.out.println(javax.swing.Box.class);
12+
}
13+
}

biz.aQute.bndlib.tests/test/test/MultiReleaseTest.java

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -303,12 +303,15 @@ private void testFilters(org.osgi.resource.Resource r, String namespace, List<St
303303
public void testPlainBuilder() throws Exception {
304304
try (Builder builder = new Builder()) {
305305
builder.setProperty(Constants.JPMS_MODULE_INFO, "");
306+
307+
// mainly check LTS JDK releases
306308
builder.setProperty("-includeresource", """
307309
sun_1_8/=compilerversions/src/sun_1_8/, \
308310
META-INF/versions/9/jdk_9_0/=compilerversions/src/jdk_9_0/, \
309311
META-INF/versions/11/jdk_11_0/=compilerversions/src/jdk_11_0/, \
310312
META-INF/versions/17/jdk_17/=compilerversions/src/jdk_17/, \
311-
META-INF/versions/19/jdk_19/=compilerversions/src/jdk_19/, \
313+
META-INF/versions/21/jdk_21/=compilerversions/src/jdk_21/, \
314+
META-INF/versions/24/jdk_24/=compilerversions/src/jdk_24/, \
312315
""");
313316

314317
Jar jar = builder.build();
@@ -323,8 +326,11 @@ public void testPlainBuilder() throws Exception {
323326
assertThat(jar.getResource("META-INF/versions/17/OSGI-INF/MANIFEST.MF")).isNotNull();
324327
assertThat(jar.getResource("META-INF/versions/17/module-info.class")).isNotNull();
325328

326-
assertThat(jar.getResource("META-INF/versions/19/OSGI-INF/MANIFEST.MF")).isNotNull();
327-
assertThat(jar.getResource("META-INF/versions/19/module-info.class")).isNotNull();
329+
assertThat(jar.getResource("META-INF/versions/21/OSGI-INF/MANIFEST.MF")).isNotNull();
330+
assertThat(jar.getResource("META-INF/versions/21/module-info.class")).isNotNull();
331+
332+
assertThat(jar.getResource("META-INF/versions/24/OSGI-INF/MANIFEST.MF")).isNotNull();
333+
assertThat(jar.getResource("META-INF/versions/24/module-info.class")).isNotNull();
328334

329335
}
330336
}

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,12 @@ public enum EE {
7272
JavaSE_22(22),
7373
JavaSE_23(23),
7474
JavaSE_24(24),
75+
JavaSE_25(25),
76+
JavaSE_26(26),
77+
JavaSE_27(27),
78+
JavaSE_28(28),
79+
JavaSE_29(29),
80+
JavaSE_30(30),
7581

7682
UNKNOWN("<UNKNOWN>", "UNKNOWN", "0", 0);
7783

@@ -302,7 +308,8 @@ public static SortedSet<EE> getEEsFromRequirement(String requirement) {
302308
final static EE[] classFileVersionsMinus44 = {
303309
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,
304310
JavaSE_10, JavaSE_11, JavaSE_12, JavaSE_13, JavaSE_14, JavaSE_15, JavaSE_16, JavaSE_17, JavaSE_18, JavaSE_19,
305-
JavaSE_20, JavaSE_21, JavaSE_22, JavaSE_23, JavaSE_24
311+
JavaSE_20, JavaSE_21, JavaSE_22, JavaSE_23, JavaSE_24, JavaSE_25, JavaSE_26, JavaSE_27, JavaSE_28, JavaSE_29,
312+
JavaSE_30
306313
};
307314

308315
/**

0 commit comments

Comments
 (0)