X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=oparent%2Fpom.xml;h=3caaf5e1f2627823df1dd940d91c594d5532c3ca;hb=1777b660036ec994ef5874d3eb567def38541f96;hp=950e806d939228b15718b6461f58a26767a3eb4e;hpb=e3c423dfdebdc9e70d4f3f9f3e5daa0b11967093;p=oparent.git

diff --git a/oparent/pom.xml b/oparent/pom.xml
index 950e806..3caaf5e 100644
--- a/oparent/pom.xml
+++ b/oparent/pom.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
    Copyright (c) 2016-2017 Huawei Technologies Co., Ltd.
+   Modifications copyright (C) 2019 AT&T Intellectual Property
+   Modifications Copyright (C) 2019-2020 Nordix Foundation.
+   Modifications Copyright (C) 2020 Bell Canada.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -19,7 +22,8 @@
   <parent>
     <groupId>org.onap.oparent</groupId>
     <artifactId>version</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <!-- When changing, also change the oparent.version property -->
+    <version>3.3.3-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>oparent</artifactId>
@@ -32,12 +36,12 @@
     <url>https://wiki.onap.org/display/DW/Integration+Project</url>
   </scm>
   <properties>
-    <jacoco.version>0.7.7.201606060606</jacoco.version>
+    <oparent.version>3.3.3</oparent.version>
+    <jacoco.version>0.8.5</jacoco.version>
     <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
     <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
     <!-- Default Sonar configuration -->
-    <sonar.jacoco.reportPath>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPath>
-    <sonar.jacoco.itReportPath>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPath>
+    <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
     <!-- Note: This list should match jacoco-maven-plugin's exclusion list below -->
     <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
     <!-- If following file exist, auto-generation of swagger.json will be done -->
@@ -45,53 +49,27 @@
     <!-- If following file exist, auto-generation of sdk will be done -->
     <swagger-json>${basedir}/src/main/resources/swagger.json</swagger-json>
   </properties>
-  <repositories>
-    <repository>
-      <id>central</id>
-      <name>Maven 2 repository 2</name>
-      <url>http://repo2.maven.org/maven2/</url>
-    </repository>
-    <repository>
-      <id>ecomp-releases</id>
-      <name>ONAP Release Repository</name>
-      <url>https://nexus.onap.org/content/repositories/releases/</url>
-    </repository>
-    <repository>
-      <id>ecomp-snapshots</id>
-      <name>ONAP Snapshot Repository</name>
-      <url>https://nexus.onap.org/content/repositories/snapshots/</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-    </repository>
-  </repositories>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>central</id>
-      <name>Maven 2 repository 2</name>
-      <url>http://repo2.maven.org/maven2/</url>
-    </pluginRepository>
-    <pluginRepository>
-      <id>ecomp-releases</id>
-      <name>ONAP Release Repository</name>
-      <url>https://nexus.onap.org/content/repositories/releases/</url>
-    </pluginRepository>
-    <pluginRepository>
-      <id>ecomp-snapshots</id>
-      <name>ONAP Snapshot Repository</name>
-      <url>https://nexus.onap.org/content/repositories/snapshots/</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-    </pluginRepository>
-  </pluginRepositories>
   <profiles>
+    <profile>
+        <id>cve</id>
+        <build>
+            <plugins>
+                <plugin>
+                    <groupId>org.owasp</groupId>
+                    <artifactId>dependency-check-maven</artifactId>
+                    <version>5.3.2</version>
+                    <executions>
+                        <execution>
+                            <goals>
+                                <goal>check</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+            </plugins>
+        </build>
+    </profile>
+
     <profile>
       <id>generate-json</id>
       <activation>
@@ -319,6 +297,17 @@
       </dependencies>
     </profile>
   </profiles>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.onap.oparent</groupId>
+        <artifactId>dependencies</artifactId>
+        <version>${project.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
   <build>
     <pluginManagement>
       <plugins>
@@ -411,7 +400,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.19.1</version>
+          <version>3.0.0-M4</version>
           <configuration>
             <!-- Sets the VM argument line used when unit tests are run. -->
             <argLine>${surefireArgLine}</argLine>
@@ -424,7 +413,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-failsafe-plugin</artifactId>
-          <version>2.19.1</version>
+          <version>3.0.0-M4</version>
           <executions>
             <!--
         Ensures that both integration-test and verify goals of the Failsafe Maven
@@ -443,17 +432,34 @@
             </execution>
           </executions>
         </plugin>
+        <!-- https://mvnrepository.com/artifact/org.sonarsource.scanner.maven/sonar-maven-plugin -->
+        <plugin>
+          <groupId>org.sonarsource.scanner.maven</groupId>
+          <artifactId>sonar-maven-plugin</artifactId>
+          <version>${sonar.scanner.version}</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-checkstyle-plugin</artifactId>
+          <version>3.1.1</version>
+          <dependencies>
+            <dependency>
+              <groupId>com.puppycrawl.tools</groupId>
+              <artifactId>checkstyle</artifactId>
+              <version>8.43</version>
+            </dependency>
+          </dependencies>
+        </plugin>
       </plugins>
     </pluginManagement>
     <plugins>
       <plugin>
         <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>2.17</version>
         <dependencies>
           <dependency>
             <groupId>org.onap.oparent</groupId>
             <artifactId>checkstyle</artifactId>
-            <version>1.1.0-SNAPSHOT</version>
+            <version>${project.version}</version>
           </dependency>
         </dependencies>
         <executions>
@@ -468,11 +474,13 @@
               <includeResources>false</includeResources>
               <includeTestSourceDirectory>true</includeTestSourceDirectory>
               <includeTestResources>false</includeTestResources>
-              <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+              <sourceDirectories>
+                <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+              </sourceDirectories>
               <excludes>
               </excludes>
               <consoleOutput>true</consoleOutput>
-              <failsOnViolation>false</failsOnViolation>
+              <failOnViolation>false</failOnViolation>
             </configuration>
           </execution>
           <execution>
@@ -486,15 +494,17 @@
                    https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml
                    with minor changes -->
               <configLocation>onap-checkstyle/onap-java-style.xml</configLocation>
-              <!-- <sourceDirectory> is needed so that checkstyle ignores the generated sources directory -->
-              <sourceDirectory>${project.build.sourceDirectory}/src/main/java</sourceDirectory>
+              <!-- <sourceDirectories> is needed so that checkstyle ignores the generated sources directory -->
+              <sourceDirectories>
+                <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+              </sourceDirectories>
               <includeResources>true</includeResources>
               <includeTestSourceDirectory>true</includeTestSourceDirectory>
               <includeTestResources>true</includeTestResources>
               <excludes>
               </excludes>
               <consoleOutput>true</consoleOutput>
-              <failsOnViolation>false</failsOnViolation>
+              <failOnViolation>false</failOnViolation>
             </configuration>
           </execution>
         </executions>