X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=oparent%2Fpom.xml;h=43af3fa863ce4f80c037643aa9e472764b0e82d6;hb=d04c3e4e36827cfe52fef52231b28f27264ab380;hp=7227818c725a2c1d787defe81e20826be7e07f23;hpb=10f7357ab7b746062b4f22df2a251f11634d5d20;p=ccsdk%2Fparent.git

diff --git a/oparent/pom.xml b/oparent/pom.xml
index 7227818c..43af3fa8 100755
--- a/oparent/pom.xml
+++ b/oparent/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.onap.oparent</groupId>
         <artifactId>oparent</artifactId>
-        <version>3.2.0</version>
+        <version>3.3.1</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.parent</groupId>
     <artifactId>oparent</artifactId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>2.5.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
@@ -66,22 +66,25 @@
         <bundle.plugin.version>4.2.1</bundle.plugin.version>
         <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
         <checkstyle.skip>true</checkstyle.skip>
+        <logback.version>1.2.11</logback.version>
 
         <!-- CCSDK component versions -->
-        <ccsdk.cds.version>(1.1.9999, 1.2.99999)</ccsdk.cds.version>
-        <ccsdk.features.version>(1.1.99999, 1.2.99999)</ccsdk.features.version>
-        <ccsdk.sli.version>(1.2.99999, 1.3.99999)</ccsdk.sli.version>
+        <ccsdk.cds.version>(1.4.9999, 1.5.99999-SNAPSHOT]</ccsdk.cds.version>
+        <ccsdk.features.version>(1.4.99999, 1.5.99999-SNAPSHOT]</ccsdk.features.version>
+        <ccsdk.sli.version>(1.5.99999, 1.6.99999-SNAPSHOT]</ccsdk.sli.version>
         <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version>
         <ccsdk.sli.adaptors.version>${ccsdk.sli.version}</ccsdk.sli.adaptors.version>
         <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version>
         <ccsdk.sli.plugins.version>${ccsdk.sli.version}</ccsdk.sli.plugins.version>
-        <ccsdk.distribution.version>1.1.1-SNAPSHOT</ccsdk.distribution.version>
+        <ccsdk.distribution.version>(1.4.9999, 1.5.99999-SNAPSHOT]</ccsdk.distribution.version>
 
-        <mariadb.connector.version>2.7.3</mariadb.connector.version>
+        <log4j.version>2.17.1</log4j.version>
+        <log4j2.version>2.17.1</log4j2.version>
+        <mariadb.connector.version>2.7.5</mariadb.connector.version>
         <fasterxml.jackson.version>2.10.5</fasterxml.jackson.version>
-        <velocity.version>2.0</velocity.version>
+        <velocity.version>2.3</velocity.version>
         <dmaap.listener.version>1.1.12</dmaap.listener.version>
-        <sdc.client.version>1.4.1</sdc.client.version>
+        <sdc.client.version>2.0.0</sdc.client.version>
         <sdc.tosca.version>1.6.5</sdc.tosca.version>
 
         <antlr.version>4.8-1</antlr.version>
@@ -94,7 +97,7 @@
                 otherwise ccsdk/distribution/dependencies is not resolving correctly -->
                 <groupId>org.onap.ccsdk.parent</groupId>
                 <artifactId>dependencies-bom</artifactId>
-                <version>2.2.0-SNAPSHOT</version>
+                <version>2.5.1-SNAPSHOT</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -110,6 +113,11 @@
                  <artifactId>antlr4-runtime</artifactId>
                  <version>${antlr.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.mariadb.jdbc</groupId>
+                <artifactId>mariadb-java-client</artifactId>
+                <version>${mariadb.connector.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.onap.sdc.sdc-distribution-client</groupId>
                 <artifactId>sdc-distribution-client</artifactId>
@@ -153,7 +161,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>1.10.19</version>
+            <version>3.12.4</version>
             <scope>test</scope>
         </dependency>
         <dependency>