From cc365ed10626b3285b89eedd3ca28eb1f7ba5870 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Feb 2024 15:04:22 -0500 Subject: [PATCH 1/3] [PF-2983]: Bump com.jfrog.artifactory from 4.28.2 to 5.1.14 (#135) Bumps com.jfrog.artifactory from 4.28.2 to 5.1.14. --- updated-dependencies: - dependency-name: com.jfrog.artifactory dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 8f96927..12fd06d 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ plugins { id 'com.diffplug.spotless' version '6.16.0' id 'com.github.spotbugs' version '5.0.13' id 'com.github.ben-manes.versions' version '0.42.0' - id 'com.jfrog.artifactory' version '4.28.2' + id 'com.jfrog.artifactory' version '5.1.14' id 'org.sonarqube' version '4.0.0.2929' // [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 From 348fd79ea554f4632fa08c54b5fe31078bacf80f Mon Sep 17 00:00:00 2001 From: bumptagbot Date: Mon, 12 Feb 2024 20:14:10 +0000 Subject: [PATCH 2/3] bump 0.1.15 --- settings.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle b/settings.gradle index 5834ddc..a841d3c 100644 --- a/settings.gradle +++ b/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' From 8f95183988e2f2a2d3cfdbc257e0d345ad622909 Mon Sep 17 00:00:00 2001 From: Christina Ahrens Roberts Date: Tue, 13 Feb 2024 10:00:44 -0500 Subject: [PATCH 3/3] [WOR-1502] Remove spotbugs (#148) * Remove spotbugs (WOR-1502). * Remove spotbugs (WOR-1502). * Remove spotbugs (WOR-1502). --- build.gradle | 6 ----- gradle/spotbugs.gradle | 26 ------------------- .../common/kubernetes/KubePodListener.java | 4 --- .../terra/common/kubernetes/KubeService.java | 4 --- .../common/logging/LoggingTestController.java | 2 -- 5 files changed, 42 deletions(-) delete mode 100644 gradle/spotbugs.gradle diff --git a/build.gradle b/build.gradle index 12fd06d..73fd613 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,6 @@ plugins { id 'maven-publish' id 'com.diffplug.spotless' version '6.16.0' - id 'com.github.spotbugs' version '5.0.13' id 'com.github.ben-manes.versions' version '0.42.0' id 'com.jfrog.artifactory' version '5.1.14' id 'org.sonarqube' version '4.0.0.2929' @@ -118,10 +117,6 @@ dependencies { testImplementation 'org.springframework:spring-aop:6.0.11' testImplementation 'org.springframework:spring-aspects:6.0.11' - - // Spotbugs - implementation group: 'com.github.spotbugs', name: 'spotbugs-annotations', version: '4.7.2' - // Testing testImplementation('org.springframework.boot:spring-boot-starter-test:3.1.2') { exclude group: 'com.vaadin.external.google', module: 'android-json' @@ -165,6 +160,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" diff --git a/gradle/spotbugs.gradle b/gradle/spotbugs.gradle deleted file mode 100644 index 01b719f..0000000 --- a/gradle/spotbugs.gradle +++ /dev/null @@ -1,26 +0,0 @@ -// static analysis -spotbugs { - effort = 'max' - extraArgs = ['-emacs'] - ignoreFailures = true -} - -spotbugsMain { - reports { - html { - required = true - outputLocation = file("$buildDir/reports/spotbugs/main.html") - stylesheet = 'fancy.xsl' - } - } -} - -spotbugsTest { - reports { - html { - required = true - outputLocation = file("$buildDir/reports/spotbugs/test.html") - stylesheet = 'fancy.xsl' - } - } -} diff --git a/src/main/java/bio/terra/common/kubernetes/KubePodListener.java b/src/main/java/bio/terra/common/kubernetes/KubePodListener.java index 0c55553..9e28ee8 100644 --- a/src/main/java/bio/terra/common/kubernetes/KubePodListener.java +++ b/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 { diff --git a/src/main/java/bio/terra/common/kubernetes/KubeService.java b/src/main/java/bio/terra/common/kubernetes/KubeService.java index af7b134..9622f6a 100644 --- a/src/main/java/bio/terra/common/kubernetes/KubeService.java +++ b/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; diff --git a/src/test/java/bio/terra/common/logging/LoggingTestController.java b/src/test/java/bio/terra/common/logging/LoggingTestController.java index 40dfbe8..8b1f905 100644 --- a/src/test/java/bio/terra/common/logging/LoggingTestController.java +++ b/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);