Bump spotbugs to 4.7.3

https://github.com/spotbugs/spotbugs/releases/tag/4.7.3

Change-Id: Ie9c2f372b439a28e7d391d8117739921aab765fc
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/bundles-test-lib/src/main/java/org/opendaylight/odlparent/bundlestest/lib/BundleDiagInfosImpl.java b/bundles-test-lib/src/main/java/org/opendaylight/odlparent/bundlestest/lib/BundleDiagInfosImpl.java
index eb3e1df0d2d316febda9d79979206f5ec95800a9..aa3d41980d169761d242e1533a8f7d3c8b47244e 100644 (file)
--- a/bundles-test-lib/src/main/java/org/opendaylight/odlparent/bundlestest/lib/BundleDiagInfosImpl.java
+++ b/bundles-test-lib/src/main/java/org/opendaylight/odlparent/bundlestest/lib/BundleDiagInfosImpl.java
@@ -82,15 +82,13 @@ final class BundleDiagInfosImpl implements BundleDiagInfos {
                 = new BundleSymbolicNameWithVersion(bundleSymbolicName, bundle.getVersion().toString());
 
             BundleInfo karafBundleInfo = bundleService.getInfo(bundle);
+            String diagText = bundleService.getDiag(bundle);
             BundleState karafBundleState = karafBundleInfo.getState();
             bundlesStateMap.put(bundleSymbolicNameWithVersion, karafBundleState);
 
             String bundleStateDiagText = "OSGi state = " + bundleStateToText(bundle.getState())
-                + ", Karaf bundleState = " + karafBundleState;
-            String diagText = bundleService.getDiag(bundle);
-            if (!diagText.isEmpty()) {
-                bundleStateDiagText += ", due to: " + diagText;
-            }
+                + ", Karaf bundleState = " + karafBundleState
+                + (diagText.isEmpty() ? "" : ", due to: " + diagText);
 
             if (WHITELISTED_BUNDLES.get(bundleSymbolicName) != null) {
                 if (WHITELISTED_BUNDLES.get(bundleSymbolicName).equals(karafBundleState)) {

diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index 3ebc634ff4d2bb203c20f72c3c04f9e48a227d63..51d985ce3360f7f38107e85cd0b4c2bce5af3ffc 100644 (file)
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -362,7 +362,7 @@
       <dependency>
         <groupId>com.github.spotbugs</groupId>
         <artifactId>spotbugs-annotations</artifactId>
-        <version>4.7.2</version>
+        <version>4.7.3</version>
         <scope>provided</scope>
         <!-- Contains retention=RUNTIME annotations, which are not really needed -->
         <optional>true</optional>
@@ -1137,7 +1137,7 @@
             <dependency>
               <groupId>com.github.spotbugs</groupId>
               <artifactId>spotbugs</artifactId>
-              <version>4.7.2</version>
+              <version>4.7.3</version>
             </dependency>
             <dependency>
               <groupId>org.opendaylight.odlparent</groupId>