From d57ab86216572e39ae195fc2ef2f96b5f22923f3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Feb 2022 20:54:30 +0000 Subject: [PATCH 1/9] Bump prism-api from 1.25.0-2 to 1.26.0-2 Bumps [prism-api](https://github.com/jenkinsci/prism-api-plugin) from 1.25.0-2 to 1.26.0-2. - [Release notes](https://github.com/jenkinsci/prism-api-plugin/releases) - [Changelog](https://github.com/jenkinsci/prism-api-plugin/blob/main/CHANGELOG.md) - [Commits](https://github.com/jenkinsci/prism-api-plugin/compare/v1.25.0-2...v1.26.0-2) --- updated-dependencies: - dependency-name: io.jenkins.plugins:prism-api dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- plugin/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin/pom.xml b/plugin/pom.xml index e90d90fdd..4b47ef512 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -38,7 +38,7 @@ 2.14.0 0.8.1 2.9.0 - 1.25.0-2 + 1.26.0-2 1.11 From d1fa5db2b988fc63b10e21bbd1433fb4262c8ce2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 15 Feb 2022 13:25:42 +0000 Subject: [PATCH 2/9] Bump font-awesome-api from 5.15.4-5 to 6.0.0-1 Bumps [font-awesome-api](https://github.com/jenkinsci/font-awesome-api-plugin) from 5.15.4-5 to 6.0.0-1. - [Release notes](https://github.com/jenkinsci/font-awesome-api-plugin/releases) - [Changelog](https://github.com/jenkinsci/font-awesome-api-plugin/blob/master/CHANGELOG.md) - [Commits](https://github.com/jenkinsci/font-awesome-api-plugin/compare/v5.15.4-5...v6.0.0-1) --- updated-dependencies: - dependency-name: io.jenkins.plugins:font-awesome-api dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- plugin/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin/pom.xml b/plugin/pom.xml index e90d90fdd..50fcf0cc2 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -31,7 +31,7 @@ 1.7.0 1.7.8 2.13.0 - 5.15.4-5 + 6.0.0-1 5.1.3-4 3.6.0-2 2.31.0 From ae60cddf57caa61294de3a50ddc3926d67182262 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 16 Feb 2022 13:19:35 +0000 Subject: [PATCH 3/9] Bump plugin-util-api from 2.13.0 to 2.14.0 Bumps [plugin-util-api](https://github.com/jenkinsci/plugin-util-api-plugin) from 2.13.0 to 2.14.0. - [Release notes](https://github.com/jenkinsci/plugin-util-api-plugin/releases) - [Changelog](https://github.com/jenkinsci/plugin-util-api-plugin/blob/master/CHANGELOG.md) - [Commits](https://github.com/jenkinsci/plugin-util-api-plugin/compare/v2.13.0...v2.14.0) --- updated-dependencies: - dependency-name: io.jenkins.plugins:plugin-util-api dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- plugin/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin/pom.xml b/plugin/pom.xml index e90d90fdd..279b33ced 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -30,7 +30,7 @@ 1.11.3-6 1.7.0 1.7.8 - 2.13.0 + 2.14.0 5.15.4-5 5.1.3-4 3.6.0-2 From 821fc17d6cdf1ba757f1061ddf95bd41a41a8c50 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 16 Feb 2022 13:19:44 +0000 Subject: [PATCH 4/9] Bump echarts-api from 5.2.2-2 to 5.3.0-2 Bumps [echarts-api](https://github.com/jenkinsci/echarts-api-plugin) from 5.2.2-2 to 5.3.0-2. - [Release notes](https://github.com/jenkinsci/echarts-api-plugin/releases) - [Changelog](https://github.com/jenkinsci/echarts-api-plugin/blob/master/CHANGELOG.md) - [Commits](https://github.com/jenkinsci/echarts-api-plugin/compare/v5.2.2-2...v5.3.0-2) --- updated-dependencies: - dependency-name: io.jenkins.plugins:echarts-api dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- plugin/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin/pom.xml b/plugin/pom.xml index e90d90fdd..569d70dcb 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -26,7 +26,7 @@ 3.0.3 10.6 - 5.2.2-2 + 5.3.0-2 1.11.3-6 1.7.0 1.7.8 From 1cdf788f405e2d257420fb9d349e32a1878f1c13 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 16 Feb 2022 13:19:58 +0000 Subject: [PATCH 5/9] Bump bootstrap5-api from 5.1.3-4 to 5.1.3-5 Bumps [bootstrap5-api](https://github.com/jenkinsci/bootstrap5-api-plugin) from 5.1.3-4 to 5.1.3-5. - [Release notes](https://github.com/jenkinsci/bootstrap5-api-plugin/releases) - [Changelog](https://github.com/jenkinsci/bootstrap5-api-plugin/blob/master/CHANGELOG.md) - [Commits](https://github.com/jenkinsci/bootstrap5-api-plugin/compare/v5.1.3-4...v5.1.3-5) --- updated-dependencies: - dependency-name: io.jenkins.plugins:bootstrap5-api dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- plugin/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin/pom.xml b/plugin/pom.xml index e90d90fdd..3b71aa09a 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -32,7 +32,7 @@ 1.7.8 2.13.0 5.15.4-5 - 5.1.3-4 + 5.1.3-5 3.6.0-2 2.31.0 2.14.0 From 57c86df2c6c5659f4605e42013206b8b988b4064 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 16 Feb 2022 13:20:06 +0000 Subject: [PATCH 6/9] Bump forensics-api from 1.7.0 to 1.8.0 Bumps [forensics-api](https://github.com/jenkinsci/forensics-api-plugin) from 1.7.0 to 1.8.0. - [Release notes](https://github.com/jenkinsci/forensics-api-plugin/releases) - [Changelog](https://github.com/jenkinsci/forensics-api-plugin/blob/master/CHANGELOG.md) - [Commits](https://github.com/jenkinsci/forensics-api-plugin/compare/v1.7.0...v1.8.0) --- updated-dependencies: - dependency-name: io.jenkins.plugins:forensics-api dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- plugin/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin/pom.xml b/plugin/pom.xml index e90d90fdd..e850fc53e 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -28,7 +28,7 @@ 5.2.2-2 1.11.3-6 - 1.7.0 + 1.8.0 1.7.8 2.13.0 5.15.4-5 From 49cc8a5cac24bcc271f3267d2ac117d70760e5a7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 16 Feb 2022 13:20:30 +0000 Subject: [PATCH 7/9] Bump data-tables-api from 1.11.3-6 to 1.11.4-1 Bumps [data-tables-api](https://github.com/jenkinsci/data-tables-api-plugin) from 1.11.3-6 to 1.11.4-1. - [Release notes](https://github.com/jenkinsci/data-tables-api-plugin/releases) - [Changelog](https://github.com/jenkinsci/data-tables-api-plugin/blob/master/CHANGELOG.md) - [Commits](https://github.com/jenkinsci/data-tables-api-plugin/compare/v1.11.3-6...v1.11.4-1) --- updated-dependencies: - dependency-name: io.jenkins.plugins:data-tables-api dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- plugin/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin/pom.xml b/plugin/pom.xml index e90d90fdd..027ca9e71 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -27,7 +27,7 @@ 10.6 5.2.2-2 - 1.11.3-6 + 1.11.4-1 1.7.0 1.7.8 2.13.0 From 20c405ec45ec6aefe52f6baa9818b020eb7aaffa Mon Sep 17 00:00:00 2001 From: Ulli Hafner Date: Fri, 18 Feb 2022 19:33:40 +0100 Subject: [PATCH 8/9] Fix unit tests since logger output of prism changed. --- .../model/CoveragePluginSourceITest.java | 28 ++++++++++++------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/plugin/src/test/java/io/jenkins/plugins/coverage/model/CoveragePluginSourceITest.java b/plugin/src/test/java/io/jenkins/plugins/coverage/model/CoveragePluginSourceITest.java index 15b2c5d25..b15e8b828 100644 --- a/plugin/src/test/java/io/jenkins/plugins/coverage/model/CoveragePluginSourceITest.java +++ b/plugin/src/test/java/io/jenkins/plugins/coverage/model/CoveragePluginSourceITest.java @@ -59,20 +59,26 @@ public class CoveragePluginSourceITest extends IntegrationTestWithJenkinsPerSuit /** Verifies that the plugin reads source code from the workspace root. */ @Test - public void coveragePluginPipelineWithSourceCode() throws IOException { + public void coveragePluginPipelineWithSourceCode() { Run workspace = runCoverageWithSourceCode("", ""); - assertThat(getConsoleLog(workspace)).contains( - String.format("Searching for source code files in root of workspace '%s'", - getWorkspace((TopLevelItem) workspace.getParent()).getRemote())); + + assertThat(getConsoleLog(workspace)).contains(createSingleMessage(workspace)); + } + + private String createSingleMessage(final Run workspace) { + return String.format("Searching for source code files in '%s'", createSingleDirectory(workspace)); } /** Verifies that the plugin reads source code in subdirectories of the workspace. */ @Test - public void coveragePluginPipelineWithSourceCodeInSubdirectory() throws IOException { + public void coveragePluginPipelineWithSourceCodeInSubdirectory() { Run workspace = runCoverageWithSourceCode("", ""); - assertThat(getConsoleLog(workspace)).contains( - String.format("Searching for source code files in root of workspace '%s'", - getWorkspace((TopLevelItem) workspace.getParent()).getRemote())); + assertThat(getConsoleLog(workspace)).contains(createSingleMessage(workspace)); + } + + private String createSingleDirectory(final Run workspace) { + return String.format("%s/src/main/java", + getWorkspace((TopLevelItem) workspace.getParent()).getRemote()); } /** Verifies that the plugin reads source code in external but approved directories. */ @@ -83,8 +89,10 @@ public void coveragePluginPipelineWithSourceCodeInPermittedDirectory() throws IO new PermittedSourceCodeDirectory(directory))); Run externalDirectory = runCoverageWithSourceCode("ignore", directory); - assertThat(getConsoleLog(externalDirectory)).contains( - String.format("Searching for source code files in '%s'", directory)); + assertThat(getConsoleLog(externalDirectory)) + .contains("Searching for source code files in:", + "-> " + createSingleDirectory(externalDirectory), + "-> " + directory); } /** Verifies that the plugin refuses source code in directories that are not approved in Jenkins' configuration. */ From 490d4ccbbde9986ee24031523bfd5026d7be6f2f Mon Sep 17 00:00:00 2001 From: Ulli Hafner Date: Fri, 18 Feb 2022 20:09:03 +0100 Subject: [PATCH 9/9] Use UNIX paths in assertions. --- .../plugins/coverage/model/CoveragePluginSourceITest.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/plugin/src/test/java/io/jenkins/plugins/coverage/model/CoveragePluginSourceITest.java b/plugin/src/test/java/io/jenkins/plugins/coverage/model/CoveragePluginSourceITest.java index b15e8b828..b57e9774b 100644 --- a/plugin/src/test/java/io/jenkins/plugins/coverage/model/CoveragePluginSourceITest.java +++ b/plugin/src/test/java/io/jenkins/plugins/coverage/model/CoveragePluginSourceITest.java @@ -16,6 +16,8 @@ import com.cloudbees.plugins.credentials.domains.Domain; import com.cloudbees.plugins.credentials.impl.UsernamePasswordCredentialsImpl; +import edu.hm.hafner.util.PathUtil; + import org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition; import org.jenkinsci.plugins.workflow.job.WorkflowJob; import org.jenkinsci.test.acceptance.docker.DockerContainer; @@ -50,6 +52,7 @@ public class CoveragePluginSourceITest extends IntegrationTestWithJenkinsPerSuit private static final String SOURCE_FILE = "AcuCobolParser.java.txt"; private static final String PACKAGE_PATH = "edu/hm/hafner/analysis/parser/"; private static final String ACU_COBOL_PARSER_COVERAGE_REPORT = "jacoco-acu-cobol-parser.xml"; + private static final PathUtil PATH_UTIL = new PathUtil(); /** Docker container for java-maven builds. Contains also git to check out from an SCM. */ @Rule @@ -77,8 +80,8 @@ public void coveragePluginPipelineWithSourceCodeInSubdirectory() { } private String createSingleDirectory(final Run workspace) { - return String.format("%s/src/main/java", - getWorkspace((TopLevelItem) workspace.getParent()).getRemote()); + return PATH_UTIL.getAbsolutePath(String.format("%s/src/main/java", + getWorkspace((TopLevelItem) workspace.getParent()).getRemote())); } /** Verifies that the plugin reads source code in external but approved directories. */