diff --git a/.github/workflows/cibuild.yml b/.github/workflows/cibuild.yml
index 99c3a72174..c76f99335e 100644
--- a/.github/workflows/cibuild.yml
+++ b/.github/workflows/cibuild.yml
@@ -45,7 +45,8 @@ jobs:
         os:
         - 'ubuntu-latest'
         java:
-        - '20'
+        - '21'
+        - '23'
         runner:
         - '{0}' # 'xvfb-run --auto-servernum {0}'
         include:
diff --git a/.github/workflows/rebuild.yml b/.github/workflows/rebuild.yml
index 88e2a941ee..9c4a910494 100644
--- a/.github/workflows/rebuild.yml
+++ b/.github/workflows/rebuild.yml
@@ -88,7 +88,8 @@ jobs:
         - 'ubuntu-latest'
         java:
         - '17'
-        - '20'
+        - '21'
+        - '23'
         runner:
         - '{0}' # 'xvfb-run --auto-servernum {0}'
     name: Rebuild JDK${{ matrix.java }} ${{ matrix.os }}
diff --git a/biz.aQute.bndlib.tests/compilerversions/compile.sh b/biz.aQute.bndlib.tests/compilerversions/compile.sh
index 25b4e60a2f..fd6d61058a 100755
--- a/biz.aQute.bndlib.tests/compilerversions/compile.sh
+++ b/biz.aQute.bndlib.tests/compilerversions/compile.sh
@@ -35,6 +35,11 @@
 # javac --release 17 -cp src src/jdk_17/*.java
 # javac --release 18 -cp src src/jdk_18/*.java
 # javac --release 19 -cp src src/jdk_19/*.java
+# javac --release 20 -cp src src/jdk_20/*.java
+# javac --release 21 -cp src src/jdk_21/*.java
+# javac --release 22 -cp src src/jdk_22/*.java
+# javac --release 23 -cp src src/jdk_23/*.java
+# javac --release 24 -cp src src/jdk_24/*.java
 
 # java -jar ../jar/ecj_3.2.2.jar -target 1.1 -source 1.3 -cp src src/eclipse_1_1/*.java
 # java -jar ../jar/ecj_3.2.2.jar -target 1.2 -source 1.3 -cp src src/eclipse_1_2/*.java
diff --git a/biz.aQute.bndlib.tests/compilerversions/compilerversions.jar b/biz.aQute.bndlib.tests/compilerversions/compilerversions.jar
index b0bb9bac27..79044ee1a4 100755
Binary files a/biz.aQute.bndlib.tests/compilerversions/compilerversions.jar and b/biz.aQute.bndlib.tests/compilerversions/compilerversions.jar differ
diff --git a/biz.aQute.bndlib.tests/compilerversions/src/jdk_20/ClassRef$Inner.class b/biz.aQute.bndlib.tests/compilerversions/src/jdk_20/ClassRef$Inner.class
new file mode 100644
index 0000000000..6209f5b567
Binary files /dev/null and b/biz.aQute.bndlib.tests/compilerversions/src/jdk_20/ClassRef$Inner.class differ
diff --git a/biz.aQute.bndlib.tests/compilerversions/src/jdk_20/ClassRef.class b/biz.aQute.bndlib.tests/compilerversions/src/jdk_20/ClassRef.class
new file mode 100644
index 0000000000..6f72377026
Binary files /dev/null and b/biz.aQute.bndlib.tests/compilerversions/src/jdk_20/ClassRef.class differ
diff --git a/biz.aQute.bndlib.tests/compilerversions/src/jdk_20/ClassRef.java b/biz.aQute.bndlib.tests/compilerversions/src/jdk_20/ClassRef.java
new file mode 100644
index 0000000000..4ead1763e3
--- /dev/null
+++ b/biz.aQute.bndlib.tests/compilerversions/src/jdk_20/ClassRef.java
@@ -0,0 +1,13 @@
+package jdk_20;
+
+public class ClassRef {
+	class Inner {
+	};
+	static {
+		System.out.println(Inner.class);
+	}
+	
+	public static void main() {
+		System.out.println(javax.swing.Box.class);
+	}
+}
\ No newline at end of file
diff --git a/biz.aQute.bndlib.tests/compilerversions/src/jdk_21/ClassRef$Inner.class b/biz.aQute.bndlib.tests/compilerversions/src/jdk_21/ClassRef$Inner.class
new file mode 100644
index 0000000000..fe481d1f38
Binary files /dev/null and b/biz.aQute.bndlib.tests/compilerversions/src/jdk_21/ClassRef$Inner.class differ
diff --git a/biz.aQute.bndlib.tests/compilerversions/src/jdk_21/ClassRef.class b/biz.aQute.bndlib.tests/compilerversions/src/jdk_21/ClassRef.class
new file mode 100644
index 0000000000..241099ba8f
Binary files /dev/null and b/biz.aQute.bndlib.tests/compilerversions/src/jdk_21/ClassRef.class differ
diff --git a/biz.aQute.bndlib.tests/compilerversions/src/jdk_21/ClassRef.java b/biz.aQute.bndlib.tests/compilerversions/src/jdk_21/ClassRef.java
new file mode 100644
index 0000000000..56fe7d626f
--- /dev/null
+++ b/biz.aQute.bndlib.tests/compilerversions/src/jdk_21/ClassRef.java
@@ -0,0 +1,13 @@
+package jdk_21;
+
+public class ClassRef {
+	class Inner {
+	};
+	static {
+		System.out.println(Inner.class);
+	}
+	
+	public static void main() {
+		System.out.println(javax.swing.Box.class);
+	}
+}
\ No newline at end of file
diff --git a/biz.aQute.bndlib.tests/compilerversions/src/jdk_22/ClassRef$Inner.class b/biz.aQute.bndlib.tests/compilerversions/src/jdk_22/ClassRef$Inner.class
new file mode 100644
index 0000000000..c63ae7909e
Binary files /dev/null and b/biz.aQute.bndlib.tests/compilerversions/src/jdk_22/ClassRef$Inner.class differ
diff --git a/biz.aQute.bndlib.tests/compilerversions/src/jdk_22/ClassRef.class b/biz.aQute.bndlib.tests/compilerversions/src/jdk_22/ClassRef.class
new file mode 100644
index 0000000000..e36685598a
Binary files /dev/null and b/biz.aQute.bndlib.tests/compilerversions/src/jdk_22/ClassRef.class differ
diff --git a/biz.aQute.bndlib.tests/compilerversions/src/jdk_22/ClassRef.java b/biz.aQute.bndlib.tests/compilerversions/src/jdk_22/ClassRef.java
new file mode 100644
index 0000000000..55eb8013a4
--- /dev/null
+++ b/biz.aQute.bndlib.tests/compilerversions/src/jdk_22/ClassRef.java
@@ -0,0 +1,13 @@
+package jdk_22;
+
+public class ClassRef {
+	class Inner {
+	};
+	static {
+		System.out.println(Inner.class);
+	}
+	
+	public static void main() {
+		System.out.println(javax.swing.Box.class);
+	}
+}
\ No newline at end of file
diff --git a/biz.aQute.bndlib.tests/compilerversions/src/jdk_23/ClassRef$Inner.class b/biz.aQute.bndlib.tests/compilerversions/src/jdk_23/ClassRef$Inner.class
new file mode 100644
index 0000000000..58a5ece9e6
Binary files /dev/null and b/biz.aQute.bndlib.tests/compilerversions/src/jdk_23/ClassRef$Inner.class differ
diff --git a/biz.aQute.bndlib.tests/compilerversions/src/jdk_23/ClassRef.class b/biz.aQute.bndlib.tests/compilerversions/src/jdk_23/ClassRef.class
new file mode 100644
index 0000000000..c6eaeb8e3c
Binary files /dev/null and b/biz.aQute.bndlib.tests/compilerversions/src/jdk_23/ClassRef.class differ
diff --git a/biz.aQute.bndlib.tests/compilerversions/src/jdk_23/ClassRef.java b/biz.aQute.bndlib.tests/compilerversions/src/jdk_23/ClassRef.java
new file mode 100644
index 0000000000..f25fcda779
--- /dev/null
+++ b/biz.aQute.bndlib.tests/compilerversions/src/jdk_23/ClassRef.java
@@ -0,0 +1,13 @@
+package jdk_23;
+
+public class ClassRef {
+	class Inner {
+	};
+	static {
+		System.out.println(Inner.class);
+	}
+	
+	public static void main() {
+		System.out.println(javax.swing.Box.class);
+	}
+}
\ No newline at end of file
diff --git a/biz.aQute.bndlib.tests/compilerversions/src/jdk_24/ClassRef$Inner.class b/biz.aQute.bndlib.tests/compilerversions/src/jdk_24/ClassRef$Inner.class
new file mode 100644
index 0000000000..a9cde575ad
Binary files /dev/null and b/biz.aQute.bndlib.tests/compilerversions/src/jdk_24/ClassRef$Inner.class differ
diff --git a/biz.aQute.bndlib.tests/compilerversions/src/jdk_24/ClassRef.class b/biz.aQute.bndlib.tests/compilerversions/src/jdk_24/ClassRef.class
new file mode 100644
index 0000000000..ee96f63917
Binary files /dev/null and b/biz.aQute.bndlib.tests/compilerversions/src/jdk_24/ClassRef.class differ
diff --git a/biz.aQute.bndlib.tests/compilerversions/src/jdk_24/ClassRef.java b/biz.aQute.bndlib.tests/compilerversions/src/jdk_24/ClassRef.java
new file mode 100644
index 0000000000..dc0704e603
--- /dev/null
+++ b/biz.aQute.bndlib.tests/compilerversions/src/jdk_24/ClassRef.java
@@ -0,0 +1,13 @@
+package jdk_24;
+
+public class ClassRef {
+	class Inner {
+	};
+	static {
+		System.out.println(Inner.class);
+	}
+	
+	public static void main() {
+		System.out.println(javax.swing.Box.class);
+	}
+}
\ No newline at end of file
diff --git a/biz.aQute.bndlib.tests/test/test/MultiReleaseTest.java b/biz.aQute.bndlib.tests/test/test/MultiReleaseTest.java
index a24355def9..4fea181549 100644
--- a/biz.aQute.bndlib.tests/test/test/MultiReleaseTest.java
+++ b/biz.aQute.bndlib.tests/test/test/MultiReleaseTest.java
@@ -303,12 +303,15 @@ private void testFilters(org.osgi.resource.Resource r, String namespace, List<St
 	public void testPlainBuilder() throws Exception {
 		try (Builder builder = new Builder()) {
 			builder.setProperty(Constants.JPMS_MODULE_INFO, "");
+
+			// mainly check LTS JDK releases
 			builder.setProperty("-includeresource", """
 				sun_1_8/=compilerversions/src/sun_1_8/, \
 				META-INF/versions/9/jdk_9_0/=compilerversions/src/jdk_9_0/, \
 				META-INF/versions/11/jdk_11_0/=compilerversions/src/jdk_11_0/, \
 				META-INF/versions/17/jdk_17/=compilerversions/src/jdk_17/, \
-				META-INF/versions/19/jdk_19/=compilerversions/src/jdk_19/, \
+				META-INF/versions/21/jdk_21/=compilerversions/src/jdk_21/, \
+				META-INF/versions/24/jdk_24/=compilerversions/src/jdk_24/, \
 				""");
 
 			Jar jar = builder.build();
@@ -323,8 +326,11 @@ public void testPlainBuilder() throws Exception {
 			assertThat(jar.getResource("META-INF/versions/17/OSGI-INF/MANIFEST.MF")).isNotNull();
 			assertThat(jar.getResource("META-INF/versions/17/module-info.class")).isNotNull();
 
-			assertThat(jar.getResource("META-INF/versions/19/OSGI-INF/MANIFEST.MF")).isNotNull();
-			assertThat(jar.getResource("META-INF/versions/19/module-info.class")).isNotNull();
+			assertThat(jar.getResource("META-INF/versions/21/OSGI-INF/MANIFEST.MF")).isNotNull();
+			assertThat(jar.getResource("META-INF/versions/21/module-info.class")).isNotNull();
+
+			assertThat(jar.getResource("META-INF/versions/24/OSGI-INF/MANIFEST.MF")).isNotNull();
+			assertThat(jar.getResource("META-INF/versions/24/module-info.class")).isNotNull();
 
 		}
 	}
diff --git a/biz.aQute.bndlib/src/aQute/bnd/build/model/EE.java b/biz.aQute.bndlib/src/aQute/bnd/build/model/EE.java
index 217b84961b..bf2abf32a5 100644
--- a/biz.aQute.bndlib/src/aQute/bnd/build/model/EE.java
+++ b/biz.aQute.bndlib/src/aQute/bnd/build/model/EE.java
@@ -72,6 +72,12 @@ public enum EE {
 	JavaSE_22(22),
 	JavaSE_23(23),
 	JavaSE_24(24),
+	JavaSE_25(25),
+	JavaSE_26(26),
+	JavaSE_27(27),
+	JavaSE_28(28),
+	JavaSE_29(29),
+	JavaSE_30(30),
 
 	UNKNOWN("<UNKNOWN>", "UNKNOWN", "0", 0);
 
@@ -302,7 +308,8 @@ public static SortedSet<EE> getEEsFromRequirement(String requirement) {
 	final static EE[] classFileVersionsMinus44 = {
 		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,
 		JavaSE_10, JavaSE_11, JavaSE_12, JavaSE_13, JavaSE_14, JavaSE_15, JavaSE_16, JavaSE_17, JavaSE_18, JavaSE_19,
-		JavaSE_20, JavaSE_21, JavaSE_22, JavaSE_23, JavaSE_24
+		JavaSE_20, JavaSE_21, JavaSE_22, JavaSE_23, JavaSE_24, JavaSE_25, JavaSE_26, JavaSE_27, JavaSE_28, JavaSE_29,
+		JavaSE_30
 	};
 
 	/**
diff --git a/biz.aQute.bndlib/src/aQute/bnd/build/model/JavaSE_19.properties b/biz.aQute.bndlib/src/aQute/bnd/build/model/JavaSE_19.properties
new file mode 100644
index 0000000000..3015a9831f
--- /dev/null
+++ b/biz.aQute.bndlib/src/aQute/bnd/build/model/JavaSE_19.properties
@@ -0,0 +1,544 @@
+org.osgi.framework.system.packages = \
+ com.sun.jarsigner,\
+ com.sun.java.accessibility.util,\
+ com.sun.jdi,\
+ com.sun.jdi.connect,\
+ com.sun.jdi.connect.spi,\
+ com.sun.jdi.event,\
+ com.sun.jdi.request,\
+ com.sun.management,\
+ com.sun.net.httpserver,\
+ com.sun.net.httpserver.spi,\
+ com.sun.nio.file,\
+ com.sun.nio.sctp,\
+ com.sun.security.auth,\
+ com.sun.security.auth.callback,\
+ com.sun.security.auth.login,\
+ com.sun.security.auth.module,\
+ com.sun.security.jgss,\
+ com.sun.source.doctree,\
+ com.sun.source.tree,\
+ com.sun.source.util,\
+ com.sun.tools.attach,\
+ com.sun.tools.attach.spi,\
+ com.sun.tools.javac,\
+ com.sun.tools.jconsole,\
+ java.applet,\
+ java.awt,\
+ java.awt.color,\
+ java.awt.datatransfer,\
+ java.awt.desktop,\
+ java.awt.dnd,\
+ java.awt.event,\
+ java.awt.font,\
+ java.awt.geom,\
+ java.awt.im,\
+ java.awt.im.spi,\
+ java.awt.image,\
+ java.awt.image.renderable,\
+ java.awt.print,\
+ java.beans,\
+ java.beans.beancontext,\
+ java.io,\
+ java.lang,\
+ java.lang.annotation,\
+ java.lang.constant,\
+ java.lang.foreign,\
+ java.lang.instrument,\
+ java.lang.invoke,\
+ java.lang.management,\
+ java.lang.module,\
+ java.lang.ref,\
+ java.lang.reflect,\
+ java.lang.runtime,\
+ java.math,\
+ java.net,\
+ java.net.http,\
+ java.net.spi,\
+ java.nio,\
+ java.nio.channels,\
+ java.nio.channels.spi,\
+ java.nio.charset,\
+ java.nio.charset.spi,\
+ java.nio.file,\
+ java.nio.file.attribute,\
+ java.nio.file.spi,\
+ java.rmi,\
+ java.rmi.dgc,\
+ java.rmi.registry,\
+ java.rmi.server,\
+ java.security,\
+ java.security.cert,\
+ java.security.interfaces,\
+ java.security.spec,\
+ java.sql,\
+ java.text,\
+ java.text.spi,\
+ java.time,\
+ java.time.chrono,\
+ java.time.format,\
+ java.time.temporal,\
+ java.time.zone,\
+ java.util,\
+ java.util.concurrent,\
+ java.util.concurrent.atomic,\
+ java.util.concurrent.locks,\
+ java.util.function,\
+ java.util.jar,\
+ java.util.logging,\
+ java.util.prefs,\
+ java.util.random,\
+ java.util.regex,\
+ java.util.spi,\
+ java.util.stream,\
+ java.util.zip,\
+ javax.accessibility,\
+ javax.annotation.processing,\
+ javax.crypto,\
+ javax.crypto.interfaces,\
+ javax.crypto.spec,\
+ javax.imageio,\
+ javax.imageio.event,\
+ javax.imageio.metadata,\
+ javax.imageio.plugins.bmp,\
+ javax.imageio.plugins.jpeg,\
+ javax.imageio.plugins.tiff,\
+ javax.imageio.spi,\
+ javax.imageio.stream,\
+ javax.lang.model,\
+ javax.lang.model.element,\
+ javax.lang.model.type,\
+ javax.lang.model.util,\
+ javax.management,\
+ javax.management.loading,\
+ javax.management.modelmbean,\
+ javax.management.monitor,\
+ javax.management.openmbean,\
+ javax.management.relation,\
+ javax.management.remote,\
+ javax.management.remote.rmi,\
+ javax.management.timer,\
+ javax.naming,\
+ javax.naming.directory,\
+ javax.naming.event,\
+ javax.naming.ldap,\
+ javax.naming.ldap.spi,\
+ javax.naming.spi,\
+ javax.net,\
+ javax.net.ssl,\
+ javax.print,\
+ javax.print.attribute,\
+ javax.print.attribute.standard,\
+ javax.print.event,\
+ javax.rmi.ssl,\
+ javax.script,\
+ javax.security.auth,\
+ javax.security.auth.callback,\
+ javax.security.auth.kerberos,\
+ javax.security.auth.login,\
+ javax.security.auth.spi,\
+ javax.security.auth.x500,\
+ javax.security.cert,\
+ javax.security.sasl,\
+ javax.smartcardio,\
+ javax.sound.midi,\
+ javax.sound.midi.spi,\
+ javax.sound.sampled,\
+ javax.sound.sampled.spi,\
+ javax.sql,\
+ javax.sql.rowset,\
+ javax.sql.rowset.serial,\
+ javax.sql.rowset.spi,\
+ javax.swing,\
+ javax.swing.border,\
+ javax.swing.colorchooser,\
+ javax.swing.event,\
+ javax.swing.filechooser,\
+ javax.swing.plaf,\
+ javax.swing.plaf.basic,\
+ javax.swing.plaf.metal,\
+ javax.swing.plaf.multi,\
+ javax.swing.plaf.nimbus,\
+ javax.swing.plaf.synth,\
+ javax.swing.table,\
+ javax.swing.text,\
+ javax.swing.text.html,\
+ javax.swing.text.html.parser,\
+ javax.swing.text.rtf,\
+ javax.swing.tree,\
+ javax.swing.undo,\
+ javax.tools,\
+ javax.transaction.xa,\
+ javax.xml,\
+ javax.xml.catalog,\
+ javax.xml.crypto,\
+ javax.xml.crypto.dom,\
+ javax.xml.crypto.dsig,\
+ javax.xml.crypto.dsig.dom,\
+ javax.xml.crypto.dsig.keyinfo,\
+ javax.xml.crypto.dsig.spec,\
+ javax.xml.datatype,\
+ javax.xml.namespace,\
+ javax.xml.parsers,\
+ javax.xml.stream,\
+ javax.xml.stream.events,\
+ javax.xml.stream.util,\
+ javax.xml.transform,\
+ javax.xml.transform.dom,\
+ javax.xml.transform.sax,\
+ javax.xml.transform.stax,\
+ javax.xml.transform.stream,\
+ javax.xml.validation,\
+ javax.xml.xpath,\
+ jdk.dynalink,\
+ jdk.dynalink.beans,\
+ jdk.dynalink.linker,\
+ jdk.dynalink.linker.support,\
+ jdk.dynalink.support,\
+ jdk.javadoc.doclet,\
+ jdk.jfr,\
+ jdk.jfr.consumer,\
+ jdk.jshell,\
+ jdk.jshell.execution,\
+ jdk.jshell.spi,\
+ jdk.jshell.tool,\
+ jdk.management.jfr,\
+ jdk.net,\
+ jdk.nio,\
+ jdk.nio.mapmode,\
+ jdk.security.jarsigner,\
+ jdk.swing.interop,\
+ netscape.javascript,\
+ org.ietf.jgss,\
+ org.w3c.dom,\
+ org.w3c.dom.bootstrap,\
+ org.w3c.dom.css,\
+ org.w3c.dom.events,\
+ org.w3c.dom.html,\
+ org.w3c.dom.ls,\
+ org.w3c.dom.ranges,\
+ org.w3c.dom.stylesheets,\
+ org.w3c.dom.traversal,\
+ org.w3c.dom.views,\
+ org.w3c.dom.xpath,\
+ org.xml.sax,\
+ org.xml.sax.ext,\
+ org.xml.sax.helpers,\
+ sun.misc,\
+ sun.reflect
+
+jpms.modules = \
+ java.base;\
+  exports:List<String>='\
+   java.io,\
+   java.lang,\
+   java.lang.annotation,\
+   java.lang.constant,\
+   java.lang.foreign,\
+   java.lang.invoke,\
+   java.lang.module,\
+   java.lang.ref,\
+   java.lang.reflect,\
+   java.lang.runtime,\
+   java.math,\
+   java.net,\
+   java.net.spi,\
+   java.nio,\
+   java.nio.channels,\
+   java.nio.channels.spi,\
+   java.nio.charset,\
+   java.nio.charset.spi,\
+   java.nio.file,\
+   java.nio.file.attribute,\
+   java.nio.file.spi,\
+   java.security,\
+   java.security.cert,\
+   java.security.interfaces,\
+   java.security.spec,\
+   java.text,\
+   java.text.spi,\
+   java.time,\
+   java.time.chrono,\
+   java.time.format,\
+   java.time.temporal,\
+   java.time.zone,\
+   java.util,\
+   java.util.concurrent,\
+   java.util.concurrent.atomic,\
+   java.util.concurrent.locks,\
+   java.util.function,\
+   java.util.jar,\
+   java.util.random,\
+   java.util.regex,\
+   java.util.spi,\
+   java.util.stream,\
+   java.util.zip,\
+   javax.crypto,\
+   javax.crypto.interfaces,\
+   javax.crypto.spec,\
+   javax.net,\
+   javax.net.ssl,\
+   javax.security.auth,\
+   javax.security.auth.callback,\
+   javax.security.auth.login,\
+   javax.security.auth.spi,\
+   javax.security.auth.x500,\
+   javax.security.cert',\
+ java.compiler;\
+  exports:List<String>='\
+   javax.annotation.processing,\
+   javax.lang.model,\
+   javax.lang.model.element,\
+   javax.lang.model.type,\
+   javax.lang.model.util,\
+   javax.tools',\
+ java.datatransfer;\
+  exports:List<String>='\
+   java.awt.datatransfer',\
+ java.desktop;\
+  exports:List<String>='\
+   java.applet,\
+   java.awt,\
+   java.awt.color,\
+   java.awt.desktop,\
+   java.awt.dnd,\
+   java.awt.event,\
+   java.awt.font,\
+   java.awt.geom,\
+   java.awt.im,\
+   java.awt.im.spi,\
+   java.awt.image,\
+   java.awt.image.renderable,\
+   java.awt.print,\
+   java.beans,\
+   java.beans.beancontext,\
+   javax.accessibility,\
+   javax.imageio,\
+   javax.imageio.event,\
+   javax.imageio.metadata,\
+   javax.imageio.plugins.bmp,\
+   javax.imageio.plugins.jpeg,\
+   javax.imageio.plugins.tiff,\
+   javax.imageio.spi,\
+   javax.imageio.stream,\
+   javax.print,\
+   javax.print.attribute,\
+   javax.print.attribute.standard,\
+   javax.print.event,\
+   javax.sound.midi,\
+   javax.sound.midi.spi,\
+   javax.sound.sampled,\
+   javax.sound.sampled.spi,\
+   javax.swing,\
+   javax.swing.border,\
+   javax.swing.colorchooser,\
+   javax.swing.event,\
+   javax.swing.filechooser,\
+   javax.swing.plaf,\
+   javax.swing.plaf.basic,\
+   javax.swing.plaf.metal,\
+   javax.swing.plaf.multi,\
+   javax.swing.plaf.nimbus,\
+   javax.swing.plaf.synth,\
+   javax.swing.table,\
+   javax.swing.text,\
+   javax.swing.text.html,\
+   javax.swing.text.html.parser,\
+   javax.swing.text.rtf,\
+   javax.swing.tree,\
+   javax.swing.undo',\
+ java.instrument;\
+  exports:List<String>='\
+   java.lang.instrument',\
+ java.logging;\
+  exports:List<String>='\
+   java.util.logging',\
+ java.management;\
+  exports:List<String>='\
+   java.lang.management,\
+   javax.management,\
+   javax.management.loading,\
+   javax.management.modelmbean,\
+   javax.management.monitor,\
+   javax.management.openmbean,\
+   javax.management.relation,\
+   javax.management.remote,\
+   javax.management.timer',\
+ java.management.rmi;\
+  exports:List<String>='\
+   javax.management.remote.rmi',\
+ java.naming;\
+  exports:List<String>='\
+   javax.naming,\
+   javax.naming.directory,\
+   javax.naming.event,\
+   javax.naming.ldap,\
+   javax.naming.ldap.spi,\
+   javax.naming.spi',\
+ java.net.http;\
+  exports:List<String>='\
+   java.net.http',\
+ java.prefs;\
+  exports:List<String>='\
+   java.util.prefs',\
+ java.rmi;\
+  exports:List<String>='\
+   java.rmi,\
+   java.rmi.dgc,\
+   java.rmi.registry,\
+   java.rmi.server,\
+   javax.rmi.ssl',\
+ java.scripting;\
+  exports:List<String>='\
+   javax.script',\
+ java.security.jgss;\
+  exports:List<String>='\
+   javax.security.auth.kerberos,\
+   org.ietf.jgss',\
+ java.security.sasl;\
+  exports:List<String>='\
+   javax.security.sasl',\
+ java.smartcardio;\
+  exports:List<String>='\
+   javax.smartcardio',\
+ java.sql;\
+  exports:List<String>='\
+   java.sql,\
+   javax.sql',\
+ java.sql.rowset;\
+  exports:List<String>='\
+   javax.sql.rowset,\
+   javax.sql.rowset.serial,\
+   javax.sql.rowset.spi',\
+ java.transaction.xa;\
+  exports:List<String>='\
+   javax.transaction.xa',\
+ java.xml;\
+  exports:List<String>='\
+   javax.xml,\
+   javax.xml.catalog,\
+   javax.xml.datatype,\
+   javax.xml.namespace,\
+   javax.xml.parsers,\
+   javax.xml.stream,\
+   javax.xml.stream.events,\
+   javax.xml.stream.util,\
+   javax.xml.transform,\
+   javax.xml.transform.dom,\
+   javax.xml.transform.sax,\
+   javax.xml.transform.stax,\
+   javax.xml.transform.stream,\
+   javax.xml.validation,\
+   javax.xml.xpath,\
+   org.w3c.dom,\
+   org.w3c.dom.bootstrap,\
+   org.w3c.dom.events,\
+   org.w3c.dom.ls,\
+   org.w3c.dom.ranges,\
+   org.w3c.dom.traversal,\
+   org.w3c.dom.views,\
+   org.xml.sax,\
+   org.xml.sax.ext,\
+   org.xml.sax.helpers',\
+ java.xml.crypto;\
+  exports:List<String>='\
+   javax.xml.crypto,\
+   javax.xml.crypto.dom,\
+   javax.xml.crypto.dsig,\
+   javax.xml.crypto.dsig.dom,\
+   javax.xml.crypto.dsig.keyinfo,\
+   javax.xml.crypto.dsig.spec',\
+ jdk.accessibility;\
+  exports:List<String>='\
+   com.sun.java.accessibility.util',\
+ jdk.attach;\
+  exports:List<String>='\
+   com.sun.tools.attach,\
+   com.sun.tools.attach.spi',\
+ jdk.compiler;\
+  exports:List<String>='\
+   com.sun.source.doctree,\
+   com.sun.source.tree,\
+   com.sun.source.util,\
+   com.sun.tools.javac',\
+ jdk.dynalink;\
+  exports:List<String>='\
+   jdk.dynalink,\
+   jdk.dynalink.beans,\
+   jdk.dynalink.linker,\
+   jdk.dynalink.linker.support,\
+   jdk.dynalink.support',\
+ jdk.httpserver;\
+  exports:List<String>='\
+   com.sun.net.httpserver,\
+   com.sun.net.httpserver.spi',\
+ jdk.jartool;\
+  exports:List<String>='\
+   com.sun.jarsigner,\
+   jdk.security.jarsigner',\
+ jdk.javadoc;\
+  exports:List<String>='\
+   jdk.javadoc.doclet',\
+ jdk.jconsole;\
+  exports:List<String>='\
+   com.sun.tools.jconsole',\
+ jdk.jdi;\
+  exports:List<String>='\
+   com.sun.jdi,\
+   com.sun.jdi.connect,\
+   com.sun.jdi.connect.spi,\
+   com.sun.jdi.event,\
+   com.sun.jdi.request',\
+ jdk.jfr;\
+  exports:List<String>='\
+   jdk.jfr,\
+   jdk.jfr.consumer',\
+ jdk.jshell;\
+  exports:List<String>='\
+   jdk.jshell,\
+   jdk.jshell.execution,\
+   jdk.jshell.spi,\
+   jdk.jshell.tool',\
+ jdk.jsobject;\
+  exports:List<String>='\
+   netscape.javascript',\
+ jdk.management;\
+  exports:List<String>='\
+   com.sun.management',\
+ jdk.management.jfr;\
+  exports:List<String>='\
+   jdk.management.jfr',\
+ jdk.net;\
+  exports:List<String>='\
+   jdk.net,\
+   jdk.nio',\
+ jdk.nio.mapmode;\
+  exports:List<String>='\
+   jdk.nio.mapmode',\
+ jdk.sctp;\
+  exports:List<String>='\
+   com.sun.nio.sctp',\
+ jdk.security.auth;\
+  exports:List<String>='\
+   com.sun.security.auth,\
+   com.sun.security.auth.callback,\
+   com.sun.security.auth.login,\
+   com.sun.security.auth.module',\
+ jdk.security.jgss;\
+  exports:List<String>='\
+   com.sun.security.jgss',\
+ jdk.unsupported;\
+  exports:List<String>='\
+   com.sun.nio.file,\
+   sun.misc,\
+   sun.reflect',\
+ jdk.unsupported.desktop;\
+  exports:List<String>='\
+   jdk.swing.interop',\
+ jdk.xml.dom;\
+  exports:List<String>='\
+   org.w3c.dom.css,\
+   org.w3c.dom.html,\
+   org.w3c.dom.stylesheets,\
+   org.w3c.dom.xpath'
+
diff --git a/biz.aQute.bndlib/src/aQute/bnd/build/model/JavaSE_21.properties b/biz.aQute.bndlib/src/aQute/bnd/build/model/JavaSE_21.properties
new file mode 100644
index 0000000000..4caff18782
--- /dev/null
+++ b/biz.aQute.bndlib/src/aQute/bnd/build/model/JavaSE_21.properties
@@ -0,0 +1,542 @@
+org.osgi.framework.system.packages = \
+ com.sun.java.accessibility.util,\
+ com.sun.jdi,\
+ com.sun.jdi.connect,\
+ com.sun.jdi.connect.spi,\
+ com.sun.jdi.event,\
+ com.sun.jdi.request,\
+ com.sun.management,\
+ com.sun.net.httpserver,\
+ com.sun.net.httpserver.spi,\
+ com.sun.nio.file,\
+ com.sun.nio.sctp,\
+ com.sun.security.auth,\
+ com.sun.security.auth.callback,\
+ com.sun.security.auth.login,\
+ com.sun.security.auth.module,\
+ com.sun.security.jgss,\
+ com.sun.source.doctree,\
+ com.sun.source.tree,\
+ com.sun.source.util,\
+ com.sun.tools.attach,\
+ com.sun.tools.attach.spi,\
+ com.sun.tools.javac,\
+ com.sun.tools.jconsole,\
+ java.applet,\
+ java.awt,\
+ java.awt.color,\
+ java.awt.datatransfer,\
+ java.awt.desktop,\
+ java.awt.dnd,\
+ java.awt.event,\
+ java.awt.font,\
+ java.awt.geom,\
+ java.awt.im,\
+ java.awt.im.spi,\
+ java.awt.image,\
+ java.awt.image.renderable,\
+ java.awt.print,\
+ java.beans,\
+ java.beans.beancontext,\
+ java.io,\
+ java.lang,\
+ java.lang.annotation,\
+ java.lang.constant,\
+ java.lang.foreign,\
+ java.lang.instrument,\
+ java.lang.invoke,\
+ java.lang.management,\
+ java.lang.module,\
+ java.lang.ref,\
+ java.lang.reflect,\
+ java.lang.runtime,\
+ java.math,\
+ java.net,\
+ java.net.http,\
+ java.net.spi,\
+ java.nio,\
+ java.nio.channels,\
+ java.nio.channels.spi,\
+ java.nio.charset,\
+ java.nio.charset.spi,\
+ java.nio.file,\
+ java.nio.file.attribute,\
+ java.nio.file.spi,\
+ java.rmi,\
+ java.rmi.dgc,\
+ java.rmi.registry,\
+ java.rmi.server,\
+ java.security,\
+ java.security.cert,\
+ java.security.interfaces,\
+ java.security.spec,\
+ java.sql,\
+ java.text,\
+ java.text.spi,\
+ java.time,\
+ java.time.chrono,\
+ java.time.format,\
+ java.time.temporal,\
+ java.time.zone,\
+ java.util,\
+ java.util.concurrent,\
+ java.util.concurrent.atomic,\
+ java.util.concurrent.locks,\
+ java.util.function,\
+ java.util.jar,\
+ java.util.logging,\
+ java.util.prefs,\
+ java.util.random,\
+ java.util.regex,\
+ java.util.spi,\
+ java.util.stream,\
+ java.util.zip,\
+ javax.accessibility,\
+ javax.annotation.processing,\
+ javax.crypto,\
+ javax.crypto.interfaces,\
+ javax.crypto.spec,\
+ javax.imageio,\
+ javax.imageio.event,\
+ javax.imageio.metadata,\
+ javax.imageio.plugins.bmp,\
+ javax.imageio.plugins.jpeg,\
+ javax.imageio.plugins.tiff,\
+ javax.imageio.spi,\
+ javax.imageio.stream,\
+ javax.lang.model,\
+ javax.lang.model.element,\
+ javax.lang.model.type,\
+ javax.lang.model.util,\
+ javax.management,\
+ javax.management.loading,\
+ javax.management.modelmbean,\
+ javax.management.monitor,\
+ javax.management.openmbean,\
+ javax.management.relation,\
+ javax.management.remote,\
+ javax.management.remote.rmi,\
+ javax.management.timer,\
+ javax.naming,\
+ javax.naming.directory,\
+ javax.naming.event,\
+ javax.naming.ldap,\
+ javax.naming.ldap.spi,\
+ javax.naming.spi,\
+ javax.net,\
+ javax.net.ssl,\
+ javax.print,\
+ javax.print.attribute,\
+ javax.print.attribute.standard,\
+ javax.print.event,\
+ javax.rmi.ssl,\
+ javax.script,\
+ javax.security.auth,\
+ javax.security.auth.callback,\
+ javax.security.auth.kerberos,\
+ javax.security.auth.login,\
+ javax.security.auth.spi,\
+ javax.security.auth.x500,\
+ javax.security.cert,\
+ javax.security.sasl,\
+ javax.smartcardio,\
+ javax.sound.midi,\
+ javax.sound.midi.spi,\
+ javax.sound.sampled,\
+ javax.sound.sampled.spi,\
+ javax.sql,\
+ javax.sql.rowset,\
+ javax.sql.rowset.serial,\
+ javax.sql.rowset.spi,\
+ javax.swing,\
+ javax.swing.border,\
+ javax.swing.colorchooser,\
+ javax.swing.event,\
+ javax.swing.filechooser,\
+ javax.swing.plaf,\
+ javax.swing.plaf.basic,\
+ javax.swing.plaf.metal,\
+ javax.swing.plaf.multi,\
+ javax.swing.plaf.nimbus,\
+ javax.swing.plaf.synth,\
+ javax.swing.table,\
+ javax.swing.text,\
+ javax.swing.text.html,\
+ javax.swing.text.html.parser,\
+ javax.swing.text.rtf,\
+ javax.swing.tree,\
+ javax.swing.undo,\
+ javax.tools,\
+ javax.transaction.xa,\
+ javax.xml,\
+ javax.xml.catalog,\
+ javax.xml.crypto,\
+ javax.xml.crypto.dom,\
+ javax.xml.crypto.dsig,\
+ javax.xml.crypto.dsig.dom,\
+ javax.xml.crypto.dsig.keyinfo,\
+ javax.xml.crypto.dsig.spec,\
+ javax.xml.datatype,\
+ javax.xml.namespace,\
+ javax.xml.parsers,\
+ javax.xml.stream,\
+ javax.xml.stream.events,\
+ javax.xml.stream.util,\
+ javax.xml.transform,\
+ javax.xml.transform.dom,\
+ javax.xml.transform.sax,\
+ javax.xml.transform.stax,\
+ javax.xml.transform.stream,\
+ javax.xml.validation,\
+ javax.xml.xpath,\
+ jdk.dynalink,\
+ jdk.dynalink.beans,\
+ jdk.dynalink.linker,\
+ jdk.dynalink.linker.support,\
+ jdk.dynalink.support,\
+ jdk.javadoc.doclet,\
+ jdk.jfr,\
+ jdk.jfr.consumer,\
+ jdk.jshell,\
+ jdk.jshell.execution,\
+ jdk.jshell.spi,\
+ jdk.jshell.tool,\
+ jdk.management.jfr,\
+ jdk.net,\
+ jdk.nio,\
+ jdk.nio.mapmode,\
+ jdk.security.jarsigner,\
+ jdk.swing.interop,\
+ netscape.javascript,\
+ org.ietf.jgss,\
+ org.w3c.dom,\
+ org.w3c.dom.bootstrap,\
+ org.w3c.dom.css,\
+ org.w3c.dom.events,\
+ org.w3c.dom.html,\
+ org.w3c.dom.ls,\
+ org.w3c.dom.ranges,\
+ org.w3c.dom.stylesheets,\
+ org.w3c.dom.traversal,\
+ org.w3c.dom.views,\
+ org.w3c.dom.xpath,\
+ org.xml.sax,\
+ org.xml.sax.ext,\
+ org.xml.sax.helpers,\
+ sun.misc,\
+ sun.reflect
+
+jpms.modules = \
+ java.base;\
+  exports:List<String>='\
+   java.io,\
+   java.lang,\
+   java.lang.annotation,\
+   java.lang.constant,\
+   java.lang.foreign,\
+   java.lang.invoke,\
+   java.lang.module,\
+   java.lang.ref,\
+   java.lang.reflect,\
+   java.lang.runtime,\
+   java.math,\
+   java.net,\
+   java.net.spi,\
+   java.nio,\
+   java.nio.channels,\
+   java.nio.channels.spi,\
+   java.nio.charset,\
+   java.nio.charset.spi,\
+   java.nio.file,\
+   java.nio.file.attribute,\
+   java.nio.file.spi,\
+   java.security,\
+   java.security.cert,\
+   java.security.interfaces,\
+   java.security.spec,\
+   java.text,\
+   java.text.spi,\
+   java.time,\
+   java.time.chrono,\
+   java.time.format,\
+   java.time.temporal,\
+   java.time.zone,\
+   java.util,\
+   java.util.concurrent,\
+   java.util.concurrent.atomic,\
+   java.util.concurrent.locks,\
+   java.util.function,\
+   java.util.jar,\
+   java.util.random,\
+   java.util.regex,\
+   java.util.spi,\
+   java.util.stream,\
+   java.util.zip,\
+   javax.crypto,\
+   javax.crypto.interfaces,\
+   javax.crypto.spec,\
+   javax.net,\
+   javax.net.ssl,\
+   javax.security.auth,\
+   javax.security.auth.callback,\
+   javax.security.auth.login,\
+   javax.security.auth.spi,\
+   javax.security.auth.x500,\
+   javax.security.cert',\
+ java.compiler;\
+  exports:List<String>='\
+   javax.annotation.processing,\
+   javax.lang.model,\
+   javax.lang.model.element,\
+   javax.lang.model.type,\
+   javax.lang.model.util,\
+   javax.tools',\
+ java.datatransfer;\
+  exports:List<String>='\
+   java.awt.datatransfer',\
+ java.desktop;\
+  exports:List<String>='\
+   java.applet,\
+   java.awt,\
+   java.awt.color,\
+   java.awt.desktop,\
+   java.awt.dnd,\
+   java.awt.event,\
+   java.awt.font,\
+   java.awt.geom,\
+   java.awt.im,\
+   java.awt.im.spi,\
+   java.awt.image,\
+   java.awt.image.renderable,\
+   java.awt.print,\
+   java.beans,\
+   java.beans.beancontext,\
+   javax.accessibility,\
+   javax.imageio,\
+   javax.imageio.event,\
+   javax.imageio.metadata,\
+   javax.imageio.plugins.bmp,\
+   javax.imageio.plugins.jpeg,\
+   javax.imageio.plugins.tiff,\
+   javax.imageio.spi,\
+   javax.imageio.stream,\
+   javax.print,\
+   javax.print.attribute,\
+   javax.print.attribute.standard,\
+   javax.print.event,\
+   javax.sound.midi,\
+   javax.sound.midi.spi,\
+   javax.sound.sampled,\
+   javax.sound.sampled.spi,\
+   javax.swing,\
+   javax.swing.border,\
+   javax.swing.colorchooser,\
+   javax.swing.event,\
+   javax.swing.filechooser,\
+   javax.swing.plaf,\
+   javax.swing.plaf.basic,\
+   javax.swing.plaf.metal,\
+   javax.swing.plaf.multi,\
+   javax.swing.plaf.nimbus,\
+   javax.swing.plaf.synth,\
+   javax.swing.table,\
+   javax.swing.text,\
+   javax.swing.text.html,\
+   javax.swing.text.html.parser,\
+   javax.swing.text.rtf,\
+   javax.swing.tree,\
+   javax.swing.undo',\
+ java.instrument;\
+  exports:List<String>='\
+   java.lang.instrument',\
+ java.logging;\
+  exports:List<String>='\
+   java.util.logging',\
+ java.management;\
+  exports:List<String>='\
+   java.lang.management,\
+   javax.management,\
+   javax.management.loading,\
+   javax.management.modelmbean,\
+   javax.management.monitor,\
+   javax.management.openmbean,\
+   javax.management.relation,\
+   javax.management.remote,\
+   javax.management.timer',\
+ java.management.rmi;\
+  exports:List<String>='\
+   javax.management.remote.rmi',\
+ java.naming;\
+  exports:List<String>='\
+   javax.naming,\
+   javax.naming.directory,\
+   javax.naming.event,\
+   javax.naming.ldap,\
+   javax.naming.ldap.spi,\
+   javax.naming.spi',\
+ java.net.http;\
+  exports:List<String>='\
+   java.net.http',\
+ java.prefs;\
+  exports:List<String>='\
+   java.util.prefs',\
+ java.rmi;\
+  exports:List<String>='\
+   java.rmi,\
+   java.rmi.dgc,\
+   java.rmi.registry,\
+   java.rmi.server,\
+   javax.rmi.ssl',\
+ java.scripting;\
+  exports:List<String>='\
+   javax.script',\
+ java.security.jgss;\
+  exports:List<String>='\
+   javax.security.auth.kerberos,\
+   org.ietf.jgss',\
+ java.security.sasl;\
+  exports:List<String>='\
+   javax.security.sasl',\
+ java.smartcardio;\
+  exports:List<String>='\
+   javax.smartcardio',\
+ java.sql;\
+  exports:List<String>='\
+   java.sql,\
+   javax.sql',\
+ java.sql.rowset;\
+  exports:List<String>='\
+   javax.sql.rowset,\
+   javax.sql.rowset.serial,\
+   javax.sql.rowset.spi',\
+ java.transaction.xa;\
+  exports:List<String>='\
+   javax.transaction.xa',\
+ java.xml;\
+  exports:List<String>='\
+   javax.xml,\
+   javax.xml.catalog,\
+   javax.xml.datatype,\
+   javax.xml.namespace,\
+   javax.xml.parsers,\
+   javax.xml.stream,\
+   javax.xml.stream.events,\
+   javax.xml.stream.util,\
+   javax.xml.transform,\
+   javax.xml.transform.dom,\
+   javax.xml.transform.sax,\
+   javax.xml.transform.stax,\
+   javax.xml.transform.stream,\
+   javax.xml.validation,\
+   javax.xml.xpath,\
+   org.w3c.dom,\
+   org.w3c.dom.bootstrap,\
+   org.w3c.dom.events,\
+   org.w3c.dom.ls,\
+   org.w3c.dom.ranges,\
+   org.w3c.dom.traversal,\
+   org.w3c.dom.views,\
+   org.xml.sax,\
+   org.xml.sax.ext,\
+   org.xml.sax.helpers',\
+ java.xml.crypto;\
+  exports:List<String>='\
+   javax.xml.crypto,\
+   javax.xml.crypto.dom,\
+   javax.xml.crypto.dsig,\
+   javax.xml.crypto.dsig.dom,\
+   javax.xml.crypto.dsig.keyinfo,\
+   javax.xml.crypto.dsig.spec',\
+ jdk.accessibility;\
+  exports:List<String>='\
+   com.sun.java.accessibility.util',\
+ jdk.attach;\
+  exports:List<String>='\
+   com.sun.tools.attach,\
+   com.sun.tools.attach.spi',\
+ jdk.compiler;\
+  exports:List<String>='\
+   com.sun.source.doctree,\
+   com.sun.source.tree,\
+   com.sun.source.util,\
+   com.sun.tools.javac',\
+ jdk.dynalink;\
+  exports:List<String>='\
+   jdk.dynalink,\
+   jdk.dynalink.beans,\
+   jdk.dynalink.linker,\
+   jdk.dynalink.linker.support,\
+   jdk.dynalink.support',\
+ jdk.httpserver;\
+  exports:List<String>='\
+   com.sun.net.httpserver,\
+   com.sun.net.httpserver.spi',\
+ jdk.jartool;\
+  exports:List<String>='\
+   jdk.security.jarsigner',\
+ jdk.javadoc;\
+  exports:List<String>='\
+   jdk.javadoc.doclet',\
+ jdk.jconsole;\
+  exports:List<String>='\
+   com.sun.tools.jconsole',\
+ jdk.jdi;\
+  exports:List<String>='\
+   com.sun.jdi,\
+   com.sun.jdi.connect,\
+   com.sun.jdi.connect.spi,\
+   com.sun.jdi.event,\
+   com.sun.jdi.request',\
+ jdk.jfr;\
+  exports:List<String>='\
+   jdk.jfr,\
+   jdk.jfr.consumer',\
+ jdk.jshell;\
+  exports:List<String>='\
+   jdk.jshell,\
+   jdk.jshell.execution,\
+   jdk.jshell.spi,\
+   jdk.jshell.tool',\
+ jdk.jsobject;\
+  exports:List<String>='\
+   netscape.javascript',\
+ jdk.management;\
+  exports:List<String>='\
+   com.sun.management',\
+ jdk.management.jfr;\
+  exports:List<String>='\
+   jdk.management.jfr',\
+ jdk.net;\
+  exports:List<String>='\
+   jdk.net,\
+   jdk.nio',\
+ jdk.nio.mapmode;\
+  exports:List<String>='\
+   jdk.nio.mapmode',\
+ jdk.sctp;\
+  exports:List<String>='\
+   com.sun.nio.sctp',\
+ jdk.security.auth;\
+  exports:List<String>='\
+   com.sun.security.auth,\
+   com.sun.security.auth.callback,\
+   com.sun.security.auth.login,\
+   com.sun.security.auth.module',\
+ jdk.security.jgss;\
+  exports:List<String>='\
+   com.sun.security.jgss',\
+ jdk.unsupported;\
+  exports:List<String>='\
+   com.sun.nio.file,\
+   sun.misc,\
+   sun.reflect',\
+ jdk.unsupported.desktop;\
+  exports:List<String>='\
+   jdk.swing.interop',\
+ jdk.xml.dom;\
+  exports:List<String>='\
+   org.w3c.dom.css,\
+   org.w3c.dom.html,\
+   org.w3c.dom.stylesheets,\
+   org.w3c.dom.xpath'
+
diff --git a/biz.aQute.bndlib/src/aQute/bnd/build/model/JavaSE_22.properties b/biz.aQute.bndlib/src/aQute/bnd/build/model/JavaSE_22.properties
new file mode 100644
index 0000000000..70cec8369b
--- /dev/null
+++ b/biz.aQute.bndlib/src/aQute/bnd/build/model/JavaSE_22.properties
@@ -0,0 +1,552 @@
+org.osgi.framework.system.packages = \
+ com.sun.java.accessibility.util,\
+ com.sun.jdi,\
+ com.sun.jdi.connect,\
+ com.sun.jdi.connect.spi,\
+ com.sun.jdi.event,\
+ com.sun.jdi.request,\
+ com.sun.management,\
+ com.sun.net.httpserver,\
+ com.sun.net.httpserver.spi,\
+ com.sun.nio.file,\
+ com.sun.nio.sctp,\
+ com.sun.security.auth,\
+ com.sun.security.auth.callback,\
+ com.sun.security.auth.login,\
+ com.sun.security.auth.module,\
+ com.sun.security.jgss,\
+ com.sun.source.doctree,\
+ com.sun.source.tree,\
+ com.sun.source.util,\
+ com.sun.tools.attach,\
+ com.sun.tools.attach.spi,\
+ com.sun.tools.javac,\
+ com.sun.tools.jconsole,\
+ java.applet,\
+ java.awt,\
+ java.awt.color,\
+ java.awt.datatransfer,\
+ java.awt.desktop,\
+ java.awt.dnd,\
+ java.awt.event,\
+ java.awt.font,\
+ java.awt.geom,\
+ java.awt.im,\
+ java.awt.im.spi,\
+ java.awt.image,\
+ java.awt.image.renderable,\
+ java.awt.print,\
+ java.beans,\
+ java.beans.beancontext,\
+ java.io,\
+ java.lang,\
+ java.lang.annotation,\
+ java.lang.classfile,\
+ java.lang.classfile.attribute,\
+ java.lang.classfile.components,\
+ java.lang.classfile.constantpool,\
+ java.lang.classfile.instruction,\
+ java.lang.constant,\
+ java.lang.foreign,\
+ java.lang.instrument,\
+ java.lang.invoke,\
+ java.lang.management,\
+ java.lang.module,\
+ java.lang.ref,\
+ java.lang.reflect,\
+ java.lang.runtime,\
+ java.math,\
+ java.net,\
+ java.net.http,\
+ java.net.spi,\
+ java.nio,\
+ java.nio.channels,\
+ java.nio.channels.spi,\
+ java.nio.charset,\
+ java.nio.charset.spi,\
+ java.nio.file,\
+ java.nio.file.attribute,\
+ java.nio.file.spi,\
+ java.rmi,\
+ java.rmi.dgc,\
+ java.rmi.registry,\
+ java.rmi.server,\
+ java.security,\
+ java.security.cert,\
+ java.security.interfaces,\
+ java.security.spec,\
+ java.sql,\
+ java.text,\
+ java.text.spi,\
+ java.time,\
+ java.time.chrono,\
+ java.time.format,\
+ java.time.temporal,\
+ java.time.zone,\
+ java.util,\
+ java.util.concurrent,\
+ java.util.concurrent.atomic,\
+ java.util.concurrent.locks,\
+ java.util.function,\
+ java.util.jar,\
+ java.util.logging,\
+ java.util.prefs,\
+ java.util.random,\
+ java.util.regex,\
+ java.util.spi,\
+ java.util.stream,\
+ java.util.zip,\
+ javax.accessibility,\
+ javax.annotation.processing,\
+ javax.crypto,\
+ javax.crypto.interfaces,\
+ javax.crypto.spec,\
+ javax.imageio,\
+ javax.imageio.event,\
+ javax.imageio.metadata,\
+ javax.imageio.plugins.bmp,\
+ javax.imageio.plugins.jpeg,\
+ javax.imageio.plugins.tiff,\
+ javax.imageio.spi,\
+ javax.imageio.stream,\
+ javax.lang.model,\
+ javax.lang.model.element,\
+ javax.lang.model.type,\
+ javax.lang.model.util,\
+ javax.management,\
+ javax.management.loading,\
+ javax.management.modelmbean,\
+ javax.management.monitor,\
+ javax.management.openmbean,\
+ javax.management.relation,\
+ javax.management.remote,\
+ javax.management.remote.rmi,\
+ javax.management.timer,\
+ javax.naming,\
+ javax.naming.directory,\
+ javax.naming.event,\
+ javax.naming.ldap,\
+ javax.naming.ldap.spi,\
+ javax.naming.spi,\
+ javax.net,\
+ javax.net.ssl,\
+ javax.print,\
+ javax.print.attribute,\
+ javax.print.attribute.standard,\
+ javax.print.event,\
+ javax.rmi.ssl,\
+ javax.script,\
+ javax.security.auth,\
+ javax.security.auth.callback,\
+ javax.security.auth.kerberos,\
+ javax.security.auth.login,\
+ javax.security.auth.spi,\
+ javax.security.auth.x500,\
+ javax.security.cert,\
+ javax.security.sasl,\
+ javax.smartcardio,\
+ javax.sound.midi,\
+ javax.sound.midi.spi,\
+ javax.sound.sampled,\
+ javax.sound.sampled.spi,\
+ javax.sql,\
+ javax.sql.rowset,\
+ javax.sql.rowset.serial,\
+ javax.sql.rowset.spi,\
+ javax.swing,\
+ javax.swing.border,\
+ javax.swing.colorchooser,\
+ javax.swing.event,\
+ javax.swing.filechooser,\
+ javax.swing.plaf,\
+ javax.swing.plaf.basic,\
+ javax.swing.plaf.metal,\
+ javax.swing.plaf.multi,\
+ javax.swing.plaf.nimbus,\
+ javax.swing.plaf.synth,\
+ javax.swing.table,\
+ javax.swing.text,\
+ javax.swing.text.html,\
+ javax.swing.text.html.parser,\
+ javax.swing.text.rtf,\
+ javax.swing.tree,\
+ javax.swing.undo,\
+ javax.tools,\
+ javax.transaction.xa,\
+ javax.xml,\
+ javax.xml.catalog,\
+ javax.xml.crypto,\
+ javax.xml.crypto.dom,\
+ javax.xml.crypto.dsig,\
+ javax.xml.crypto.dsig.dom,\
+ javax.xml.crypto.dsig.keyinfo,\
+ javax.xml.crypto.dsig.spec,\
+ javax.xml.datatype,\
+ javax.xml.namespace,\
+ javax.xml.parsers,\
+ javax.xml.stream,\
+ javax.xml.stream.events,\
+ javax.xml.stream.util,\
+ javax.xml.transform,\
+ javax.xml.transform.dom,\
+ javax.xml.transform.sax,\
+ javax.xml.transform.stax,\
+ javax.xml.transform.stream,\
+ javax.xml.validation,\
+ javax.xml.xpath,\
+ jdk.dynalink,\
+ jdk.dynalink.beans,\
+ jdk.dynalink.linker,\
+ jdk.dynalink.linker.support,\
+ jdk.dynalink.support,\
+ jdk.javadoc.doclet,\
+ jdk.jfr,\
+ jdk.jfr.consumer,\
+ jdk.jshell,\
+ jdk.jshell.execution,\
+ jdk.jshell.spi,\
+ jdk.jshell.tool,\
+ jdk.management.jfr,\
+ jdk.net,\
+ jdk.nio,\
+ jdk.nio.mapmode,\
+ jdk.security.jarsigner,\
+ jdk.swing.interop,\
+ netscape.javascript,\
+ org.ietf.jgss,\
+ org.w3c.dom,\
+ org.w3c.dom.bootstrap,\
+ org.w3c.dom.css,\
+ org.w3c.dom.events,\
+ org.w3c.dom.html,\
+ org.w3c.dom.ls,\
+ org.w3c.dom.ranges,\
+ org.w3c.dom.stylesheets,\
+ org.w3c.dom.traversal,\
+ org.w3c.dom.views,\
+ org.w3c.dom.xpath,\
+ org.xml.sax,\
+ org.xml.sax.ext,\
+ org.xml.sax.helpers,\
+ sun.misc,\
+ sun.reflect
+
+jpms.modules = \
+ java.base;\
+  exports:List<String>='\
+   java.io,\
+   java.lang,\
+   java.lang.annotation,\
+   java.lang.classfile,\
+   java.lang.classfile.attribute,\
+   java.lang.classfile.components,\
+   java.lang.classfile.constantpool,\
+   java.lang.classfile.instruction,\
+   java.lang.constant,\
+   java.lang.foreign,\
+   java.lang.invoke,\
+   java.lang.module,\
+   java.lang.ref,\
+   java.lang.reflect,\
+   java.lang.runtime,\
+   java.math,\
+   java.net,\
+   java.net.spi,\
+   java.nio,\
+   java.nio.channels,\
+   java.nio.channels.spi,\
+   java.nio.charset,\
+   java.nio.charset.spi,\
+   java.nio.file,\
+   java.nio.file.attribute,\
+   java.nio.file.spi,\
+   java.security,\
+   java.security.cert,\
+   java.security.interfaces,\
+   java.security.spec,\
+   java.text,\
+   java.text.spi,\
+   java.time,\
+   java.time.chrono,\
+   java.time.format,\
+   java.time.temporal,\
+   java.time.zone,\
+   java.util,\
+   java.util.concurrent,\
+   java.util.concurrent.atomic,\
+   java.util.concurrent.locks,\
+   java.util.function,\
+   java.util.jar,\
+   java.util.random,\
+   java.util.regex,\
+   java.util.spi,\
+   java.util.stream,\
+   java.util.zip,\
+   javax.crypto,\
+   javax.crypto.interfaces,\
+   javax.crypto.spec,\
+   javax.net,\
+   javax.net.ssl,\
+   javax.security.auth,\
+   javax.security.auth.callback,\
+   javax.security.auth.login,\
+   javax.security.auth.spi,\
+   javax.security.auth.x500,\
+   javax.security.cert',\
+ java.compiler;\
+  exports:List<String>='\
+   javax.annotation.processing,\
+   javax.lang.model,\
+   javax.lang.model.element,\
+   javax.lang.model.type,\
+   javax.lang.model.util,\
+   javax.tools',\
+ java.datatransfer;\
+  exports:List<String>='\
+   java.awt.datatransfer',\
+ java.desktop;\
+  exports:List<String>='\
+   java.applet,\
+   java.awt,\
+   java.awt.color,\
+   java.awt.desktop,\
+   java.awt.dnd,\
+   java.awt.event,\
+   java.awt.font,\
+   java.awt.geom,\
+   java.awt.im,\
+   java.awt.im.spi,\
+   java.awt.image,\
+   java.awt.image.renderable,\
+   java.awt.print,\
+   java.beans,\
+   java.beans.beancontext,\
+   javax.accessibility,\
+   javax.imageio,\
+   javax.imageio.event,\
+   javax.imageio.metadata,\
+   javax.imageio.plugins.bmp,\
+   javax.imageio.plugins.jpeg,\
+   javax.imageio.plugins.tiff,\
+   javax.imageio.spi,\
+   javax.imageio.stream,\
+   javax.print,\
+   javax.print.attribute,\
+   javax.print.attribute.standard,\
+   javax.print.event,\
+   javax.sound.midi,\
+   javax.sound.midi.spi,\
+   javax.sound.sampled,\
+   javax.sound.sampled.spi,\
+   javax.swing,\
+   javax.swing.border,\
+   javax.swing.colorchooser,\
+   javax.swing.event,\
+   javax.swing.filechooser,\
+   javax.swing.plaf,\
+   javax.swing.plaf.basic,\
+   javax.swing.plaf.metal,\
+   javax.swing.plaf.multi,\
+   javax.swing.plaf.nimbus,\
+   javax.swing.plaf.synth,\
+   javax.swing.table,\
+   javax.swing.text,\
+   javax.swing.text.html,\
+   javax.swing.text.html.parser,\
+   javax.swing.text.rtf,\
+   javax.swing.tree,\
+   javax.swing.undo',\
+ java.instrument;\
+  exports:List<String>='\
+   java.lang.instrument',\
+ java.logging;\
+  exports:List<String>='\
+   java.util.logging',\
+ java.management;\
+  exports:List<String>='\
+   java.lang.management,\
+   javax.management,\
+   javax.management.loading,\
+   javax.management.modelmbean,\
+   javax.management.monitor,\
+   javax.management.openmbean,\
+   javax.management.relation,\
+   javax.management.remote,\
+   javax.management.timer',\
+ java.management.rmi;\
+  exports:List<String>='\
+   javax.management.remote.rmi',\
+ java.naming;\
+  exports:List<String>='\
+   javax.naming,\
+   javax.naming.directory,\
+   javax.naming.event,\
+   javax.naming.ldap,\
+   javax.naming.ldap.spi,\
+   javax.naming.spi',\
+ java.net.http;\
+  exports:List<String>='\
+   java.net.http',\
+ java.prefs;\
+  exports:List<String>='\
+   java.util.prefs',\
+ java.rmi;\
+  exports:List<String>='\
+   java.rmi,\
+   java.rmi.dgc,\
+   java.rmi.registry,\
+   java.rmi.server,\
+   javax.rmi.ssl',\
+ java.scripting;\
+  exports:List<String>='\
+   javax.script',\
+ java.security.jgss;\
+  exports:List<String>='\
+   javax.security.auth.kerberos,\
+   org.ietf.jgss',\
+ java.security.sasl;\
+  exports:List<String>='\
+   javax.security.sasl',\
+ java.smartcardio;\
+  exports:List<String>='\
+   javax.smartcardio',\
+ java.sql;\
+  exports:List<String>='\
+   java.sql,\
+   javax.sql',\
+ java.sql.rowset;\
+  exports:List<String>='\
+   javax.sql.rowset,\
+   javax.sql.rowset.serial,\
+   javax.sql.rowset.spi',\
+ java.transaction.xa;\
+  exports:List<String>='\
+   javax.transaction.xa',\
+ java.xml;\
+  exports:List<String>='\
+   javax.xml,\
+   javax.xml.catalog,\
+   javax.xml.datatype,\
+   javax.xml.namespace,\
+   javax.xml.parsers,\
+   javax.xml.stream,\
+   javax.xml.stream.events,\
+   javax.xml.stream.util,\
+   javax.xml.transform,\
+   javax.xml.transform.dom,\
+   javax.xml.transform.sax,\
+   javax.xml.transform.stax,\
+   javax.xml.transform.stream,\
+   javax.xml.validation,\
+   javax.xml.xpath,\
+   org.w3c.dom,\
+   org.w3c.dom.bootstrap,\
+   org.w3c.dom.events,\
+   org.w3c.dom.ls,\
+   org.w3c.dom.ranges,\
+   org.w3c.dom.traversal,\
+   org.w3c.dom.views,\
+   org.xml.sax,\
+   org.xml.sax.ext,\
+   org.xml.sax.helpers',\
+ java.xml.crypto;\
+  exports:List<String>='\
+   javax.xml.crypto,\
+   javax.xml.crypto.dom,\
+   javax.xml.crypto.dsig,\
+   javax.xml.crypto.dsig.dom,\
+   javax.xml.crypto.dsig.keyinfo,\
+   javax.xml.crypto.dsig.spec',\
+ jdk.accessibility;\
+  exports:List<String>='\
+   com.sun.java.accessibility.util',\
+ jdk.attach;\
+  exports:List<String>='\
+   com.sun.tools.attach,\
+   com.sun.tools.attach.spi',\
+ jdk.compiler;\
+  exports:List<String>='\
+   com.sun.source.doctree,\
+   com.sun.source.tree,\
+   com.sun.source.util,\
+   com.sun.tools.javac',\
+ jdk.dynalink;\
+  exports:List<String>='\
+   jdk.dynalink,\
+   jdk.dynalink.beans,\
+   jdk.dynalink.linker,\
+   jdk.dynalink.linker.support,\
+   jdk.dynalink.support',\
+ jdk.httpserver;\
+  exports:List<String>='\
+   com.sun.net.httpserver,\
+   com.sun.net.httpserver.spi',\
+ jdk.jartool;\
+  exports:List<String>='\
+   jdk.security.jarsigner',\
+ jdk.javadoc;\
+  exports:List<String>='\
+   jdk.javadoc.doclet',\
+ jdk.jconsole;\
+  exports:List<String>='\
+   com.sun.tools.jconsole',\
+ jdk.jdi;\
+  exports:List<String>='\
+   com.sun.jdi,\
+   com.sun.jdi.connect,\
+   com.sun.jdi.connect.spi,\
+   com.sun.jdi.event,\
+   com.sun.jdi.request',\
+ jdk.jfr;\
+  exports:List<String>='\
+   jdk.jfr,\
+   jdk.jfr.consumer',\
+ jdk.jshell;\
+  exports:List<String>='\
+   jdk.jshell,\
+   jdk.jshell.execution,\
+   jdk.jshell.spi,\
+   jdk.jshell.tool',\
+ jdk.jsobject;\
+  exports:List<String>='\
+   netscape.javascript',\
+ jdk.management;\
+  exports:List<String>='\
+   com.sun.management',\
+ jdk.management.jfr;\
+  exports:List<String>='\
+   jdk.management.jfr',\
+ jdk.net;\
+  exports:List<String>='\
+   jdk.net,\
+   jdk.nio',\
+ jdk.nio.mapmode;\
+  exports:List<String>='\
+   jdk.nio.mapmode',\
+ jdk.sctp;\
+  exports:List<String>='\
+   com.sun.nio.sctp',\
+ jdk.security.auth;\
+  exports:List<String>='\
+   com.sun.security.auth,\
+   com.sun.security.auth.callback,\
+   com.sun.security.auth.login,\
+   com.sun.security.auth.module',\
+ jdk.security.jgss;\
+  exports:List<String>='\
+   com.sun.security.jgss',\
+ jdk.unsupported;\
+  exports:List<String>='\
+   com.sun.nio.file,\
+   sun.misc,\
+   sun.reflect',\
+ jdk.unsupported.desktop;\
+  exports:List<String>='\
+   jdk.swing.interop',\
+ jdk.xml.dom;\
+  exports:List<String>='\
+   org.w3c.dom.css,\
+   org.w3c.dom.html,\
+   org.w3c.dom.stylesheets,\
+   org.w3c.dom.xpath'
+
diff --git a/biz.aQute.bndlib/src/aQute/bnd/build/model/JavaSE_24.properties b/biz.aQute.bndlib/src/aQute/bnd/build/model/JavaSE_24.properties
new file mode 100644
index 0000000000..69745754bd
--- /dev/null
+++ b/biz.aQute.bndlib/src/aQute/bnd/build/model/JavaSE_24.properties
@@ -0,0 +1,552 @@
+org.osgi.framework.system.packages = \
+ com.sun.java.accessibility.util,\
+ com.sun.jdi,\
+ com.sun.jdi.connect,\
+ com.sun.jdi.connect.spi,\
+ com.sun.jdi.event,\
+ com.sun.jdi.request,\
+ com.sun.management,\
+ com.sun.net.httpserver,\
+ com.sun.net.httpserver.spi,\
+ com.sun.nio.file,\
+ com.sun.nio.sctp,\
+ com.sun.security.auth,\
+ com.sun.security.auth.callback,\
+ com.sun.security.auth.login,\
+ com.sun.security.auth.module,\
+ com.sun.security.jgss,\
+ com.sun.source.doctree,\
+ com.sun.source.tree,\
+ com.sun.source.util,\
+ com.sun.tools.attach,\
+ com.sun.tools.attach.spi,\
+ com.sun.tools.javac,\
+ com.sun.tools.jconsole,\
+ java.applet,\
+ java.awt,\
+ java.awt.color,\
+ java.awt.datatransfer,\
+ java.awt.desktop,\
+ java.awt.dnd,\
+ java.awt.event,\
+ java.awt.font,\
+ java.awt.geom,\
+ java.awt.im,\
+ java.awt.im.spi,\
+ java.awt.image,\
+ java.awt.image.renderable,\
+ java.awt.print,\
+ java.beans,\
+ java.beans.beancontext,\
+ java.io,\
+ java.lang,\
+ java.lang.annotation,\
+ java.lang.classfile,\
+ java.lang.classfile.attribute,\
+ java.lang.classfile.constantpool,\
+ java.lang.classfile.instruction,\
+ java.lang.constant,\
+ java.lang.foreign,\
+ java.lang.instrument,\
+ java.lang.invoke,\
+ java.lang.management,\
+ java.lang.module,\
+ java.lang.ref,\
+ java.lang.reflect,\
+ java.lang.runtime,\
+ java.math,\
+ java.net,\
+ java.net.http,\
+ java.net.spi,\
+ java.nio,\
+ java.nio.channels,\
+ java.nio.channels.spi,\
+ java.nio.charset,\
+ java.nio.charset.spi,\
+ java.nio.file,\
+ java.nio.file.attribute,\
+ java.nio.file.spi,\
+ java.rmi,\
+ java.rmi.dgc,\
+ java.rmi.registry,\
+ java.rmi.server,\
+ java.security,\
+ java.security.cert,\
+ java.security.interfaces,\
+ java.security.spec,\
+ java.sql,\
+ java.text,\
+ java.text.spi,\
+ java.time,\
+ java.time.chrono,\
+ java.time.format,\
+ java.time.temporal,\
+ java.time.zone,\
+ java.util,\
+ java.util.concurrent,\
+ java.util.concurrent.atomic,\
+ java.util.concurrent.locks,\
+ java.util.function,\
+ java.util.jar,\
+ java.util.logging,\
+ java.util.prefs,\
+ java.util.random,\
+ java.util.regex,\
+ java.util.spi,\
+ java.util.stream,\
+ java.util.zip,\
+ javax.accessibility,\
+ javax.annotation.processing,\
+ javax.crypto,\
+ javax.crypto.interfaces,\
+ javax.crypto.spec,\
+ javax.imageio,\
+ javax.imageio.event,\
+ javax.imageio.metadata,\
+ javax.imageio.plugins.bmp,\
+ javax.imageio.plugins.jpeg,\
+ javax.imageio.plugins.tiff,\
+ javax.imageio.spi,\
+ javax.imageio.stream,\
+ javax.lang.model,\
+ javax.lang.model.element,\
+ javax.lang.model.type,\
+ javax.lang.model.util,\
+ javax.management,\
+ javax.management.loading,\
+ javax.management.modelmbean,\
+ javax.management.monitor,\
+ javax.management.openmbean,\
+ javax.management.relation,\
+ javax.management.remote,\
+ javax.management.remote.rmi,\
+ javax.management.timer,\
+ javax.naming,\
+ javax.naming.directory,\
+ javax.naming.event,\
+ javax.naming.ldap,\
+ javax.naming.ldap.spi,\
+ javax.naming.spi,\
+ javax.net,\
+ javax.net.ssl,\
+ javax.print,\
+ javax.print.attribute,\
+ javax.print.attribute.standard,\
+ javax.print.event,\
+ javax.rmi.ssl,\
+ javax.script,\
+ javax.security.auth,\
+ javax.security.auth.callback,\
+ javax.security.auth.kerberos,\
+ javax.security.auth.login,\
+ javax.security.auth.spi,\
+ javax.security.auth.x500,\
+ javax.security.cert,\
+ javax.security.sasl,\
+ javax.smartcardio,\
+ javax.sound.midi,\
+ javax.sound.midi.spi,\
+ javax.sound.sampled,\
+ javax.sound.sampled.spi,\
+ javax.sql,\
+ javax.sql.rowset,\
+ javax.sql.rowset.serial,\
+ javax.sql.rowset.spi,\
+ javax.swing,\
+ javax.swing.border,\
+ javax.swing.colorchooser,\
+ javax.swing.event,\
+ javax.swing.filechooser,\
+ javax.swing.plaf,\
+ javax.swing.plaf.basic,\
+ javax.swing.plaf.metal,\
+ javax.swing.plaf.multi,\
+ javax.swing.plaf.nimbus,\
+ javax.swing.plaf.synth,\
+ javax.swing.table,\
+ javax.swing.text,\
+ javax.swing.text.html,\
+ javax.swing.text.html.parser,\
+ javax.swing.text.rtf,\
+ javax.swing.tree,\
+ javax.swing.undo,\
+ javax.tools,\
+ javax.transaction.xa,\
+ javax.xml,\
+ javax.xml.catalog,\
+ javax.xml.crypto,\
+ javax.xml.crypto.dom,\
+ javax.xml.crypto.dsig,\
+ javax.xml.crypto.dsig.dom,\
+ javax.xml.crypto.dsig.keyinfo,\
+ javax.xml.crypto.dsig.spec,\
+ javax.xml.datatype,\
+ javax.xml.namespace,\
+ javax.xml.parsers,\
+ javax.xml.stream,\
+ javax.xml.stream.events,\
+ javax.xml.stream.util,\
+ javax.xml.transform,\
+ javax.xml.transform.dom,\
+ javax.xml.transform.sax,\
+ javax.xml.transform.stax,\
+ javax.xml.transform.stream,\
+ javax.xml.validation,\
+ javax.xml.xpath,\
+ jdk.dynalink,\
+ jdk.dynalink.beans,\
+ jdk.dynalink.linker,\
+ jdk.dynalink.linker.support,\
+ jdk.dynalink.support,\
+ jdk.javadoc.doclet,\
+ jdk.jfr,\
+ jdk.jfr.consumer,\
+ jdk.jshell,\
+ jdk.jshell.execution,\
+ jdk.jshell.spi,\
+ jdk.jshell.tool,\
+ jdk.management,\
+ jdk.management.jfr,\
+ jdk.net,\
+ jdk.nio,\
+ jdk.nio.mapmode,\
+ jdk.security.jarsigner,\
+ jdk.swing.interop,\
+ netscape.javascript,\
+ org.ietf.jgss,\
+ org.w3c.dom,\
+ org.w3c.dom.bootstrap,\
+ org.w3c.dom.css,\
+ org.w3c.dom.events,\
+ org.w3c.dom.html,\
+ org.w3c.dom.ls,\
+ org.w3c.dom.ranges,\
+ org.w3c.dom.stylesheets,\
+ org.w3c.dom.traversal,\
+ org.w3c.dom.views,\
+ org.w3c.dom.xpath,\
+ org.xml.sax,\
+ org.xml.sax.ext,\
+ org.xml.sax.helpers,\
+ sun.misc,\
+ sun.reflect
+
+jpms.modules = \
+ java.base;\
+  exports:List<String>='\
+   java.io,\
+   java.lang,\
+   java.lang.annotation,\
+   java.lang.classfile,\
+   java.lang.classfile.attribute,\
+   java.lang.classfile.constantpool,\
+   java.lang.classfile.instruction,\
+   java.lang.constant,\
+   java.lang.foreign,\
+   java.lang.invoke,\
+   java.lang.module,\
+   java.lang.ref,\
+   java.lang.reflect,\
+   java.lang.runtime,\
+   java.math,\
+   java.net,\
+   java.net.spi,\
+   java.nio,\
+   java.nio.channels,\
+   java.nio.channels.spi,\
+   java.nio.charset,\
+   java.nio.charset.spi,\
+   java.nio.file,\
+   java.nio.file.attribute,\
+   java.nio.file.spi,\
+   java.security,\
+   java.security.cert,\
+   java.security.interfaces,\
+   java.security.spec,\
+   java.text,\
+   java.text.spi,\
+   java.time,\
+   java.time.chrono,\
+   java.time.format,\
+   java.time.temporal,\
+   java.time.zone,\
+   java.util,\
+   java.util.concurrent,\
+   java.util.concurrent.atomic,\
+   java.util.concurrent.locks,\
+   java.util.function,\
+   java.util.jar,\
+   java.util.random,\
+   java.util.regex,\
+   java.util.spi,\
+   java.util.stream,\
+   java.util.zip,\
+   javax.crypto,\
+   javax.crypto.interfaces,\
+   javax.crypto.spec,\
+   javax.net,\
+   javax.net.ssl,\
+   javax.security.auth,\
+   javax.security.auth.callback,\
+   javax.security.auth.login,\
+   javax.security.auth.spi,\
+   javax.security.auth.x500,\
+   javax.security.cert',\
+ java.compiler;\
+  exports:List<String>='\
+   javax.annotation.processing,\
+   javax.lang.model,\
+   javax.lang.model.element,\
+   javax.lang.model.type,\
+   javax.lang.model.util,\
+   javax.tools',\
+ java.datatransfer;\
+  exports:List<String>='\
+   java.awt.datatransfer',\
+ java.desktop;\
+  exports:List<String>='\
+   java.applet,\
+   java.awt,\
+   java.awt.color,\
+   java.awt.desktop,\
+   java.awt.dnd,\
+   java.awt.event,\
+   java.awt.font,\
+   java.awt.geom,\
+   java.awt.im,\
+   java.awt.im.spi,\
+   java.awt.image,\
+   java.awt.image.renderable,\
+   java.awt.print,\
+   java.beans,\
+   java.beans.beancontext,\
+   javax.accessibility,\
+   javax.imageio,\
+   javax.imageio.event,\
+   javax.imageio.metadata,\
+   javax.imageio.plugins.bmp,\
+   javax.imageio.plugins.jpeg,\
+   javax.imageio.plugins.tiff,\
+   javax.imageio.spi,\
+   javax.imageio.stream,\
+   javax.print,\
+   javax.print.attribute,\
+   javax.print.attribute.standard,\
+   javax.print.event,\
+   javax.sound.midi,\
+   javax.sound.midi.spi,\
+   javax.sound.sampled,\
+   javax.sound.sampled.spi,\
+   javax.swing,\
+   javax.swing.border,\
+   javax.swing.colorchooser,\
+   javax.swing.event,\
+   javax.swing.filechooser,\
+   javax.swing.plaf,\
+   javax.swing.plaf.basic,\
+   javax.swing.plaf.metal,\
+   javax.swing.plaf.multi,\
+   javax.swing.plaf.nimbus,\
+   javax.swing.plaf.synth,\
+   javax.swing.table,\
+   javax.swing.text,\
+   javax.swing.text.html,\
+   javax.swing.text.html.parser,\
+   javax.swing.text.rtf,\
+   javax.swing.tree,\
+   javax.swing.undo',\
+ java.instrument;\
+  exports:List<String>='\
+   java.lang.instrument',\
+ java.logging;\
+  exports:List<String>='\
+   java.util.logging',\
+ java.management;\
+  exports:List<String>='\
+   java.lang.management,\
+   javax.management,\
+   javax.management.loading,\
+   javax.management.modelmbean,\
+   javax.management.monitor,\
+   javax.management.openmbean,\
+   javax.management.relation,\
+   javax.management.remote,\
+   javax.management.timer',\
+ java.management.rmi;\
+  exports:List<String>='\
+   javax.management.remote.rmi',\
+ java.naming;\
+  exports:List<String>='\
+   javax.naming,\
+   javax.naming.directory,\
+   javax.naming.event,\
+   javax.naming.ldap,\
+   javax.naming.ldap.spi,\
+   javax.naming.spi',\
+ java.net.http;\
+  exports:List<String>='\
+   java.net.http',\
+ java.prefs;\
+  exports:List<String>='\
+   java.util.prefs',\
+ java.rmi;\
+  exports:List<String>='\
+   java.rmi,\
+   java.rmi.dgc,\
+   java.rmi.registry,\
+   java.rmi.server,\
+   javax.rmi.ssl',\
+ java.scripting;\
+  exports:List<String>='\
+   javax.script',\
+ java.security.jgss;\
+  exports:List<String>='\
+   javax.security.auth.kerberos,\
+   org.ietf.jgss',\
+ java.security.sasl;\
+  exports:List<String>='\
+   javax.security.sasl',\
+ java.smartcardio;\
+  exports:List<String>='\
+   javax.smartcardio',\
+ java.sql;\
+  exports:List<String>='\
+   java.sql,\
+   javax.sql',\
+ java.sql.rowset;\
+  exports:List<String>='\
+   javax.sql.rowset,\
+   javax.sql.rowset.serial,\
+   javax.sql.rowset.spi',\
+ java.transaction.xa;\
+  exports:List<String>='\
+   javax.transaction.xa',\
+ java.xml;\
+  exports:List<String>='\
+   javax.xml,\
+   javax.xml.catalog,\
+   javax.xml.datatype,\
+   javax.xml.namespace,\
+   javax.xml.parsers,\
+   javax.xml.stream,\
+   javax.xml.stream.events,\
+   javax.xml.stream.util,\
+   javax.xml.transform,\
+   javax.xml.transform.dom,\
+   javax.xml.transform.sax,\
+   javax.xml.transform.stax,\
+   javax.xml.transform.stream,\
+   javax.xml.validation,\
+   javax.xml.xpath,\
+   org.w3c.dom,\
+   org.w3c.dom.bootstrap,\
+   org.w3c.dom.events,\
+   org.w3c.dom.ls,\
+   org.w3c.dom.ranges,\
+   org.w3c.dom.traversal,\
+   org.w3c.dom.views,\
+   org.xml.sax,\
+   org.xml.sax.ext,\
+   org.xml.sax.helpers',\
+ java.xml.crypto;\
+  exports:List<String>='\
+   javax.xml.crypto,\
+   javax.xml.crypto.dom,\
+   javax.xml.crypto.dsig,\
+   javax.xml.crypto.dsig.dom,\
+   javax.xml.crypto.dsig.keyinfo,\
+   javax.xml.crypto.dsig.spec',\
+ jdk.accessibility;\
+  exports:List<String>='\
+   com.sun.java.accessibility.util',\
+ jdk.attach;\
+  exports:List<String>='\
+   com.sun.tools.attach,\
+   com.sun.tools.attach.spi',\
+ jdk.compiler;\
+  exports:List<String>='\
+   com.sun.source.doctree,\
+   com.sun.source.tree,\
+   com.sun.source.util,\
+   com.sun.tools.javac',\
+ jdk.dynalink;\
+  exports:List<String>='\
+   jdk.dynalink,\
+   jdk.dynalink.beans,\
+   jdk.dynalink.linker,\
+   jdk.dynalink.linker.support,\
+   jdk.dynalink.support',\
+ jdk.httpserver;\
+  exports:List<String>='\
+   com.sun.net.httpserver,\
+   com.sun.net.httpserver.spi',\
+ jdk.jartool;\
+  exports:List<String>='\
+   jdk.security.jarsigner',\
+ jdk.javadoc;\
+  exports:List<String>='\
+   jdk.javadoc.doclet',\
+ jdk.jconsole;\
+  exports:List<String>='\
+   com.sun.tools.jconsole',\
+ jdk.jdi;\
+  exports:List<String>='\
+   com.sun.jdi,\
+   com.sun.jdi.connect,\
+   com.sun.jdi.connect.spi,\
+   com.sun.jdi.event,\
+   com.sun.jdi.request',\
+ jdk.jfr;\
+  exports:List<String>='\
+   jdk.jfr,\
+   jdk.jfr.consumer',\
+ jdk.jshell;\
+  exports:List<String>='\
+   jdk.jshell,\
+   jdk.jshell.execution,\
+   jdk.jshell.spi,\
+   jdk.jshell.tool',\
+ jdk.jsobject;\
+  exports:List<String>='\
+   netscape.javascript',\
+ jdk.management;\
+  exports:List<String>='\
+   com.sun.management,\
+   jdk.management',\
+ jdk.management.jfr;\
+  exports:List<String>='\
+   jdk.management.jfr',\
+ jdk.net;\
+  exports:List<String>='\
+   jdk.net,\
+   jdk.nio',\
+ jdk.nio.mapmode;\
+  exports:List<String>='\
+   jdk.nio.mapmode',\
+ jdk.sctp;\
+  exports:List<String>='\
+   com.sun.nio.sctp',\
+ jdk.security.auth;\
+  exports:List<String>='\
+   com.sun.security.auth,\
+   com.sun.security.auth.callback,\
+   com.sun.security.auth.login,\
+   com.sun.security.auth.module',\
+ jdk.security.jgss;\
+  exports:List<String>='\
+   com.sun.security.jgss',\
+ jdk.unsupported;\
+  exports:List<String>='\
+   com.sun.nio.file,\
+   sun.misc,\
+   sun.reflect',\
+ jdk.unsupported.desktop;\
+  exports:List<String>='\
+   jdk.swing.interop',\
+ jdk.xml.dom;\
+  exports:List<String>='\
+   org.w3c.dom.css,\
+   org.w3c.dom.html,\
+   org.w3c.dom.stylesheets,\
+   org.w3c.dom.xpath'
+
diff --git a/biz.aQute.bndlib/src/aQute/bnd/osgi/Clazz.java b/biz.aQute.bndlib/src/aQute/bnd/osgi/Clazz.java
index 7f662bf96d..977cb0afa1 100644
--- a/biz.aQute.bndlib/src/aQute/bnd/osgi/Clazz.java
+++ b/biz.aQute.bndlib/src/aQute/bnd/osgi/Clazz.java
@@ -159,6 +159,12 @@ public Map<String, Set<String>> getProfiles() throws IOException {
 		Java_22,
 		Java_23,
 		Java_24,
+		Java_25,
+		Java_26,
+		Java_27,
+		Java_28,
+		Java_29,
+		Java_30,
 		UNKNOWN(Integer.MAX_VALUE, "<UNKNOWN>", "(osgi.ee=UNKNOWN)");
 
 		private final int		major;
diff --git a/build.gradle b/build.gradle
index 691f38c28b..076b2a8ce2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -120,9 +120,7 @@ subprojects {
 			if (System.getProperty("maven.repo.local")) {
 				systemProperty("maven.repo.local", IO.getFile(gradle.getStartParameter().getCurrentDir(), System.getProperty("maven.repo.local")))
 			}
-			if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)) {
-				systemProperty("java.security.manager", "allow")
-			}
+			
 		}
 	}
 }