X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=oparent%2Fpom.xml;h=f941f10ee099d1346f6d716c646a681e04dac1e3;hb=8356f77ce08ed1dc1d467e2f5c64460a24de2af3;hp=1713ea42ae68eb38e9df029b7a78766e0af3216d;hpb=4b9f4f2172ef327b18b8ad859f39f609a99f6e7d;p=ccsdk%2Fparent.git

diff --git a/oparent/pom.xml b/oparent/pom.xml
index 1713ea42..f941f10e 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.4</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,41 +60,44 @@
         <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]</ccsdk.cds.version>
+        <ccsdk.features.version>(1.4.99999, 1.5.99999]</ccsdk.features.version>
+        <ccsdk.sli.version>(1.5.99999, 1.6.99999]</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]</ccsdk.distribution.version>
 
-        <mariadb.connector.version>2.1.1</mariadb.connector.version>
-        <fasterxml.jackson.version>2.10.0</fasterxml.jackson.version>
-        <velocity.version>2.0</velocity.version>
-
-        <dmaap.listener.version>1.1.5</dmaap.listener.version>
-        <sdc.client.version>1.4.1</sdc.client.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.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>
-
     </properties>
 
     <dependencyManagement>
         <dependencies>
             <dependency>
+                <!-- keep groupId and version as plain and not as var,
+                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.4</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -92,14 +105,19 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
                 <version>2.3.8.RELEASE</version>
-                <scope>import</scope>
                 <type>pom</type>
+                <scope>import</scope>
             </dependency>
             <dependency>
                  <groupId>org.antlr</groupId>
                  <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>
@@ -140,11 +158,10 @@
             <artifactId>slf4j-simple</artifactId>
             <scope>test</scope>
         </dependency>
-
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>1.10.19</version>
+            <version>3.12.4</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -158,7 +175,7 @@
     <repositories>
         <repository>
             <id>onap-public</id>
-            <url>https://nexus.onap.org/content/groups/public</url>
+            <url>${onap.nexus.public-url}</url>
             <releases>
                 <enabled>true</enabled>
                 <updatePolicy>never</updatePolicy>
@@ -170,7 +187,7 @@
         </repository>
         <repository>
             <id>onap-staging</id>
-            <url>https://nexus.onap.org/content/groups/staging</url>
+            <url>${onap.nexus.staging-url}</url>
             <releases>
                 <enabled>true</enabled>
                 <updatePolicy>never</updatePolicy>
@@ -183,7 +200,7 @@
         <repository>
             <id>ecomp-release</id>
             <name>onap-repository-releases</name>
-            <url>https://nexus.onap.org/content/repositories/releases</url>
+            <url>${onap.nexus.release-url}</url>
             <releases>
                 <enabled>true</enabled>
                 <updatePolicy>never</updatePolicy>
@@ -195,7 +212,7 @@
         <repository>
             <id>ecomp-snapshot</id>
             <name>onap-repository-snapshots</name>
-            <url>https://nexus.onap.org/content/repositories/snapshots</url>
+            <url>${onap.nexus.snapshot-url}</url>
             <releases>
                 <enabled>false</enabled>
             </releases>
@@ -204,6 +221,49 @@
             </snapshots>
         </repository>
     </repositories>
+    <pluginRepositories>
+        <pluginRepository>
+            <id>onap-public</id>
+            <url>${onap.nexus.public-url}</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </pluginRepository>
+        <pluginRepository>
+            <id>onap-staging</id>
+            <url>${onap.nexus.staging-url}</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </pluginRepository>
+        <pluginRepository>
+            <id>onap-snapshot</id>
+            <url>${onap.nexus.snapshot-url}</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </pluginRepository>
+        <!-- Black Duck plugin dependencies -->
+        <pluginRepository>
+            <id>JCenter</id>
+            <name>JCenter Repository</name>
+            <url>http://jcenter.bintray.com</url>
+        </pluginRepository>
+        <pluginRepository>
+            <id>Restlet</id>
+            <name>Restlet Repository</name>
+            <url>http://maven.restlet.com</url>
+        </pluginRepository>
+    </pluginRepositories>
 
     <build>
         <pluginManagement>
@@ -256,13 +316,11 @@
                         <configuration>
                             <!-- Sets the path to the file which contains the execution data. -->
                             <destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
-                            <!-- Sets the name of the property containing the settings for JaCoCo
-                                                                 runtime agent. -->
+                            <!-- Sets the name of the property containing the settings for JaCoCo runtime agent. -->
                             <propertyName>surefireArgLine</propertyName>
                         </configuration>
                     </execution>
-                    <!-- Ensures that the code coverage report for unit tests is created
-                                                 after unit tests have been run. -->
+                    <!-- Ensures that the code coverage report for unit tests is created after unit tests have been run. -->
                     <execution>
                         <id>post-unit-test</id>
                         <phase>test</phase>
@@ -285,13 +343,11 @@
                         <configuration>
                             <!-- Sets the path to the file which contains the execution data. -->
                             <destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
-                            <!-- Sets the name of the property containing the settings for JaCoCo
-                                                                 runtime agent. -->
+                            <!-- Sets the name of the property containing the settings for JaCoCo runtime agent. -->
                             <propertyName>failsafeArgLine</propertyName>
                         </configuration>
                     </execution>
-                    <!-- Ensures that the code coverage report for integration tests after
-                                                 integration tests have been run. -->
+                    <!-- Ensures that the code coverage report for integration tests after integration tests have been run. -->
                     <execution>
                         <id>post-integration-test</id>
                         <phase>post-integration-test</phase>