Skip to content

[Java24] Create new .properties files and compiled class files #6529

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 1, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/cibuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ jobs:
os:
- 'ubuntu-latest'
java:
- '20'
- '21'
- '23'
runner:
- '{0}' # 'xvfb-run --auto-servernum {0}'
include:
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/rebuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
5 changes: 5 additions & 0 deletions biz.aQute.bndlib.tests/compilerversions/compile.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Binary file modified biz.aQute.bndlib.tests/compilerversions/compilerversions.jar
Binary file not shown.
Binary file not shown.
Binary file not shown.
13 changes: 13 additions & 0 deletions biz.aQute.bndlib.tests/compilerversions/src/jdk_20/ClassRef.java
Original file line number Diff line number Diff line change
@@ -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);
}
}
Binary file not shown.
Binary file not shown.
13 changes: 13 additions & 0 deletions biz.aQute.bndlib.tests/compilerversions/src/jdk_21/ClassRef.java
Original file line number Diff line number Diff line change
@@ -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);
}
}
Binary file not shown.
Binary file not shown.
13 changes: 13 additions & 0 deletions biz.aQute.bndlib.tests/compilerversions/src/jdk_22/ClassRef.java
Original file line number Diff line number Diff line change
@@ -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);
}
}
Binary file not shown.
Binary file not shown.
13 changes: 13 additions & 0 deletions biz.aQute.bndlib.tests/compilerversions/src/jdk_23/ClassRef.java
Original file line number Diff line number Diff line change
@@ -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);
}
}
Binary file not shown.
Binary file not shown.
13 changes: 13 additions & 0 deletions biz.aQute.bndlib.tests/compilerversions/src/jdk_24/ClassRef.java
Original file line number Diff line number Diff line change
@@ -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);
}
}
12 changes: 9 additions & 3 deletions biz.aQute.bndlib.tests/test/test/MultiReleaseTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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();

}
}
Expand Down
9 changes: 8 additions & 1 deletion biz.aQute.bndlib/src/aQute/bnd/build/model/EE.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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
};

/**
Expand Down
Loading