X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=b92d7efb71a9759400254073c7cfc04335a9d45f;hb=3c077fdac44a644167b246ed4e0377603f54804d;hp=a26425e12f6fe06fef79cf7660193da7ea34db27;hpb=ca63da6e0cb7fb63e231343d0b52a40036f6b6aa;p=dmaap%2Fmessagerouter%2Fmsgrtr.git

diff --git a/pom.xml b/pom.xml
index a26425e..b92d7ef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,101 +1,203 @@
-<!--
-     ============LICENSE_START=======================================================
-     org.onap.dmaap
-     ================================================================================
-     Copyright © 2017 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
-           http://www.apache.org/licenses/LICENSE-2.0
-     
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
-     ============LICENSE_END=========================================================
-   
-     ECOMP is a trademark and service mark of AT&T Intellectual Property.
-     
- -->
+<!-- ============LICENSE_START======================================================= 
+	org.onap.dmaap ================================================================================ 
+	Copyright © 2017 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 http://www.apache.org/licenses/LICENSE-2.0 Unless required 
+	by applicable law or agreed to in writing, software distributed under the 
+	License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
+	OF ANY KIND, either express or implied. See the License for the specific 
+	language governing permissions and limitations under the License. ============LICENSE_END========================================================= 
+	ECOMP is a trademark and service mark of AT&T Intellectual Property. -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	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>
 	<groupId>org.onap.dmaap.messagerouter.msgrtr</groupId>
 	<artifactId>msgrtr</artifactId>
-	<version>0.0.5</version>
+	<version>1.1.9-SNAPSHOT</version>
 	<packaging>jar</packaging>
-	<name>Message Router</name>
+	<name>dmaap-messagerouter-msgrtr</name>
 	<description>Message Router - Restful interface built for kafka</description>
-	<url>https://github.com/att/dmaap-framework</url>
+
+	<parent>
+		<groupId>org.onap.oparent</groupId>
+		<artifactId>oparent</artifactId>
+		<version>1.1.0</version>
+	</parent>
+
 	<properties>
-		<spring.version>3.2.14.RELEASE</spring.version>
+		<spring.version>3.2.18.RELEASE</spring.version>
 		<cxf.version>3.0.4</cxf.version>
 		<jstl.version>1.2</jstl.version>
-		<sonar.junit.reportsPath>target/surefire-reports</sonar.junit.reportsPath>
-		<sonar.cobertura.reportPath>target/cobertura/cobertura.ser</sonar.cobertura.reportPath>
 		<maven.compiler.target>1.7</maven.compiler.target>
 		<maven.compiler.source>1.7</maven.compiler.source>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		
+
+		<!-- SONAR -->
+		<jacoco.version>0.7.7.201606060606</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>
+		<!-- Note: This list should match jacoco-maven-plugin's exclusion list 
+			below -->
+		<sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
+		<sitePath>/content/sites/site/org/onap/dmaap/messagerouter/msgrtr/${project.artifactId}/${project.version}</sitePath>
 		<nexusproxy>https://nexus.onap.org</nexusproxy>
-		<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
-		<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
-		<stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
-		<sitePath>/content/sites/site/org/onap/datarouter/${project.artifactId}/${project.version}</sitePath>
 	</properties>
 
 	<!-- Distribution management -->
 	<!-- Currently all artifacts will be uploaded to att-public-group reposiotry 
 		on Maven Central -->
+	<distributionManagement>
+		<site>
+			<id>ecomp-site</id>
+			<url>dav:${nexusproxy}${sitePath}</url>
+		</site>
+	</distributionManagement>
 
 	<!-- End Distribution management -->
 
-	 <licenses>
-	  <license>
-	    <name>Apache  License 2.0</name>
-	  </license>
+	<licenses>
+		<license>
+			<name>Apache License Version 2.0</name>
+		</license>
 	</licenses>
 
 	<developers>
-	   <developer>
-	     <name>Rajashree</name>
-	     <email></email>
-	     <organization>ATT</organization>
-	     <organizationUrl>www.att.com</organizationUrl>
-	   </developer>
-	   <developer>
-	     <name>Ramkumar</name>
-	     <email></email>
-	     <organization>ATT</organization>
-	     <organizationUrl>www.att.com</organizationUrl>
-	   </developer>
-	 </developers>
-	 <distributionManagement>
-    	<repository>
-			<id>ecomp-releases</id>
-			<name>AAF Release Repository</name>
-			<url>${nexusproxy}${releaseNexusPath}</url>
-		</repository>
-		<snapshotRepository>
-			<id>ecomp-snapshots</id>
-			<name>AAF Snapshot Repository</name>
-			<url>${nexusproxy}${snapshotNexusPath}</url>
-		</snapshotRepository>
-		<site>
-			<id>ecomp-site</id>
-			<url>dav:${nexusproxy}${sitePath}</url>
-		</site>
-	</distributionManagement>
-	
-	  <pluginRepositories>
-        <pluginRepository>
-            <id>onap-plugin-snapshots</id>
-            <url>https://nexus.onap.org/content/repositories/snapshots/</url>
-        </pluginRepository>
-    </pluginRepositories>
+		<developer>
+			<name>Rajashree</name>
+			<email></email>
+			<organization>ATT</organization>
+			<organizationUrl>www.att.com</organizationUrl>
+		</developer>
+		<developer>
+			<name>Ramkumar</name>
+			<email></email>
+			<organization>ATT</organization>
+			<organizationUrl>www.att.com</organizationUrl>
+		</developer>
+	</developers>
 
 	<dependencies>
+	    <!-- <dependency>
+			<groupId>org.apache.tomcat</groupId>
+			<artifactId>tomcat-catalina</artifactId>
+			<version>8.5.23</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tomcat</groupId>
+			<artifactId>tomcat-util</artifactId>
+			<version>8.5.23</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tomcat.embed</groupId>
+			<artifactId>tomcat-embed-core</artifactId>
+			<version>8.5.23</version>
+		</dependency> -->
+		<dependency>
+			<groupId>commons-collections</groupId>
+			<artifactId>commons-collections</artifactId>
+			<version>3.2.2</version>
+		</dependency>
+		<dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-core</artifactId>
+			<version>1.2.0</version>
+		</dependency>
+		<dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-classic</artifactId>
+			<version>1.2.0</version>
+		</dependency>
+		<!-- <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> 
+			<version>1.9.2</version> <exclusions> We have JCL-over-SLF4J instead. <exclusion> 
+			<groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> 
+			</exclusion> </exclusions> </dependency> -->
+		<dependency>
+			<groupId>org.grails</groupId>
+			<artifactId>grails-web</artifactId>
+			<version>2.5.4</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.grails</groupId>
+					<artifactId>grails-web-jsp</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		 <dependency>
+      <groupId>org.grails</groupId>
+      <artifactId>grails-bootstrap</artifactId>
+      <version>2.5.4</version>
+      <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>ant</artifactId>
+          <groupId>org.apache.ant</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>jna</artifactId>
+          <groupId>net.java.dev.jna</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>ant-trax</artifactId>
+          <groupId>org.apache.ant</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>gant_groovy1.8</artifactId>
+          <groupId>org.codehaus.gant</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>ant-launcher</artifactId>
+          <groupId>org.apache.ant</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>jline</artifactId>
+          <groupId>jline</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>ivy</artifactId>
+          <groupId>org.apache.ivy</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>jansi</artifactId>
+          <groupId>org.fusesource.jansi</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>commons-logging</artifactId>
+          <groupId>commons-logging</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>ant-junit</artifactId>
+          <groupId>org.apache.ant</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-test</artifactId>
+			<version>${spring.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.codehaus.groovy</groupId>
+			<artifactId>groovy-all</artifactId>
+			<version>2.4.8</version>
+			<scope>compile</scope>
+			<exclusions>
+				<exclusion>
+					<artifactId>jline</artifactId>
+					<groupId>jline</groupId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>commons-fileupload</groupId>
+			<artifactId>commons-fileupload</artifactId>
+			<version>1.3.3</version>
+		</dependency>
 
 		<dependency>
 			<groupId>junit</groupId>
@@ -103,6 +205,11 @@
 			<version>4.11</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>com.att.aft</groupId>
+			<artifactId>dme2</artifactId>
+			<version>3.1.200-oss</version>
+		</dependency>
 
 		<!-- slf4j logger -->
 		<dependency>
@@ -140,23 +247,23 @@
 		<!-- Begin - Spring Dependencies for DI -->
 		<dependency>
 			<groupId>org.springframework</groupId>
-			<artifactId>spring-core</artifactId>
+			<artifactId>spring-context</artifactId>
 			<version>${spring.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
-			<artifactId>spring-context</artifactId>
-			<version>${spring.version}</version>
+			<artifactId>spring-expression</artifactId>
+			<version>4.3.18.RELEASE</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-webmvc</artifactId>
-			<version>${spring.version}</version>
+			<version>4.3.18.RELEASE</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
-			<artifactId>spring-web</artifactId>
-			<version>${spring.version}</version>
+			<artifactId>spring-core</artifactId>
+			<version>4.3.18.RELEASE</version>
 		</dependency>
 		<dependency>
 			<groupId>javax.servlet</groupId>
@@ -180,7 +287,7 @@
 		<dependency>
 			<groupId>org.apache.zookeeper</groupId>
 			<artifactId>zookeeper</artifactId>
-			<version>3.4.6</version>
+			<version>3.4.10</version>
 		</dependency>
 
 		<!-- JSON libraries -->
@@ -193,9 +300,14 @@
 		<!-- Apache Kafka -->
 		<dependency>
 			<groupId>org.apache.kafka</groupId>
-			<artifactId>kafka_2.10</artifactId>
-			<version>0.8.2.1</version>
+			<artifactId>kafka_2.11</artifactId>
+		<version>0.11.0.3</version>
 		</dependency>
+	<dependency>
+		<groupId>com.google.guava</groupId>
+		<artifactId>guava</artifactId>
+		<version>23.6.1-jre</version>
+	</dependency>
 
 		<dependency>
 			<groupId>com.att.eelf</groupId>
@@ -208,6 +320,20 @@
 			<groupId>com.att.nsa</groupId>
 			<artifactId>nsaServerLibrary</artifactId>
 			<version>1.0.10</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.apache.tomcat</groupId>
+					<artifactId>tomcat-catalina</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.apache.tomcat.embed</groupId>
+					<artifactId>tomcat-embed-core</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.apache.tomcat</groupId>
+					<artifactId>tomcat-util</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>com.att.nsa</groupId>
@@ -216,11 +342,8 @@
 		</dependency>
 
 		<!-- our Highland Park library -->
-		 <!-- <dependency>
-			<groupId>com.att.nsa</groupId>
-			<artifactId>highlandParkCore</artifactId>
-			<version>0.4.9</version>
-		</dependency>  -->
+		<!-- <dependency> <groupId>com.att.nsa</groupId> <artifactId>highlandParkCore</artifactId> 
+			<version>0.4.9</version> </dependency> -->
 
 		<!-- our base client library, for its command line tools -->
 		<dependency>
@@ -240,15 +363,21 @@
 		</dependency>
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
-					<artifactId>httpclient</artifactId>
-					<version>4.4.1</version>
+			<artifactId>httpclient</artifactId>
+			<version>4.5.3</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
-					<artifactId>httpclient-cache</artifactId>
-					<version>4.4.1</version>
+			<artifactId>httpclient-cache</artifactId>
+			<version>4.5.3</version>
 		</dependency>
-		
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpcore</artifactId>
+			<version>4.4.1</version>
+		</dependency>
+
+
 		<!-- explicit jline add b/c it conflicts with the zk client -->
 		<dependency>
 			<groupId>jline</groupId>
@@ -259,26 +388,62 @@
 		<dependency>
 			<groupId>org.apache.curator</groupId>
 			<artifactId>curator-recipes</artifactId>
-			<version>2.6.0</version>
+			<version>4.0.1</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.curator</groupId>
 			<artifactId>curator-test</artifactId>
-			<version>2.6.0</version>
+			<version>4.0.1</version>
 		</dependency>
 
+
 		<dependency>
-			<groupId>com.att.aft</groupId>
-			<artifactId>dme2</artifactId>
-			<version>3.1.200</version>
+			<groupId>com.google.code.gson</groupId>
+			<artifactId>gson</artifactId>
+			<version>2.8.0</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-core</artifactId>
+			<version>2.8.11</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+			<version>2.8.11.1</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.powermock</groupId>
+			<artifactId>powermock-api-mockito</artifactId>
+			<version>1.6.4</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.powermock</groupId>
+			<artifactId>powermock-module-junit4</artifactId>
+			<version>1.6.4</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.powermock</groupId>
+			<artifactId>powermock-module-junit4-rule</artifactId>
+			<version>1.6.4</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-core</artifactId>
+			<version>1.10.19</version>
+			<scope>test</scope>
 		</dependency>
 
-	<dependency>
-	    <groupId>com.google.code.gson</groupId>
-	    <artifactId>gson</artifactId>
-	    <version>2.8.0</version>
-	</dependency>
 	</dependencies>
 	<build>
 		<finalName>DMaaP</finalName>
@@ -303,16 +468,17 @@
 			<!-- <phase>package</phase> bind to the packaging phase <goals> <goal>single</goal> 
 				</goals> </execution> </executions> </plugin> -->
 			<!-- -->
-			  <plugin>
-				<groupId>org.sonatype.plugins</groupId>
-				<artifactId>nexus-staging-maven-plugin</artifactId>
-				<version>1.6.7</version>
-				<extensions>true</extensions>
-					<configuration>
-						<nexusUrl>${nexusproxy}</nexusUrl>
-						<stagingProfileId>176c31dfe190a</stagingProfileId>
-						<serverId>ecomp-staging</serverId>
-					</configuration>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-site-plugin</artifactId>
+				<version>3.6</version>
+				<dependencies>
+					<dependency>
+						<groupId>org.apache.maven.wagon</groupId>
+						<artifactId>wagon-webdav-jackrabbit</artifactId>
+						<version>2.10</version>
+					</dependency>
+				</dependencies>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -342,15 +508,14 @@
 						</goals>
 					</execution>
 				</executions>
-			</plugin>			
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
 				<version>2.12.4</version>
 				<configuration>
 					<excludes>
-						<!-- exclude until junits updated -->
-						<exclude>**/DME2*.java</exclude>
+						<!-- exclude until junits updated <exclude>**/DME2*.java</exclude> -->
 					</excludes>
 					<!-- <skipTests>true</skipTests> -->
 				</configuration>
@@ -366,30 +531,33 @@
 					</formats>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.jacoco</groupId>
-				<artifactId>jacoco-maven-plugin</artifactId>
-				<version>0.6.2.201302030002</version>
-				<configuration>
-					<destfile>${basedir}/target/coverage-reports/jacoco-unit.exec</destfile>
-					<datafile>${basedir}/target/coverage-reports/jacoco-unit.exec</datafile>
-				</configuration>
-			</plugin>
- 			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-gpg-plugin</artifactId>
-				<version>1.5</version>
-				<executions>
-					<execution>
-						<id>sign-artifacts</id>
-						<phase>verify</phase>
-						<goals>
-							<goal>sign</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin> 	 
-
+			<!-- <plugin> <groupId>org.jacoco</groupId> <artifactId>jacoco-maven-plugin</artifactId> 
+				<version>${jacoco.version}</version> <configuration> Note: This exclusion 
+				list should match <sonar.exclusions> property above <excludes> <exclude>**/gen/**</exclude> 
+				<exclude>**/generated-sources/**</exclude> <exclude>**/yang-gen/**</exclude> 
+				<exclude>**/pax/**</exclude> </excludes> </configuration> <executions> Prepares 
+				the property pointing to the JaCoCo runtime agent which is passed as VM argument 
+				when Maven the Surefire plugin is executed. <execution> <id>pre-unit-test</id> 
+				<goals> <goal>prepare-agent</goal> </goals> <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. <propertyName>surefireArgLine</propertyName> </configuration> </execution> 
+				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> 
+				<goals> <goal>report</goal> </goals> <configuration> Sets the path to the 
+				file which contains the execution data. <dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile> 
+				Sets the output directory for the code coverage report. <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory> 
+				</configuration> </execution> <execution> <id>pre-integration-test</id> <phase>pre-integration-test</phase> 
+				<goals> <goal>prepare-agent</goal> </goals> <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. <propertyName>failsafeArgLine</propertyName> </configuration> </execution> 
+				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> 
+				<goals> <goal>report</goal> </goals> <configuration> Sets the path to the 
+				file which contains the execution data. <dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile> 
+				Sets the output directory for the code coverage report. <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory> 
+				</configuration> </execution> </executions> </plugin> -->
 		</plugins>
 	</build>
 
@@ -415,4 +583,4 @@
 		<artifactId>maven-deploy-plugin</artifactId> <version>2.5</version> <configuration> 
 		<skip>true</skip> </configuration> </plugin> </plugins> </build> </profile> 
 		</profiles> -->
-</project>
\ No newline at end of file
+</project>