Skip to content

Commit 91cabac

Browse files
committed
Fix CI: exclude Java 24+ codegen modules from Java 21 build, fix logging init
- Exclude json-java21-jtd-codegen and json-java21-jsonpath-codegen from the Java 21 CI build (they require JDK 24+ ClassFile API) - Update test count to 653 (excluding codegen modules) - Fix CodegenTestBase to handle empty logging level property in CI To verify: mvn test -pl '!json-java21-jtd-codegen,!json-java21-jsonpath-codegen'
1 parent 3ca2b83 commit 91cabac

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
cache: 'maven'
2222

2323
- name: Build and verify
24-
run: mvn -B -DskipITs=false -DskipTests=false verify
24+
run: mvn -B -DskipITs=false -DskipTests=false verify -pl '!json-java21-jtd-codegen,!json-java21-jsonpath-codegen'
2525

2626
- name: Assert test count (no tests silently skipped)
2727
run: |
@@ -39,7 +39,7 @@ jobs:
3939
for k in totals: totals[k]+=int(r.get(k,'0'))
4040
except Exception:
4141
pass
42-
exp_tests=673
42+
exp_tests=653
4343
exp_skipped=0
4444
if totals['tests']!=exp_tests or totals['skipped']!=exp_skipped:
4545
print(f"Unexpected test totals: {totals} != expected tests={exp_tests}, skipped={exp_skipped}")

json-java21-jsonpath-codegen/src/test/java/json/java21/jsonpath/codegen/CodegenTestBase.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,10 @@ class CodegenTestBase {
1111

1212
@BeforeAll
1313
static void configureLogging() {
14-
final var levelName = System.getProperty("java.util.logging.ConsoleHandler.level", "INFO");
14+
var levelName = System.getProperty("java.util.logging.ConsoleHandler.level", "INFO");
15+
if (levelName == null || levelName.isBlank()) {
16+
levelName = "INFO";
17+
}
1518
final var level = Level.parse(levelName);
1619

1720
final var rootLogger = Logger.getLogger("");

0 commit comments

Comments
 (0)