Merge branch 'develop' into dependabot/gradle/develop/minor-patch-dep…

…endencies-ef30d08f91

build.gradle

@@ -5,10 +5,10 @@ plugins {
     id 'maven-publish'
 
     id 'com.diffplug.spotless' version '6.25.0'
-    id 'com.github.spotbugs' version '5.0.13'
     id 'com.github.ben-manes.versions' version '0.51.0'
-    id 'com.jfrog.artifactory' version '4.28.2'
+    id 'com.jfrog.artifactory' version '5.1.14'
     id 'org.sonarqube' version '4.4.1.3373'
+
     // [dd 2021-05-17] Use of Spring dependency management generates invalid POM, making
     // it impossible to publish to mavenLocal. In order to make TCL testable, I have
     // removed this plugin and filled in specific version numbers. I also removed all
@@ -118,10 +118,6 @@ dependencies {
     testImplementation 'org.springframework:spring-aop:6.1.3'
     testImplementation 'org.springframework:spring-aspects:6.1.3'
 
-
-    // Spotbugs
-    implementation group: 'com.github.spotbugs', name: 'spotbugs-annotations', version: '4.8.3'
-
     // Testing
     testImplementation('org.springframework.boot:spring-boot-starter-test:3.2.2') {
         exclude group: 'com.vaadin.external.google', module: 'android-json'
@@ -165,6 +161,5 @@ apply from: "$gradleIncDir/javadoc.gradle"
 apply from: "$gradleIncDir/publishing.gradle"
 apply from: "$gradleIncDir/quality.gradle"
 apply from: "$gradleIncDir/sonarqube.gradle"
-apply from: "$gradleIncDir/spotbugs.gradle"
 apply from: "$gradleIncDir/spotless.gradle"
 apply from: "$gradleIncDir/testing.gradle"

settings.gradle

@@ -1,4 +1,4 @@
 rootProject.name = 'terra-common-lib'
 
 gradle.ext.projectGroup = 'bio.terra'
-gradle.ext.tclVersion = '0.1.14-SNAPSHOT'
+gradle.ext.tclVersion = '0.1.15-SNAPSHOT'

src/main/java/bio/terra/common/kubernetes/KubePodListener.java

@@ -4,7 +4,6 @@
 import bio.terra.stairway.exception.DatabaseOperationException;
 import bio.terra.stairway.exception.StairwayExecutionException;
 import com.google.common.reflect.TypeToken;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import io.kubernetes.client.openapi.ApiClient;
 import io.kubernetes.client.openapi.ApiException;
 import io.kubernetes.client.openapi.Configuration;
@@ -37,9 +36,6 @@
  * recreated in a retry loop. Happily, recreating the watch causes Kubernetes to reiterate all of
  * the current pods, so the listener does not miss state changes.
  */
-@SuppressFBWarnings(
-    value = "RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE",
-    justification = "Spotbugs doesn't understand resource try construct")
 class KubePodListener implements Runnable {
 
   enum PodState {

src/main/java/bio/terra/common/kubernetes/KubeService.java

@@ -2,7 +2,6 @@
 
 import bio.terra.common.kubernetes.exception.KubeApiException;
 import bio.terra.stairway.Stairway;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import io.kubernetes.client.openapi.ApiClient;
 import io.kubernetes.client.openapi.ApiException;
 import io.kubernetes.client.openapi.Configuration;
@@ -31,9 +30,6 @@
  * name. Then the service can compare the list of stairways it thinks should be running, compare
  * with list of active pods, and recover anything that is no longer active.
  */
-@SuppressFBWarnings(
-    value = "DMI_HARDCODED_ABSOLUTE_FILENAME",
-    justification = "The K8s namespace file is a valid absolute filename")
 public class KubeService {
   // The maximum retry when calling Kubernetes.
   private static final int MAX_RETRY = 10;

src/test/java/bio/terra/common/logging/LoggingTestController.java

@@ -2,7 +2,6 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.google.gson.JsonObject;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -13,7 +12,6 @@
  * LoggingTest} for its use and assertions.
  */
 @RestController
-@SuppressFBWarnings(value = "UrF", justification = "Pojo fields are unread but serialized to JSON")
 public class LoggingTestController {
 
   private static final Logger LOG = LoggerFactory.getLogger(LoggingTestController.class);