diff --git a/build-monitor-acceptance/pom.xml b/build-monitor-acceptance/pom.xml index ad6d18e70..34be33b1c 100644 --- a/build-monitor-acceptance/pom.xml +++ b/build-monitor-acceptance/pom.xml @@ -14,7 +14,7 @@ Build Monitor Acceptance Tests - 3.6.12 + 3.6.17 2.0.7 @@ -60,6 +60,12 @@ net.serenity-bdd serenity-core ${serenity.version} + + + org.jetbrains + annotations + + net.serenity-bdd diff --git a/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/model/ProjectStatus.java b/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/model/ProjectStatus.java index 30b6b6e9b..2990a2cab 100644 --- a/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/model/ProjectStatus.java +++ b/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/model/ProjectStatus.java @@ -1,5 +1,6 @@ package com.smartcodeltd.jenkinsci.plugins.build_monitor.model; +import edu.umd.cs.findbugs.annotations.NonNull; import java.util.ArrayList; import java.util.Collection; import java.util.EnumSet; @@ -7,7 +8,6 @@ import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.jetbrains.annotations.NotNull; public enum ProjectStatus { Successful("successful"), @@ -40,7 +40,7 @@ public static List fromMultiple(String cssClasses) { return statuses; } - public static ProjectStatus from(@NotNull String cssClass) { + public static ProjectStatus from(@NonNull String cssClass) { for (ProjectStatus status : ProjectStatus.values()) { if (cssClass.equalsIgnoreCase(status.value)) { diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/jenkins/environment/PluginDescription.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/jenkins/environment/PluginDescription.java index d5060788d..26a37dba3 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/jenkins/environment/PluginDescription.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/jenkins/environment/PluginDescription.java @@ -1,18 +1,18 @@ package net.serenitybdd.integration.jenkins.environment; +import edu.umd.cs.findbugs.annotations.NonNull; import java.io.IOException; import java.nio.file.Path; import java.util.jar.Attributes; import java.util.jar.JarFile; import net.serenitybdd.integration.jenkins.environment.rules.FindFreePort; -import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class PluginDescription { private static final Logger Log = LoggerFactory.getLogger(FindFreePort.class); - public static PluginDescription of(@NotNull Path pluginAtPath) { + public static PluginDescription of(@NonNull Path pluginAtPath) { JarFile jarFile = null; try { jarFile = new JarFile(pluginAtPath.toFile()); @@ -40,7 +40,7 @@ public static PluginDescription of(@NotNull Path pluginAtPath) { } } - public PluginDescription(@NotNull Path pathToPluginUnderTest, @NotNull String fullName, @NotNull String version, @NotNull String requiredJenkinsVersion) { + public PluginDescription(@NonNull Path pathToPluginUnderTest, @NonNull String fullName, @NonNull String version, @NonNull String requiredJenkinsVersion) { this.path = pathToPluginUnderTest; this.fullName = fullName; this.version = version; diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/jenkins/process/JenkinsProcess.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/jenkins/process/JenkinsProcess.java index 7a245ffa3..a0588effa 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/jenkins/process/JenkinsProcess.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/jenkins/process/JenkinsProcess.java @@ -1,5 +1,6 @@ package net.serenitybdd.integration.jenkins.process; +import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.IOException; import java.nio.file.Path; @@ -8,7 +9,6 @@ import java.util.Map; import java.util.regex.Matcher; import org.jdeferred.Promise; -import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -40,7 +40,7 @@ public void run() { private Thread jenkinsLogWatcherThread; @SuppressFBWarnings(value = "NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE", justification = "FindBugs does not like the JAVA_HOME resolve") - public JenkinsProcess(@NotNull Path java, @NotNull Path jenkinsWar, @NotNull int port, @NotNull Path jenkinsHome) { + public JenkinsProcess(@NonNull Path java, @NonNull Path jenkinsWar, @NonNull int port, @NonNull Path jenkinsHome) { Log.debug("jenkins.war: {}", jenkinsWar.toAbsolutePath()); Log.debug("JENKINS_HOME: {}", jenkinsHome.toAbsolutePath()); diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/utils/Nulls.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/utils/Nulls.java index afd7116c2..2dca8a98c 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/utils/Nulls.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/utils/Nulls.java @@ -1,6 +1,6 @@ package net.serenitybdd.integration.utils; -import org.jetbrains.annotations.NotNull; +import edu.umd.cs.findbugs.annotations.NonNull; public class Nulls { public static T coalesce(T... items) { @@ -8,7 +8,7 @@ public static T coalesce(T... items) { return null; } - public static T getOrElse(T optionalValue, @NotNull T defaultValue) { + public static T getOrElse(T optionalValue, @NonNull T defaultValue) { return optionalValue != null ? optionalValue : defaultValue; } } diff --git a/pom.xml b/pom.xml index 21c4fc370..66e4b9db8 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ org.jenkins-ci.plugins plugin - 4.55 + 4.56