commit 16a9fce0e104a38371a9e5a567ec611ae3fc7f33
author ys9693 <ys9693@att.com> Sun Jan 19 13:50:02 2020 +0200
committer Ofir Sonsino <ofir.sonsino@intl.att.com> Wed Jan 22 12:33:31 2020 +0000
tree 03a2aff3060ddb5bc26a90115805a04becbaffc9
parent aa83a2da4f911c3ac89318b8e9e8403b072942e1

Catalog alignment

Issue-ID: SDC-2724
Signed-off-by: ys9693 <ys9693@att.com>
Change-Id: I52b4aacb58cbd432ca0e1ff7ff1f7dd52099c6fe

pom.xml

diff --git a/pom.xml b/pom.xml
index 89c2c09..802148d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,6 @@
     <!-- 3rd parties versions -->
     <bean-matcher.version>0.11</bean-matcher.version>
     <lang3.version>3.3.2</lang3.version>
-    <lang3.version>3.3.2</lang3.version>
     <guava.version>18.0</guava.version>
     <janusgraph.version>0.3.1</janusgraph.version>
     <spring.version>4.3.18.RELEASE</spring.version>
@@ -57,14 +56,15 @@
     <wire-mock.version>2.18.0</wire-mock.version>
     <ecomp.version>2.4.0</ecomp.version>
     <cassandra.unit.version>3.5.0.1</cassandra.unit.version>
+    <cadi.version>2.1.8</cadi.version>
     <lombok.version>1.18.2</lombok.version>
     <commons-beanutils>1.9.3</commons-beanutils>
     <commons-configuration>2.3</commons-configuration>
     <apache-poi.version>4.1.0</apache-poi.version>
-        <onap.logging.version>1.6.1</onap.logging.version>
+    <onap.logging.version>1.6.1</onap.logging.version>
 
     <commons.collections.version>4.1</commons.collections.version>
-        <ws.rs.version>2.0.1</ws.rs.version>
+    <ws.rs.version>2.0.1</ws.rs.version>
 
     <!-- Elastic Search mapper (reference the elastic search version actually). -->
     <elastic-search.version>2.4.0</elastic-search.version>
@@ -152,9 +152,13 @@
     <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
     <!--docker tags-->
     <docker.tag>${project.version}-${maven.build.timestamp}</docker.tag>
+    <!--togglz version-->
+    <togglz.version>2.4.1.Final</togglz.version>
 
     <joda.time.version>2.9.9</joda.time.version>
 
+    <!--sdc-security-utils-->
+    <security.util.version>1.6.0</security.util.version>
     <!--jacoco-->
     <jacoco.version>0.8.1</jacoco.version>
 
@@ -537,8 +541,7 @@
       </activation>
       <modules>
         <module>onboarding</module>
-                <module>common-app-logging</module>
-        <module>security-utils</module>
+        <module>common-app-logging</module>
         <module>common-app-api</module>
         <module>common-be</module>
         <module>catalog-dao</module>
@@ -561,8 +564,7 @@
         <activeByDefault>false</activeByDefault>
       </activation>
       <modules>
-        <module>security-utils</module>
-                <module>common-app-logging</module>
+        <module>common-app-logging</module>
         <module>common-app-api</module>
         <module>common-be</module>
         <module>catalog-dao</module>