From: liamfallon <liam.fallon@est.tech>
Date: Wed, 19 Oct 2022 09:39:24 +0000 (+0100)
Subject: Fix some dependencies flagged in scans
X-Git-Tag: 1.11.1~2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F48%2F131548%2F1;p=policy%2Fcommon.git

Fix some dependencies flagged in scans

Issue-ID: POLICY-4393
Change-Id: I5b82f5e17ae8827486cc477d7ade4ed46e2e902b
Signed-off-by: liamfallon <liam.fallon@est.tech>
---

diff --git a/integrity-audit/src/main/java/org/onap/policy/common/ia/DbAudit.java b/integrity-audit/src/main/java/org/onap/policy/common/ia/DbAudit.java
index c8ca41ca..d20ed80c 100644
--- a/integrity-audit/src/main/java/org/onap/policy/common/ia/DbAudit.java
+++ b/integrity-audit/src/main/java/org/onap/policy/common/ia/DbAudit.java
@@ -461,11 +461,15 @@ public class DbAudit {
                     + "\n    Entry 1 (short prefix style): " + resourceName1 + ": "
                     + new ReflectionToStringBuilder(entry1, ToStringStyle.SHORT_PREFIX_STYLE).toString()
                     + "\n    Entry 2 (short prefix style): " + resourceName2 + ": "
-                    + new ReflectionToStringBuilder(entry2, ToStringStyle.SHORT_PREFIX_STYLE).toString()
+                    + (entry2 != null
+                        ? new ReflectionToStringBuilder(entry2, ToStringStyle.SHORT_PREFIX_STYLE).toString()
+                        : "null")
                     + "\n    Entry 1 (recursive style): " + resourceName1 + ": "
                     + new ReflectionToStringBuilder(entry1, new RecursiveToStringStyle()).toString()
                     + "\n    Entry 2 (recursive style): " + resourceName2 + ": "
-                    + new ReflectionToStringBuilder(entry2, new RecursiveToStringStyle()).toString();
+                    + (entry2 != null
+                        ? new ReflectionToStringBuilder(entry2, new RecursiveToStringStyle()).toString()
+                        : "null");
             logger.debug(msg);
 
         } catch (ClassNotFoundException e) {
diff --git a/pom.xml b/pom.xml
index 377924af..2d33ddb4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,9 +47,6 @@
         <releases.path>content/repositories/releases/</releases.path>
         <snapshots.path>content/repositories/snapshots/</snapshots.path>
         <staging.path>content/repositories/staging/</staging.path>
-
-        <!-- Project common dependency versions -->
-        <commons-lang3.version>3.4</commons-lang3.version>
     </properties>
 
     <modules>
@@ -65,16 +62,6 @@
         <module>spring-utils</module>
     </modules>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.apache.commons</groupId>
-                <artifactId>commons-lang3</artifactId>
-                <version>${commons-lang3.version}</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <build>
         <plugins>
             <plugin>