Bump Serenity from 3.6.12 to 3.6.17 (#700)

Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
jenkinsci · Mar 20, 2023 · 3032222 · 3032222
1 parent 617baa4
commit 3032222
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 11 deletions.
diff --git a/build-monitor-acceptance/pom.xml b/build-monitor-acceptance/pom.xml
@@ -14,7 +14,7 @@
     <name>Build Monitor Acceptance Tests</name>
 
     <properties>
-        <serenity.version>3.6.12</serenity.version>
+        <serenity.version>3.6.17</serenity.version>
         <slf4j.version>2.0.7</slf4j.version>
     </properties>
 
@@ -60,6 +60,12 @@
             <groupId>net.serenity-bdd</groupId>
             <artifactId>serenity-core</artifactId>
             <version>${serenity.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.jetbrains</groupId>
+                    <artifactId>annotations</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>net.serenity-bdd</groupId>

diff --git a/...e/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/model/ProjectStatus.java b/...e/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/model/ProjectStatus.java
@@ -1,13 +1,13 @@
 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;
 import java.util.List;
 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<ProjectStatus> 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/...ance/src/main/java/net/serenitybdd/integration/jenkins/environment/PluginDescription.java b/...ance/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/...-acceptance/src/main/java/net/serenitybdd/integration/jenkins/process/JenkinsProcess.java b/...-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
@@ -1,14 +1,14 @@
 package net.serenitybdd.integration.utils;
 
-import org.jetbrains.annotations.NotNull;
+import edu.umd.cs.findbugs.annotations.NonNull;
 
 public class Nulls {
     public static <T> T coalesce(T... items) {
         for(T i : items) if(i != null) return i;
         return null;
     }
 
-    public static <T> T getOrElse(T optionalValue, @NotNull T defaultValue) {
+    public static <T> T getOrElse(T optionalValue, @NonNull T defaultValue) {
         return optionalValue != null ? optionalValue : defaultValue;
     }
 }
diff --git a/pom.xml b/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>4.55</version>
+        <version>4.56</version>
         <relativePath />
     </parent>