diff --git a/Jenkinsfile b/Jenkinsfile index 2c49315..674ca13 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1 +1,9 @@ -buildPlugin(tests: [skip: 'true']) +def jenkinsVersion = '2.277.4' + +def configurations = [ + [ platform: "linux", jdk: "8", jenkins: null ], + [ platform: "linux", jdk: "8", jenkins: jenkinsVersion ], + [ platform: "linux", jdk: "11", jenkins: jenkinsVersion ] +] + +buildPlugin(configurations: configurations, timeout: 180, tests: [skip: 'true']) diff --git a/pom.xml b/pom.xml index b50a233..9cd3294 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.jenkins-ci.plugins plugin - 3.36 + 4.42 @@ -17,7 +17,7 @@ 1 999999-SNAPSHOT UTF-8 - 1.625.3 + 2.277.4 8 @@ -77,48 +77,6 @@ structs 1.7 - - org.jenkins-ci.plugins.workflow - workflow-step-api - 2.12 - test - - - org.jenkins-ci.plugins.workflow - workflow-cps - 2.39 - test - - - org.jenkins-ci.plugins.workflow - workflow-job - 2.11.2 - test - - - org.jenkins-ci.plugins.workflow - workflow-basic-steps - 2.6 - test - - - org.jenkins-ci.plugins.workflow - workflow-durable-task-step - 2.13 - test - - - org.jenkins-ci.plugins.workflow - workflow-api - 2.20 - test - - - org.jenkins-ci.plugins.workflow - workflow-support - 2.14 - test - diff --git a/src/main/java/jenkins/plugins/mvn_snapshot_check/MavenSnapshotCheck.java b/src/main/java/jenkins/plugins/mvn_snapshot_check/MavenSnapshotCheck.java index 7613820..5c23b2d 100644 --- a/src/main/java/jenkins/plugins/mvn_snapshot_check/MavenSnapshotCheck.java +++ b/src/main/java/jenkins/plugins/mvn_snapshot_check/MavenSnapshotCheck.java @@ -18,7 +18,7 @@ import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.stapler.DataBoundSetter; -import javax.annotation.Nonnull; +import edu.umd.cs.findbugs.annotations.NonNull; import java.io.*; import java.nio.charset.Charset; import java.util.regex.Matcher; @@ -113,7 +113,7 @@ public boolean perform(AbstractBuild build, Launcher launcher, BuildListener lis * @param taskListener */ @Override - public void perform(@Nonnull Run run, @Nonnull FilePath workspace, @Nonnull Launcher launcher, @Nonnull TaskListener taskListener) { + public void perform(@NonNull Run run, @NonNull FilePath workspace, @NonNull Launcher launcher, @NonNull TaskListener taskListener) { if (getCheck()) { run.addAction(new MavenSnapshotCheckAction(CHECKED)); String message = "[Maven SNAPSHOT Check], pomFiles: " + getPomFiles(); @@ -145,7 +145,7 @@ public void perform(@Nonnull Run run, @Nonnull FilePath workspace, @Nonnul * The class is marked as public so that it can be accessed from views. * *

- * See src/main/resources/hudson/plugins/hello_world/HelloWorldBuilder/*.jelly + * See src/main/resources/jenkins/plugins/mvn_snapshot_check/MavenSnapshotCheck/config.jelly * for the actual HTML fragment for the configuration screen. */ @Symbol("mavenSnapshotCheck")