X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=f7c07ad51dc839195b8928ba21038fba5444e83b;hb=HEAD;hp=2c7d29e34b2f31f914a763cbc08d6943cbfea262;hpb=f015a8c92d5f50ce069c8011e738a7aec910c86f;p=dcaegen2%2Fanalytics%2Ftca.git

diff --git a/pom.xml b/pom.xml
index 2c7d29e..e3f35f9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,9 +2,9 @@
 <!--
   ~ ===============================LICENSE_START======================================
   ~  dcae-analytics
-  ~ ================================================================================
-  ~    Copyright © 2017 AT&T Intellectual Property. All rights reserved.
-  ~ ================================================================================
+  ~ ==================================================================================
+  ~    Copyright (c) 2017-2019 AT&T Intellectual Property. All rights reserved.
+  ~ ==================================================================================
   ~  Licensed under the Apache License, Version 2.0 (the "License");
   ~  you may not use this file except in compliance with the License.
   ~   You may obtain a copy of the License at
@@ -24,15 +24,16 @@
          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</groupId>
-  		<artifactId>root</artifactId>
-  		<version>1.0.0-SNAPSHOT</version>
-  	</parent>
+    <parent>
+      <groupId>org.onap.oparent</groupId>
+      <artifactId>oparent</artifactId>
+      <version>2.0.0</version>
+      <relativePath/>
+    </parent>
 
     <groupId>org.onap.dcaegen2.analytics.tca</groupId>
     <artifactId>dcae-analytics</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.3.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>dcaegen2-analytics-tca</name>
@@ -71,10 +72,10 @@
         <findbugs.jsr305.version>2.0.1</findbugs.jsr305.version>
         <findbugs.annotations.version>3.0.0</findbugs.annotations.version>
         <lombok.version>1.16.10</lombok.version>
-
+        <jedis.version>2.9.0</jedis.version>
         <json.path.version>2.2.0</json.path.version>
         <quartz.version>2.2.0</quartz.version>
-        <httpclient.version>4.5.2</httpclient.version>
+        <httpclient.version>4.5.5</httpclient.version>
         <commons.lang3.version>3.5</commons.lang3.version>
 
 
@@ -96,13 +97,13 @@
         <findbugs.plugin.version>3.0.2</findbugs.plugin.version>
         <pmd.plugin.version>3.5</pmd.plugin.version>
         <surefire.report.plugin.version>2.19.1</surefire.report.plugin.version>
-        <checkstyle.plugin.version>2.16</checkstyle.plugin.version>
+        <checkstyle.plugin.version>2.17</checkstyle.plugin.version>
         <javadoc.plugin.version>2.10.4</javadoc.plugin.version>
         <source.plugin.version>2.4</source.plugin.version>
         <jar.plugin.version>2.4</jar.plugin.version>
-        <deploy.plugin.version>2.8</deploy.plugin.version>
         <lombok.plugin.version>1.16.10.0</lombok.plugin.version>
         <jgitflow.plugin.version>1.0-m5.1</jgitflow.plugin.version>
+        <gitcommitid.plugin.version>2.2.3</gitcommitid.plugin.version>
         <maven.site.plugin>3.5.1</maven.site.plugin>
         <jxr.plugin.version>2.5</jxr.plugin.version>
         <project.info.reports.plugin.version>2.7</project.info.reports.plugin.version>
@@ -116,14 +117,19 @@
         <skip.integration.tests>true</skip.integration.tests>
         <pmd.violation.buildfail>true</pmd.violation.buildfail>
         <findbugs.failOnError>true</findbugs.failOnError>
-        <checkstyle.failOnViolation>true</checkstyle.failOnViolation>
+        <checkstyle.failOnViolation>false</checkstyle.failOnViolation>
         <checkstyle.file.name>checkstyle.xml</checkstyle.file.name>
-        <checkstyle.suppression.file.name>suppressions.xml</checkstyle.suppression.file.name>       
+        <checkstyle.suppression.file.name>suppressions.xml</checkstyle.suppression.file.name>
         <dependency.locations.enabled>false</dependency.locations.enabled>
         <nexusproxy>https://nexus.onap.org</nexusproxy>
-		<snapshots.path>content/repositories/snapshots/</snapshots.path>
-  		<releases.path>content/repositories/releases/</releases.path>
-  		<site.path>content/sites/site/org/onap/dcaegen2/analytics/tca/${project.artifactId}/${project.version}</site.path>
+        <snapshots.path>content/repositories/snapshots/</snapshots.path>
+        <releases.path>content/repositories/releases/</releases.path>
+        <site.path>
+            content/sites/site/org/onap/dcaegen2/analytics/tca/${project.artifactId}/${project.version}
+        </site.path>
+	<sonar.coverage.jacoco.xmlReportPaths>
+            ${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml
+        </sonar.coverage.jacoco.xmlReportPaths>
     </properties>
 
     <dependencyManagement>
@@ -186,6 +192,13 @@
                 <version>${netty.http.version}</version>
             </dependency>
 
+            <!-- Override Cask and Hadoop default dependency versions for Nexus-IQ scan issues -->
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty</artifactId>
+                <version>3.10.6.Final</version>
+            </dependency>
+
 
             <dependency>
                 <groupId>co.cask.common</groupId>
@@ -433,6 +446,12 @@
                 <scope>provided</scope>
             </dependency>
 
+            <!-- DISTRIBUTED CACHING -->
+            <dependency>
+                <groupId>redis.clients</groupId>
+                <artifactId>jedis</artifactId>
+                <version>${jedis.version}</version>
+            </dependency>
 
             <!-- DEPENDENCY INJECTION -->
             <dependency>
@@ -472,6 +491,12 @@
                 <artifactId>cdap-unit-test</artifactId>
                 <version>${cdap.version}</version>
                 <scope>test</scope>
+                <exclusions>
+                    <exclusion>
+                        <groupId>co.cask.cdap</groupId>
+                        <artifactId>cdap-explore-jdbc</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
 
             <dependency>
@@ -531,12 +556,21 @@
             </dependency>
 
         </dependencies>
-        
+
     </dependencyManagement>
 
 
     <build>
 
+        <resources>
+            <resource>
+                <directory>${project.basedir}/src/main/resources</directory>
+            </resource>
+            <resource>
+                <directory>${project.build.directory}/git</directory>
+            </resource>
+        </resources>
+
         <extensions>
             <extension>
                 <groupId>org.apache.maven.wagon</groupId>
@@ -832,6 +866,28 @@
                     </executions>
                 </plugin>
 
+                <!-- GIT COMMIT ID PLUGIN -->
+                <plugin>
+                    <groupId>pl.project13.maven</groupId>
+                    <artifactId>git-commit-id-plugin</artifactId>
+                    <version>${gitcommitid.plugin.version}</version>
+                    <executions>
+                        <execution>
+                            <id>generate-git-properties</id>
+                            <phase>generate-resources</phase>
+                            <goals>
+                                <goal>revision</goal>
+                            </goals>
+                            <configuration>
+                                <failOnNoGitDirectory>false</failOnNoGitDirectory>
+                                <generateGitPropertiesFile>true</generateGitPropertiesFile>
+                                <generateGitPropertiesFilename>
+                                    ${project.build.directory}/git/git.properties
+                                </generateGitPropertiesFilename>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
 
                 <!-- JGIT FLOW PLUGIN -->
                 <plugin>
@@ -890,13 +946,6 @@
                     </configuration>
                 </plugin>
 
-                <!-- DEPLOY PLUGIN -->
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-deploy-plugin</artifactId>
-                    <version>${deploy.plugin.version}</version>
-                </plugin>
-
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-site-plugin</artifactId>
@@ -951,11 +1000,6 @@
                 <artifactId>maven-failsafe-plugin</artifactId>
             </plugin>
 
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-            </plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
@@ -971,11 +1015,11 @@
                 <artifactId>maven-pmd-plugin</artifactId>
             </plugin>
 
-            <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>
@@ -987,6 +1031,11 @@
                 <artifactId>jgitflow-maven-plugin</artifactId>
             </plugin>
 
+            <plugin>
+                <groupId>pl.project13.maven</groupId>
+                <artifactId>git-commit-id-plugin</artifactId>
+            </plugin>
+
         </plugins>
     </build>
 
@@ -1023,6 +1072,26 @@
         </plugins>
     </reporting>
 
+    <profiles>
+        <profile>
+            <id>doclint-java8-disable</id>
+            <activation>
+                <jdk>[1.8,)</jdk>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <configuration>
+                            <additionalparam>-Xdoclint:none</additionalparam>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
     <modules>
         <module>dcae-analytics-test</module>
         <module>dcae-analytics-model</module>
@@ -1033,6 +1102,7 @@
         <module>dcae-analytics-cdap-tca</module>
         <module>dcae-analytics-cdap-plugins</module>
         <module>dcae-analytics-it</module>
+        <module>dcae-analytics-aai</module>
     </modules>
 
 </project>