X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=oparent%2Fpom.xml;h=d04d3470084cbe5aa1b26385cb6f72e79089da70;hb=43836a9e53e965e6057ff08824d2cc4660a90049;hp=ed21639aa7d8ec96f14571de1e02782a7799b2eb;hpb=dffc2f59ab7e8e35945eea56cb83f1a0e2a26153;p=ccsdk%2Fparent.git

diff --git a/oparent/pom.xml b/oparent/pom.xml
index ed21639a..d04d3470 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.6.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
@@ -25,6 +25,16 @@
         <system>JIRA</system>
         <url>https://jira.onap.org/</url>
     </issueManagement>
+    <distributionManagement>
+        <repository>
+            <id>ecomp-releases</id>
+            <url>${onap.nexus.release-url}</url>
+        </repository>
+        <snapshotRepository>
+            <id>ecomp-snapshots</id>
+            <url>${onap.nexus.snapshot-url}</url>
+        </snapshotRepository>
+    </distributionManagement>
 
     <properties>
         <!-- Sonar properties -->
@@ -37,7 +47,7 @@
         <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
 
         <!-- Jacoco properties -->
-        <jacoco.version>0.8.5</jacoco.version>
+        <jacoco.version>0.8.8</jacoco.version>
         <!-- ONAP repositories -->
         <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
         <onap.nexus.host>nexus.onap.org</onap.nexus.host>
@@ -50,31 +60,35 @@
         <onap.nexus.staging.server-id>ecomp-staging</onap.nexus.staging.server-id>
         <onap.nexus.staging.profile-id>176c31dfe190a</onap.nexus.staging.profile-id>
 
-        <java.version>11</java.version>
-        <maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
-        <maven-failsafe-plugin.version>3.0.0-M5</maven-failsafe-plugin.version>
-        <bundle.plugin.version>4.2.1</bundle.plugin.version>
-        <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
+        <java.version>17</java.version>
+        <maven-surefire-plugin.version>3.0.0-M8</maven-surefire-plugin.version>
+        <maven-failsafe-plugin.version>3.0.0-M8</maven-failsafe-plugin.version>
+        <bundle.plugin.version>5.1.1</bundle.plugin.version>
+        <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
         <checkstyle.skip>true</checkstyle.skip>
+        <logback.version>1.2.11</logback.version>
 
         <!-- CCSDK component versions -->
-        <ccsdk.cds.version>1.2.0-SNAPSHOT</ccsdk.cds.version>
-        <ccsdk.features.version>1.2.0-SNAPSHOT</ccsdk.features.version>
-        <ccsdk.sli.version>1.3.0-SNAPSHOT</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.4.4</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>
-        <dmaap.listener.version>1.1.12</dmaap.listener.version>
-        <sdc.client.version>1.4.1</sdc.client.version>
+        <velocity.version>2.3</velocity.version>
+        <dmaap.listener.version>1.1.14</dmaap.listener.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>
+        <antlr.version>4.12.0</antlr.version>
+        <antlr4.version>4.12.0</antlr4.version>
     </properties>
 
     <dependencyManagement>
@@ -84,7 +98,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.6.0-SNAPSHOT</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -100,6 +114,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>
@@ -143,7 +162,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>