Merge "DR AAF CADI integration"

[dmaap/datarouter.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index f1b90f4..8156d09 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -3,6 +3,7 @@
   * org.onap.dmaap
   * ===========================================================================
   * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+  * Modifications Copyright (C) 2018 Nokia. 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.
@@ -25,15 +26,16 @@
     <groupId>org.onap.dmaap.datarouter</groupId>
     <artifactId>parent</artifactId>
     <name>dmaap-datarouter</name>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>2.0.2-SNAPSHOT</version>
     <packaging>pom</packaging>
     <url>https://github.com/att/DMAAP_DATAROUTER</url>
     <parent>
         <groupId>org.onap.oparent</groupId>
         <artifactId>oparent</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.3</version>
     </parent>
     <properties>
+        <datarouter.version>2.0.2-SNAPSHOT</datarouter.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
@@ -45,33 +47,37 @@
         <sonar.jacoco.itReportPath>${project.build.directory}/coverage-reports/jacoco-it.exec</sonar.jacoco.itReportPath>
         <sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
         <sonar.projectVersion>${project.version}</sonar.projectVersion>
-        <jetty.version>9.3.8.RC0</jetty.version>
+        <jetty.version>9.4.14.v20181114</jetty.version>
         <jetty.websocket.version>8.2.0.v20160908</jetty.websocket.version>
-        <dom4j.version>1.6</dom4j.version>
+        <javax.mail-api.version>1.5.5</javax.mail-api.version>
+        <dom4j.version>2.1.1</dom4j.version>
+        <xml-apis.version>1.4.01</xml-apis.version>
         <thoughtworks.version>1.4.10</thoughtworks.version>
         <google.guava.version>26.0-jre</google.guava.version>
         <qos.logback.version>1.2.3</qos.logback.version>
+        <aaf-cadi-aaf.version>2.1.10</aaf-cadi-aaf.version>
         <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
         <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
         <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
         <sitePath>/content/sites/site/org/onap/dmaap/datarouter/${project.artifactId}/${project.version}</sitePath>
-        <docker.maven.plugin.version>1.0.0</docker.maven.plugin.version>
         <skip.docker.build>true</skip.docker.build>
         <skip.docker.tag>true</skip.docker.tag>
         <skip.docker.push>true</skip.docker.push>
         <commons-codec.version>1.10</commons-codec.version>
+        <sonar.exclusions>**/src/main/java/org/onap/dmaap/datarouter/reports/**</sonar.exclusions>
     </properties>
     <modules>
         <module>datarouter-prov</module>
         <module>datarouter-node</module>
         <module>datarouter-subscriber</module>
+        <module>datarouter-docker-compose</module>
     </modules>
     <build>
         <plugins>
             <plugin>
-                <groupId>com.spotify</groupId>
+                <groupId>io.fabric8</groupId>
                 <artifactId>docker-maven-plugin</artifactId>
-                <version>${docker.maven.plugin.version}</version>
+                <version>0.28.0</version>
                 <configuration>
                     <skipDockerBuild>true</skipDockerBuild>
                 </configuration>
@@ -97,6 +103,7 @@
                         <exclude>**/generated-sources/**</exclude>
                         <exclude>**/yang-gen/**</exclude>
                         <exclude>**/pax/**</exclude>
+                        <exclude>**/src/main/java/org/onap/dmaap/datarouter/reports/**</exclude>
                     </excludes>
                 </configuration>
                 <executions>
@@ -145,6 +152,15 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>IntegrationSuite.java</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
     <distributionManagement>