more lenient osgi.ee=JavaSE for unknown JDKs by chrisrueger · Pull Request #6859 · bndtools/bnd

chrisrueger · 2025-10-06T21:26:08Z

Experimental:

For a yet to bnd unknown JDK (e.g. JDK-10000) Instead of

Require-Capability: osgi.ee;filter:="(osgi.ee=UNKNOWN)"

we now create

Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=9955))"

for a .class file with u2 major_version 10000 (9955 == 10000 - 45)

laeubi · 2025-10-27T05:56:09Z

In the advent of regular Java versions released this seems the right approach. In general the EE enum might needs to be revised by:

deprecate it
replace all usages by a new JavaExecutionEnvironment class that can hold a java version and computes what ever is needed from that.

laeubi · 2025-10-27T05:59:04Z

@chrisrueger I have fired up a task for the AI here maybe it produces something useful as a base-ground:

Refactor EE from enum to class for dynamic Java version support laeubi/bnd#5

chrisrueger · 2025-10-27T06:16:02Z

In general the EE enum might needs to be revised by

Just adding that currently there are two enums holding Java versions:

aQute.bnd.osgi.Clazz.JAVA
aQute.bnd.build.model.EE

For a yet to bnd unknown JDK (e.g. JDK-10000) Instead of ``` Require-Capability: osgi.ee;filter:="(osgi.ee=UNKNOWN)" ``` we now create Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=9955))" for a .class file with u2 major_version 10000 (9955 == 10000 - 45) Signed-off-by: Christoph Rueger <[email protected]>

peterkir · 2025-11-26T19:09:36Z

Selecting a ee from bndrun files is a little hard when there are so many list items available. Maybe we can downsize a little.

chrisrueger · 2025-11-26T19:55:15Z

#6858 add enums up to JDK50 #6891

Feel free to downsize whatever I did in https://github.com/bndtools/bnd/pull/6891/files :)

laeubi · 2025-11-27T03:40:10Z

Selecting a ee from bndrun files is a little hard when there are so many list items available. Maybe we can downsize a little.

mY recommendation would be to replace dropdowns by a spinner or something instead in the UI

Copilot

Pull request overview

This PR addresses issue #6858 to make the osgi.ee requirement more lenient for unknown JDK versions. Instead of generating osgi.ee=UNKNOWN for class files compiled with future JDK versions, it now calculates and uses the Java version (major - 45) with osgi.ee=JavaSE.

Changes:

Modified the EE filter generation to compute JavaSE version numbers for unknown JDKs based on class file major version
Added tracking of the highest major version encountered during class analysis
Introduced new buildEEFilterLenient method to handle unknown JDK versions more gracefully
Added comprehensive test coverage for the lenient behavior including edge cases

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated 9 comments.

File	Description
biz.aQute.bndlib/src/aQute/bnd/osgi/Clazz.java	Added `buildEEFilterLenient` static method to generate OSGi EE filters for unknown JDK versions, refactored existing filter construction to use new `eeFilter` helper method, and added `getMajorVersion` accessor
biz.aQute.bndlib/src/aQute/bnd/osgi/Analyzer.java	Added tracking of highest major Java version during analysis and logic to use lenient filter generation when encountering UNKNOWN format
biz.aQute.bndlib.tests/test/test/ClazzTest.java	Added comprehensive test coverage including a test with a fake class file with major version 10000, and unit tests for the lenient filter building logic covering known versions, too-low, and too-high edge cases

Comments suppressed due to low confidence (1)

biz.aQute.bndlib/src/aQute/bnd/osgi/Analyzer.java:3126

getClassspace exposes the internal representation stored in field classspace. The value may be modified after this call to getClassspace.
getClassspace exposes the internal representation stored in field classspace. The value may be modified after this call to getClassspace.
getClassspace exposes the internal representation stored in field classspace. The value may be modified after this call to getClassspace.
getClassspace exposes the internal representation stored in field classspace. The value may be modified after this call to getClassspace.
getClassspace exposes the internal representation stored in field classspace. The value may be modified after this call to getClassspace.
getClassspace exposes the internal representation stored in field classspace. The value may be modified after this call to getClassspace.
getClassspace exposes the internal representation stored in field classspace. The value may be modified after this call to getClassspace.
getClassspace exposes the internal representation stored in field classspace. The value may be modified after this call to getClassspace.
getClassspace exposes the internal representation stored in field classspace. The value may be modified after this call to getClassspace.
getClassspace exposes the internal representation stored in field classspace. The value may be modified after this call to getClassspace.
getClassspace exposes the internal representation stored in field classspace. The value may be modified after this call to getClassspace.
getClassspace exposes the internal representation stored in field classspace. The value may be modified after this call to getClassspace.
getClassspace exposes the internal representation stored in field classspace. The value may be modified after this call to getClassspace.
getClassspace exposes the internal representation stored in field classspace. The value may be modified after this call to getClassspace.

	public Map<TypeRef, Clazz> getClassspace() {

Copilot · 2026-02-02T09:56:14Z

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

+				.forEach(c -> {
+					ees.add(c.getFormat());
+					int majorVersion = c.getMajorVersion();
+					if(majorVersion > highestMajorJavaVersion) {


Missing space after if keyword. The codebase convention is to use if ( with a space before the opening parenthesis.

Suggested change

if(majorVersion > highestMajorJavaVersion) {

if (majorVersion > highestMajorJavaVersion) {

Copilot · 2026-02-02T09:56:14Z

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

 	private final static Logger						logger					= LoggerFactory.getLogger(Analyzer.class);
 	private final static Version					frameworkR7				= new Version("1.9");
 	private final SortedSet<Clazz.JAVA>				ees						= new TreeSet<>();
+	private int highestMajorJavaVersion			=	0;


Inconsistent field alignment and extra tab character before the equals sign. The field declaration should follow the same alignment pattern as the other fields in this class (compare with line 120 above).

Suggested change

private int highestMajorJavaVersion = 0;

private int highestMajorJavaVersion = 0;

Copilot · 2026-02-02T09:56:14Z

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

+			// even for yet unknown JDKs
+			int version = major - 45;
+			if ((version < 0)) {
+				return eeFilter("UNKNOWN");


The filter string "(&(osgi.ee=JavaSE)(version=UNKNOWN))" is semantically incorrect for OSGi. In OSGi filter syntax, the version attribute expects a numeric value, not the string "UNKNOWN". For class files with invalid major versions (less than 45), consider either returning the original UNKNOWN filter "(osgi.ee=UNKNOWN)" or handling this as an error case, since such class files would be invalid according to the JVM specification.

Suggested change

return eeFilter("UNKNOWN");

return "(osgi.ee=UNKNOWN)";

Copilot · 2026-02-02T09:56:14Z

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

+	void testBuildEEFilter_lenientTooLow() {
+		// version < 0 -> UNKNOWN
+		String result = Clazz.JAVA.buildEEFilterLenient(40);
+		assertEquals("(&(osgi.ee=JavaSE)(version=UNKNOWN))", result);


This test expects a filter with version=UNKNOWN, which is semantically incorrect for OSGi. The version attribute in OSGi filters expects a numeric value. The test should be updated to either expect the original UNKNOWN filter format "(osgi.ee=UNKNOWN)" or to test a different edge case, since a major version of 40 (predating Java 1.1 which starts at 45) represents an invalid class file.

Suggested change

assertEquals("(&(osgi.ee=JavaSE)(version=UNKNOWN))", result);

assertEquals("(osgi.ee=UNKNOWN)", result);

Copilot · 2026-02-02T09:56:15Z

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

+					if(majorVersion > highestMajorJavaVersion) {
+						highestMajorJavaVersion = majorVersion;
+					}
+


Unnecessary blank line inside the forEach block. This should be removed to maintain consistency with the coding style in the rest of the file.

Suggested change

Copilot · 2026-02-02T09:56:15Z

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

+			// lenient: We try to return a useful filter
+			// even for yet unknown JDKs
+			int version = major - 45;
+			if ((version < 0)) {


Unnecessary parentheses around the condition. The expression if (version < 0) is clearer and follows standard Java style.

Suggested change

if ((version < 0)) {

if (version < 0) {

Copilot · 2026-02-02T09:56:15Z

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

+
+

Unnecessary blank lines. Remove the extra blank line to maintain consistent formatting with the rest of the test file.

Copilot · 2026-02-02T09:56:15Z

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

+
+

Unnecessary blank lines. Remove the extra blank lines to maintain consistent formatting with the rest of the test file.

Copilot · 2026-02-02T09:56:16Z

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

+		assertEquals("(&(osgi.ee=JavaSE)(version=11))", result);
+	}
+
+


Unnecessary blank line. Remove the extra blank line to maintain consistent formatting with the rest of the test file.

Suggested change

chrisrueger changed the title ~~more lenient osgi.ee for unknown JDKs~~ more lenient osgi.ee=JavaSE for unknown JDKs Oct 6, 2025

chrisrueger mentioned this pull request Oct 6, 2025

Can the osgi.ee=JavaSE be more lenient on unknown JDK versions? #6858

Open

chrisrueger force-pushed the 6858-improve-osgiee-for-unknown-jdk branch 2 times, most recently from 3f533d5 to c63fede Compare October 10, 2025 19:12

chrisrueger marked this pull request as ready for review October 18, 2025 14:44

chrisrueger force-pushed the 6858-improve-osgiee-for-unknown-jdk branch from c63fede to 8d418ec Compare October 19, 2025 19:27

chrisrueger mentioned this pull request Oct 26, 2025

Fix JavaSE-25 BREE resolution failure caused by bndlib eclipse-tycho/tycho#5533

Closed

Copilot AI mentioned this pull request Oct 27, 2025

Refactor EE from enum to class for dynamic Java version support laeubi/bnd#5

Draft

chrisrueger mentioned this pull request Oct 27, 2025

#6858 add enums up to JDK50 #6891

Merged

chrisrueger force-pushed the 6858-improve-osgiee-for-unknown-jdk branch from 8d418ec to 93558d3 Compare November 2, 2025 12:38

peterkir requested a review from Copilot February 2, 2026 09:46

Copilot started reviewing on behalf of peterkir February 2, 2026 09:47 View session

Copilot AI reviewed Feb 2, 2026

View reviewed changes

	if(majorVersion > highestMajorJavaVersion) {
	if (majorVersion > highestMajorJavaVersion) {

	private int highestMajorJavaVersion = 0;
	private int highestMajorJavaVersion = 0;

	assertEquals("(&(osgi.ee=JavaSE)(version=UNKNOWN))", result);
	assertEquals("(osgi.ee=UNKNOWN)", result);

Uh oh!

Conversation

chrisrueger commented Oct 6, 2025

Uh oh!

laeubi commented Oct 27, 2025

Uh oh!

laeubi commented Oct 27, 2025

Uh oh!

chrisrueger commented Oct 27, 2025

Uh oh!

peterkir commented Nov 26, 2025

Uh oh!

chrisrueger commented Nov 26, 2025

Uh oh!

laeubi commented Nov 27, 2025

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Feb 2, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 2, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 2, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 2, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 2, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 2, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 2, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 2, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 2, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants