This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-dist-tool.git
The following commit(s) were added to refs/heads/master by this push:
new c0fd5db Fix master jobs report for missing branches and update
github-api
c0fd5db is described below
commit c0fd5dbb7d85a562b7290dd6418785273f8d2367
Author: slachiewicz <[email protected]>
AuthorDate: Tue Nov 10 23:24:39 2026 +0100
Fix master jobs report for missing branches and update github-api
Bump github-api to 2.0-rc.7 to restore compatibility with Jackson 2.20+
(fixes #142). Report repositories without a master Jenkins job as MISSING
instead of omitting them silently (fixes #141).
---
pom.xml | 2 +-
.../tools/jobs/master/ListMasterJobsReport.java | 21 +++++++++++++++++----
2 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index dde4ac2..8b5043b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -158,7 +158,7 @@
<dependency>
<groupId>org.kohsuke</groupId>
<artifactId>github-api</artifactId>
- <version>2.0-rc.5</version>
+ <version>2.0-rc.7</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
diff --git
a/src/main/java/org/apache/maven/dist/tools/jobs/master/ListMasterJobsReport.java
b/src/main/java/org/apache/maven/dist/tools/jobs/master/ListMasterJobsReport.java
index c5da820..69dcbc2 100644
---
a/src/main/java/org/apache/maven/dist/tools/jobs/master/ListMasterJobsReport.java
+++
b/src/main/java/org/apache/maven/dist/tools/jobs/master/ListMasterJobsReport.java
@@ -105,9 +105,13 @@ public class ListMasterJobsReport extends
AbstractJobsReport {
return Mono.empty();
}
// find the master node
- return Mono.justOrEmpty(objectNode
- .get("jobs")
- .valueStream()
+ JsonNode jobs = objectNode.get("jobs");
+ if (jobs == null || !jobs.isArray()) {
+ getLog().warn("Failed to read jobs for " + repository + " Jenkins
job " + MAVENBOX_JOBS_BASE_URL
+ + repository);
+ return Mono.empty();
+ }
+ return Mono.just(jobs.valueStream()
.filter(n -> n.get("name").asText().equals("master"))
.findFirst()
.map(n -> {
@@ -131,6 +135,14 @@ public class ListMasterJobsReport extends
AbstractJobsReport {
ZonedDateTime.ofInstant(Instant.ofEpochMilli(timestamp),
ZoneId.systemDefault()));
}
+ return result;
+ })
+ .orElseGet(() -> {
+ getLog().info("No master job found for " + repository + "
at " + MAVENBOX_JOBS_BASE_URL
+ + repository);
+ Result result = new Result(repository,
MAVENBOX_JOBS_BASE_URL + repository);
+ result.setStatus("MISSING");
+ result.setIcon(retrieveIcon("MISSING"));
return result;
}));
}
@@ -141,6 +153,7 @@ public class ListMasterJobsReport extends
AbstractJobsReport {
case "SUCCESS" -> "✅"; // (green) WHITE HEAVY CHECK MARK
case "UNKNOWN" -> "❔"; // White Question Mark Ornament
case "UNSTABLE" -> "⚠️"; // WARNING SIGN rendered as
yellow
+ case "MISSING" -> "⚪"; // medium white circle
default -> "❔"; // White Question Mark Ornament (same as
Unknown)
};
}
@@ -228,7 +241,7 @@ public class ListMasterJobsReport extends
AbstractJobsReport {
}
private Comparator<String> resultComparator() {
- final List<String> orderedStatus = Arrays.asList("FAILURE",
"UNSTABLE", "UNKNOWN", "SUCCESS");
+ final List<String> orderedStatus = Arrays.asList("FAILURE",
"UNSTABLE", "UNKNOWN", "MISSING", "SUCCESS");
return (l, r) -> {
return Integer.compare(orderedStatus.indexOf(l),
orderedStatus.indexOf(r));
};