Skip to content

Commit 7788f98

Browse files
committed
Remove remnants of building multi-release jars
1 parent e4c617b commit 7788f98

File tree

2 files changed

+0
-9
lines changed

2 files changed

+0
-9
lines changed

gradle/plugins/common/src/main/kotlin/junitbuild.osgi-conventions.gradle.kts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,6 @@ tasks.withType<Jar>().named {
4848
-fixupmessages.apiguardian.import: "Unused Import-Package instructions: \\[org.apiguardian.*\\]";is:=ignore
4949
-fixupmessages.jspecify.import: "Unused Import-Package instructions: \\[org.jspecify.*\\]";is:=ignore
5050
51-
# This tells bnd to ignore classes it finds in `META-INF/versions/`
52-
# because bnd doesn't yet support multi-release jars.
53-
-fixupmessages.wrong.dir: "Classes found in the wrong directory: \\{META-INF/versions/...";is:=ignore
54-
5551
# Don't scan for Class.forName package imports.
5652
# See https://bnd.bndtools.org/instructions/noclassforname.html
5753
-noclassforname: true

junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,6 @@ tasks {
9696
// Pattern of key and value: `"Engine-Version-{YourTestEngine#getId()}": "47.11"`
9797
"Engine-Version-junit-jupiter" to project.version,
9898
"Engine-Version-junit-vintage" to project.version,
99-
// Version-aware binaries are already included - set Multi-Release flag here.
100-
// See https://openjdk.java.net/jeps/238 for details
101-
// Note: the "jar --update ... --release X" command does not work with the
102-
// shadowed JAR as it contains nested classes that do not comply with multi-release jars.
103-
"Multi-Release" to true
10499
))
105100
}
106101
}

0 commit comments

Comments
 (0)