diff --git a/pom.xml b/pom.xml index 8c23733..1b4220b 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ plugin org.jenkins-ci.plugins - 4.31 + 4.51 config-driven-pipeline @@ -23,20 +23,8 @@ http://opensource.org/licenses/MIT - - - justinharringa - Justin Harringa - jharringa@salesforce.com - - - ma3oxuct - Andrey Falko - afalko@gmail.com - - - scm:git:git://github.com/jenkinsci/${project.artifactId}-plugin.git + scm:git:https://github.com/jenkinsci/${project.artifactId}-plugin.git scm:git:git@github.com:jenkinsci/${project.artifactId}-plugin.git http://github.com/jenkinsci/${project.artifactId}-plugin HEAD @@ -45,9 +33,10 @@ 1.16 2.4.1 0.8.8 - 8 1.8 - 2.277.4 + + 2.346 + ${jenkins.baseline}.3 4.13.2 3.0.0-M5 2.11.0 @@ -107,7 +96,6 @@ org.jenkins-ci.plugins.workflow workflow-multibranch - ${workflow-multibranch.version} org.jenkins-ci.plugins.workflow @@ -177,13 +165,11 @@ junit junit - ${junit.version} test org.jenkins-ci.plugins.workflow workflow-multibranch - ${workflow-multibranch.version} tests test @@ -197,13 +183,11 @@ org.junit.jupiter junit-jupiter - ${junit-jupiter.version} test org.junit.jupiter junit-jupiter-api - ${junit-jupiter.version} test @@ -223,7 +207,6 @@ maven-compiler-plugin - 3.9.0 ${java.version} ${java.version} @@ -232,7 +215,6 @@ org.apache.maven.plugins maven-surefire-plugin - ${maven-surefire-plugin.version} org.junit.vintage @@ -244,7 +226,6 @@ org.jacoco jacoco-maven-plugin - ${jacoco-maven-plugin.version} pre-unit-test @@ -275,8 +256,8 @@ io.jenkins.tools.bom - bom-2.222.x - 887.vae9c8ac09ff7 + bom-${jenkins.baseline}.x + 1763.v092b_8980a_f5e import pom diff --git a/src/main/java/org/jenkinsci/plugins/workflow/multibranch/template/ConfigFileEnvironmentContributingAction.java b/src/main/java/org/jenkinsci/plugins/workflow/multibranch/template/ConfigFileEnvironmentContributingAction.java index ec86694..1c7274a 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/multibranch/template/ConfigFileEnvironmentContributingAction.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/multibranch/template/ConfigFileEnvironmentContributingAction.java @@ -2,7 +2,9 @@ import hudson.EnvVars; import hudson.Extension; -import hudson.model.*; +import hudson.model.EnvironmentContributingAction; +import hudson.model.InvisibleAction; +import hudson.model.Run; import javax.annotation.Nonnull; diff --git a/src/test/java/org/jenkinsci/plugins/workflow/multibranch/template/finder/ConfigurationValueFinderTest.java b/src/test/java/org/jenkinsci/plugins/workflow/multibranch/template/finder/ConfigurationValueFinderTest.java index bf908a0..faad874 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/multibranch/template/finder/ConfigurationValueFinderTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/multibranch/template/finder/ConfigurationValueFinderTest.java @@ -6,7 +6,8 @@ import java.util.stream.Stream; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; class ConfigurationValueFinderTest {