X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=3fe16993af60c4fda2301ddbbfd73c773b916411;hb=076def9c700fdd6472c62c837b0ce067bab55a4c;hp=449f88d04e249100a328313633c6536ce911ce3d;hpb=9fc5cba0aef8ecba4800222a24b754b3f4f50d58;p=dmaap%2Fmessagerouter%2Fmsgrtr.git

diff --git a/pom.xml b/pom.xml
index 449f88d..3fe1699 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.onap.dmaap.messagerouter.msgrtr</groupId>
 	<artifactId>msgrtr</artifactId>
-	<version>1.1.3-SNAPSHOT</version>
+	<version>1.1.22-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<name>dmaap-messagerouter-msgrtr</name>
 	<description>Message Router - Restful interface built for kafka</description>
@@ -22,26 +22,24 @@
 	<parent>
 		<groupId>org.onap.oparent</groupId>
 		<artifactId>oparent</artifactId>
-		<version>1.1.0</version>
+		<version>2.1.0</version>
 	</parent>
 
 	<properties>
+	    <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
 		<spring.version>3.2.18.RELEASE</spring.version>
 		<cxf.version>3.0.4</cxf.version>
 		<jstl.version>1.2</jstl.version>
 		<maven.compiler.target>1.7</maven.compiler.target>
 		<maven.compiler.source>1.7</maven.compiler.source>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
 
-		<!-- 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.language>java</sonar.language>
+        <sonar.skip>false</sonar.skip>
+        <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
+        <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
+        <sonar.projectVersion>${project.version}</sonar.projectVersion>
 		<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>
@@ -81,21 +79,21 @@
 	</developers>
 
 	<dependencies>
-	    <dependency>
+	    <!-- <dependency>
 			<groupId>org.apache.tomcat</groupId>
 			<artifactId>tomcat-catalina</artifactId>
-			<version>8.0.47</version>
+			<version>8.5.23</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tomcat</groupId>
 			<artifactId>tomcat-util</artifactId>
-			<version>8.0.47</version>
+			<version>8.5.23</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tomcat.embed</groupId>
 			<artifactId>tomcat-embed-core</artifactId>
-			<version>8.0.47</version>
-		</dependency>
+			<version>8.5.23</version>
+		</dependency> -->
 		<dependency>
 			<groupId>commons-collections</groupId>
 			<artifactId>commons-collections</artifactId>
@@ -183,7 +181,7 @@
 		<dependency>
 			<groupId>org.codehaus.groovy</groupId>
 			<artifactId>groovy-all</artifactId>
-			<version>2.4.4</version>
+			<version>2.4.8</version>
 			<scope>compile</scope>
 			<exclusions>
 				<exclusion>
@@ -195,7 +193,7 @@
 		<dependency>
 			<groupId>commons-fileupload</groupId>
 			<artifactId>commons-fileupload</artifactId>
-			<version>1.3.3</version>
+			<version>1.4</version>
 		</dependency>
 
 		<dependency>
@@ -208,6 +206,12 @@
 			<groupId>com.att.aft</groupId>
 			<artifactId>dme2</artifactId>
 			<version>3.1.200-oss</version>
+			<exclusions>
+				<exclusion>
+					<groupId>javax.jms</groupId>
+					<artifactId>jms</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
 		<!-- slf4j logger -->
@@ -246,23 +250,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>
@@ -286,7 +290,7 @@
 		<dependency>
 			<groupId>org.apache.zookeeper</groupId>
 			<artifactId>zookeeper</artifactId>
-			<version>3.4.10</version>
+			<version>3.4.14</version>
 		</dependency>
 
 		<!-- JSON libraries -->
@@ -299,9 +303,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>
@@ -314,12 +323,42 @@
 			<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>
+				<exclusion>
+					<groupId>javax.mail</groupId>
+					<artifactId>mail</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>com.att.nsa</groupId>
 			<artifactId>saToolkit</artifactId>
 			<version>0.0.1</version>
 		</dependency>
+		<dependency>
+		<groupId>com.sun.mail</groupId>
+		<artifactId>javax.mail</artifactId>
+		<version>1.6.0</version>
+		<exclusions>
+			<!-- javax activation is part of the JDK now -->
+			<exclusion>
+				<groupId>javax.activation</groupId>
+				<artifactId>activation</artifactId>
+			</exclusion>
+		</exclusions>
+		</dependency>
 
 		<!-- our Highland Park library -->
 		<!-- <dependency> <groupId>com.att.nsa</groupId> <artifactId>highlandParkCore</artifactId> 
@@ -368,13 +407,13 @@
 		<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>
 
 
@@ -448,6 +487,59 @@
 			<!-- <phase>package</phase> bind to the packaging phase <goals> <goal>single</goal> 
 				</goals> </execution> </executions> </plugin> -->
 			<!-- -->
+                         <plugin>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+        <version>2.17</version>
+        <dependencies>
+          <dependency>
+            <groupId>org.onap.oparent</groupId>
+            <artifactId>checkstyle</artifactId>
+            <version>2.0.0</version>
+          </dependency>
+        </dependencies>
+        <executions>
+          <execution>
+            <id>onap-license</id>
+            <goals>
+              <goal>check</goal>
+            </goals>
+            <phase>process-sources</phase>
+            <configuration>
+              <configLocation>onap-checkstyle/check-license.xml</configLocation>
+              <includeResources>false</includeResources>
+              <includeTestSourceDirectory>true</includeTestSourceDirectory>
+              <includeTestResources>false</includeTestResources>
+              <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+              <excludes>
+              </excludes>
+              <consoleOutput>true</consoleOutput>
+              <failsOnViolation>false</failsOnViolation>
+            </configuration>
+          </execution>
+          <execution>
+            <id>onap-java-style</id>
+            <goals>
+              <goal>check</goal>
+            </goals>
+            <phase>none</phase>
+            <configuration>
+              <!-- Use Google Java Style Guide:
+                   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}</sourceDirectory>
+              <includeResources>true</includeResources>
+              <includeTestSourceDirectory>true</includeTestSourceDirectory>
+              <includeTestResources>true</includeTestResources>
+              <excludes>
+              </excludes>
+              <consoleOutput>true</consoleOutput>
+              <failsOnViolation>false</failsOnViolation>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-site-plugin</artifactId>
@@ -500,44 +592,28 @@
 					<!-- <skipTests>true</skipTests> -->
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>cobertura-maven-plugin</artifactId>
-				<version>2.7</version>
-				<configuration>
-					<formats>
-						<format>html</format>
-						<format>xml</format>
-					</formats>
-				</configuration>
-			</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> -->
+			 <plugin>
+                    <groupId>org.jacoco</groupId>
+                    <artifactId>jacoco-maven-plugin</artifactId>
+                    <executions>
+                        <execution>
+                            <id>prepare-agent</id>
+                            <goals>
+                                <goal>prepare-agent</goal>
+                            </goals>
+                        </execution>
+                        <execution>
+                            <id>report</id>
+                            <goals>
+                                <goal>report</goal>
+                            </goals>
+                            <configuration>
+                                <dataFile>${project.build.directory}/code-coverage/jacoco.exec</dataFile>
+                                <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
 		</plugins>
 	</build>