From c03f9287c7963ef5a287716ebc7bcc545b38a581 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 26 Feb 2024 00:33:32 +0000
Subject: [PATCH 1/4] Update dependency org.jvnet.hudson.plugins:analysis-pom
to v7.2.0
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index dfe0e86f..e5af5be6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
org.jvnet.hudson.plugins
analysis-pom
- 7.1.0
+ 7.2.0
From 0ea990f5c0648ce508101d45041c14c15827b954 Mon Sep 17 00:00:00 2001
From: Ulli Hafner
Date: Tue, 27 Feb 2024 12:33:28 +0100
Subject: [PATCH 2/4] Fix test on Windows and Unix.
---
.../status/BuildStatusChecksPublisherITest.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/test/java/io/jenkins/plugins/checks/status/BuildStatusChecksPublisherITest.java b/src/test/java/io/jenkins/plugins/checks/status/BuildStatusChecksPublisherITest.java
index a37397e3..0147e901 100644
--- a/src/test/java/io/jenkins/plugins/checks/status/BuildStatusChecksPublisherITest.java
+++ b/src/test/java/io/jenkins/plugins/checks/status/BuildStatusChecksPublisherITest.java
@@ -156,7 +156,7 @@ public void shouldPublishStageDetails() {
ChecksDetails details = checksDetails.get(0);
assertThat(details.getStatus()).isEqualTo(ChecksStatus.QUEUED);
assertThat(details.getConclusion()).isEqualTo(ChecksConclusion.NONE);
- assertThat(details.getName()).isPresent().get().isEqualTo("Test Status");
+ assertThat(details.getName()).isPresent().contains("Test Status");
assertThat(details.getOutput()).isNotPresent();
// Details 1, first stage
@@ -164,7 +164,7 @@ public void shouldPublishStageDetails() {
assertThat(details.getStatus()).isEqualTo(ChecksStatus.IN_PROGRESS);
assertThat(details.getConclusion()).isEqualTo(ChecksConclusion.NONE);
assertThat(details.getOutput()).isPresent().get().satisfies(output -> {
- assertThat(output.getTitle()).isPresent().get().isEqualTo("In progress");
+ assertThat(output.getTitle()).isPresent().contains("In progress");
assertThat(output.getSummary()).isPresent().get().satisfies(StringUtils::isBlank);
assertThat(output.getText()).isPresent().get().asString().contains("* Simple Stage *(running)*");
});
@@ -174,16 +174,16 @@ public void shouldPublishStageDetails() {
assertThat(details.getOutput()).isPresent().get().satisfies(output -> {
assertThat(output.getSummary()).isPresent().get().satisfies(StringUtils::isBlank);
assertThat(output.getText()).isPresent().get().satisfies(text -> {
- assertThat(output.getTitle()).isPresent().get().isEqualTo("In progress");
- assertThat(text).matches(Pattern.compile(".*\\* Simple Stage \\*\\([^)]+\\)\\*.*", Pattern.DOTALL));
- assertThat(text).contains(" * In parallel *(running)*");
+ assertThat(output.getTitle()).isPresent().contains("In progress");
+ assertThat(text).doesNotContain("* Simple Stage *(running)*");
+ assertThat(text).contains("* Simple Stage", "* In parallel *(running)*");
});
});
// Details 6, p1s1 has finished and emitted unstable
details = checksDetails.get(6);
assertThat(details.getOutput()).isPresent().get().satisfies(output -> {
- assertThat(output.getTitle()).isPresent().get().isEqualTo("In parallel/p1/p1s1: warning in 'unstable' step");
+ assertThat(output.getTitle()).isPresent().contains("In parallel/p1/p1s1: warning in 'unstable' step");
assertThat(output.getSummary()).isPresent().get().asString().isEqualToIgnoringNewLines(""
+ "### `In parallel / p1 / p1s1 / Set stage result to unstable`\n"
+ "Warning in `unstable` step, with arguments `something went wrong`.\n"
From e599aa2242552039559c3fc498dec3a92863f80c Mon Sep 17 00:00:00 2001
From: Ulli Hafner
Date: Tue, 27 Feb 2024 12:34:11 +0100
Subject: [PATCH 3/4] Use latest versions and remove versions that are part of
BOM.
---
pom.xml | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index e5af5be6..93007013 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
org.jvnet.hudson.plugins
analysis-pom
- 7.2.0
+ 7.3.0
@@ -22,8 +22,7 @@
-SNAPSHOT
jenkinsci/${project.artifactId}-plugin
- 1.19.0
- 3.3.0
+ 1.19.6
@@ -45,7 +44,6 @@
io.jenkins.plugins
plugin-util-api
- ${plugin-util-api.version}
io.jenkins.plugins
@@ -58,7 +56,6 @@
io.jenkins.plugins
plugin-util-api
- ${plugin-util-api.version}
tests
test
From fb9a14ca9bc0bff1f02bb10219dae6591e1d16ab Mon Sep 17 00:00:00 2001
From: Ulli Hafner
Date: Tue, 27 Feb 2024 12:55:06 +0100
Subject: [PATCH 4/4] Bump version to 2.1.0.
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 93007013..c295d2d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
Defines an API for Jenkins to publish checks to SCM platforms.
- 2.0.3
+ 2.1.0
-SNAPSHOT
jenkinsci/${project.artifactId}-plugin