X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=dcae-analytics%2Fpom.xml;h=ce7521e036c1a41641aed98e4f515430180518b8;hb=refs%2Fchanges%2F28%2F127028%2F8;hp=659d0992416be89e029fc99d32dff8821a333523;hpb=956d9ebe0e869348d5e90ca8bd1b4a48cae12e5f;p=dcaegen2%2Fanalytics%2Ftca-gen2.git

diff --git a/dcae-analytics/pom.xml b/dcae-analytics/pom.xml
index 659d099..ce7521e 100644
--- a/dcae-analytics/pom.xml
+++ b/dcae-analytics/pom.xml
@@ -1,7 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
+  ~ ============LICENSE_START=======================================================
+  ~ TCAgen2
   ~ ================================================================================
-  ~ Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
+  ~ Copyright (c) 2018-2020 AT&T Intellectual Property. All rights reserved.
+  ~ Copyright (c) 2021 Samsung Electronics. All rights reserved.
+  ~ Copyright (c) 2021 China Mobile Property. All rights reserved.
+  ~ Copyright (c) 2022 Wipro Limited.
   ~ ================================================================================
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -19,19 +24,18 @@
   -->
 
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
-	
-	<parent>
-		<groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId>
-		<artifactId>tca-gen2-parent</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
-	</parent>
+
+    <parent>
+        <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId>
+        <artifactId>tca-gen2-parent</artifactId>
+        <version>${revision}</version>
+    </parent>
 
     <artifactId>dcae-analytics</artifactId>
-    <version>3.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>DCAE Analytics Parent</name>
@@ -49,50 +53,49 @@
 
     <properties>
 
-        <!-- PROJECT SETTINGS-->
+        <!-- PROJECT SETTINGS -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <main.basedir>${project.basedir}</main.basedir>
 
         <!-- DEPENDENCIES VERSION -->
-        <eelf.logger.version>3.0.0-SNAPSHOT</eelf.logger.version>
-        <spring.boot.version>2.0.5.RELEASE</spring.boot.version>
+        <eelf.logger.version>1.0.1-SNAPSHOT</eelf.logger.version>
+        <spring.boot.version>2.4.4</spring.boot.version>
         <spring.cloud.version>Finchley.RC2</spring.cloud.version>
-        <spring.version>5.0.11.RELEASE</spring.version>
         <commons.text.version>1.4</commons.text.version>
-        <springfox-swagger2.version>2.9.2</springfox-swagger2.version>
+        <springfox-swagger2.version>3.0.0</springfox-swagger2.version>
         <findbugs.jsr305.version>3.0.2</findbugs.jsr305.version>
         <findbugs.annotations.version>3.0.1</findbugs.annotations.version>
 
         <!-- TEST DEPENDENCIES -->
-        <junit-jupiter.version>5.0.2</junit-jupiter.version>
-        <junit-platform.version>1.0.2</junit-platform.version>
+        <junit-jupiter.version>5.6.2</junit-jupiter.version>
+        <junit-platform.version>1.6.2</junit-platform.version>
         <apiguardian-api.version>1.0.0</apiguardian-api.version>
 
         <!--TEST SETTINGS -->
         <surefire.redirectTestOutputToFile>true</surefire.redirectTestOutputToFile>
         <!-- PLUGINS VERSIONS -->
-        <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
+        <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
         <maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
         <maven-assembly-plugin.version>3.1.0</maven-assembly-plugin.version>
-        <maven-javadoc-plugin.version>3.0.0-M1</maven-javadoc-plugin.version>
-        <maven-surefire-plugin.version>2.19</maven-surefire-plugin.version>
-        <maven-failsafe-plugin.version>2.19.1</maven-failsafe-plugin.version>
+        <maven-javadoc-plugin.version>3.0.0</maven-javadoc-plugin.version>
+        <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
+        <maven-failsafe-plugin.version>2.22.2</maven-failsafe-plugin.version>
         <maven-source-plugin.version>3.0.1</maven-source-plugin.version>
         <maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
         <jacoco.plugin.version>0.8.1</jacoco.plugin.version>
-        <findbugs.plugin.version>3.0.5</findbugs.plugin.version>
-        <pmd.plugin.version>3.8</pmd.plugin.version>
+        <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml
+        </sonar.coverage.jacoco.xmlReportPaths>
+        <pmd.plugin.version>3.11.0</pmd.plugin.version>
         <checkstyle.plugin.version>2.17</checkstyle.plugin.version>
-        <lombok.plugin.version>1.16.18.1</lombok.plugin.version>
+        <lombok.plugin.version>1.18.0.0</lombok.plugin.version>
         <gitcommitid.plugin.version>2.2.3</gitcommitid.plugin.version>
         <maven.build.helper.plugin.version>3.0.0</maven.build.helper.plugin.version>
-        <!--<dockerfile-maven-version>1.4.3</dockerfile-maven-version>-->
-	<docker-maven-version>1.0.0</docker-maven-version>
+        <docker-maven-version>1.0.0</docker-maven-version>
 
         <!--PLUGIN SETTINGS -->
-        <compiler.source.version>1.8</compiler.source.version>
-        <compiler.target.version>1.8</compiler.target.version>
+        <compiler.source.version>11</compiler.source.version>
+        <compiler.target.version>11</compiler.target.version>
         <unit.test.pattern>**/*Test.java</unit.test.pattern>
         <skip.unit.tests>false</skip.unit.tests>
         <integration.test.pattern>**/*IT.java</integration.test.pattern>
@@ -109,7 +112,7 @@
         <snapshots.path>content/repositories/snapshots/</snapshots.path>
         <releases.path>content/repositories/releases/</releases.path>
         <docker.repository>nexus3.onap.org:10003</docker.repository>
-
+        <spring-swagger-ui.version>2.10.5</spring-swagger-ui.version>
 
         <!-- SONAR EXCLUSIONS -->
         <!-- EXCLUDE TEST COVERAGE ON
@@ -125,7 +128,7 @@
 
     </properties>
 
-  
+
 
     <dependencyManagement>
 
@@ -163,12 +166,11 @@
                 <version>${project.version}</version>
             </dependency>
 
-
             <!-- EELF LOGGER -->
             <dependency>
                 <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId>
                 <artifactId>eelf-logger-logback-impl</artifactId>
-                <version>${eelf.logger.version}</version>
+                <version>${project.version}</version>
             </dependency>
 
             <!-- UTILITIES -->
@@ -183,11 +185,22 @@
                 <groupId>io.springfox</groupId>
                 <artifactId>springfox-swagger2</artifactId>
                 <version>${springfox-swagger2.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.springframework.plugin</groupId>
+                        <artifactId>spring-plugin-core</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework.plugin</groupId>
+                <artifactId>spring-plugin-core</artifactId>
+                <version>2.0.0.RELEASE</version>
             </dependency>
             <dependency>
                 <groupId>io.springfox</groupId>
                 <artifactId>springfox-swagger-ui</artifactId>
-                <version>${springfox-swagger2.version}</version>
+                <version>${spring-swagger-ui.version}</version>
             </dependency>
 
             <!-- FIND BUGS -->
@@ -223,16 +236,28 @@
                 <version>${junit-jupiter.version}</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>4.13</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.junit.vintage</groupId>
+                <artifactId>junit-vintage-engine</artifactId>
+                <version>5.6.2</version>
+                <scope>test</scope>
+            </dependency>
             <dependency>
                 <groupId>org.junit.platform</groupId>
                 <artifactId>junit-platform-engine</artifactId>
-                <version>${junit-platform.version}</version>
+                <version>1.6.2</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.junit.platform</groupId>
                 <artifactId>junit-platform-launcher</artifactId>
-                <version>${junit-platform.version}</version>
+                <version>1.6.2</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
@@ -247,12 +272,6 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
                 <version>${spring.boot.version}</version>
-              <exclusions>
-                <exclusion> 
-                  <groupId>org.springframework</groupId>
-                  <artifactId>spring-web</artifactId>
-                </exclusion>
-              </exclusions>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -264,11 +283,7 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-          <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <version>${spring.version}</version>
-          </dependency>
+
         </dependencies>
     </dependencyManagement>
 
@@ -382,13 +397,6 @@
                             <exclude>${integration.test.pattern}</exclude>
                         </excludes>
                     </configuration>
-                    <dependencies>
-                        <dependency>
-                            <groupId>org.junit.platform</groupId>
-                            <artifactId>junit-platform-surefire-provider</artifactId>
-                            <version>${junit-platform.version}</version>
-                        </dependency>
-                    </dependencies>
                 </plugin>
 
                 <!-- FAIL SAFE PLUGIN FOR INTEGRATION TEST -->
@@ -396,13 +404,6 @@
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-failsafe-plugin</artifactId>
                     <version>${maven-failsafe-plugin.version}</version>
-                    <dependencies>
-                        <dependency>
-                            <groupId>org.junit.platform</groupId>
-                            <artifactId>junit-platform-surefire-provider</artifactId>
-                            <version>${junit-platform.version}</version>
-                        </dependency>
-                    </dependencies>
                     <executions>
                         <execution>
                             <id>integration-tests</id>
@@ -429,34 +430,6 @@
                     </executions>
                 </plugin>
 
-
-                <!-- FIND BUGS (STATIC CODE ANALYSIS) PLUGIN -->
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>findbugs-maven-plugin</artifactId>
-                    <version>${findbugs.plugin.version}</version>
-                    <configuration>
-                        <effort>Max</effort>
-                        <threshold>Low</threshold>
-                        <xmlOutput>true</xmlOutput>
-                        <!-- BUILD FAIL ON FINDBUGS ERRORS -->
-                        <failOnError>${findbugs.failOnError}</failOnError>
-                        <excludeFilterFile>${main.basedir}/findbugs-exclude.xml</excludeFilterFile>
-                        <outputDirectory>${project.reporting.outputDirectory}/findbugs</outputDirectory>
-                        <findbugsXmlOutputDirectory>${project.reporting.outputDirectory}/findbugs
-                        </findbugsXmlOutputDirectory>
-                    </configuration>
-                    <executions>
-                        <execution>
-                            <id>analyze-compile</id>
-                            <phase>compile</phase>
-                            <goals>
-                                <goal>check</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
-
                 <!-- PMD PLUGIN SETUP -->
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -507,6 +480,7 @@
                             <id>validate</id>
                             <phase>validate</phase>
                             <configuration>
+                                    <skip>true</skip>
                                 <configLocation>${checkstyle.file.name}</configLocation>
                                 <suppressionsLocation>${checkstyle.suppression.file.name}</suppressionsLocation>
                                 <encoding>UTF-8</encoding>
@@ -639,20 +613,6 @@
                         </execution>
                     </executions>
                 </plugin>
-
-                <!-- DOCKER PLUGIN -->
-		<!--
-                <plugin>
-                    <groupId>com.spotify</groupId>
-                    <artifactId>docker-maven-plugin</artifactId>
-                    <version>${docker-maven-version}</version>
-                    <configuration>
-                        <repository>${docker.repository}/onap/${project.groupId}.${project.artifactId}</repository>
-                        <tag>${project.version}</tag>
-                    </configuration>
-                </plugin>
-		-->
-
             </plugins>
 
         </pluginManagement>
@@ -700,11 +660,6 @@
                 <artifactId>maven-pmd-plugin</artifactId>
             </plugin>
 
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>findbugs-maven-plugin</artifactId>
-            </plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>