X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=cb47037aaa27016da91d1be64cd29e21edd077a7;hb=fb6f2dd03e0c2e170ca47c4e67d8b098fc18358c;hp=40f3ce8734c52902a50e4b24b397fc2364434a6e;hpb=0ee32170163c467c88e35f2ec019df486b9f4c33;p=dmaap%2Fmessagerouter%2Fmsgrtr.git

diff --git a/pom.xml b/pom.xml
index 40f3ce8..cb47037 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.4-SNAPSHOT</version>
+	<version>1.1.15-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<name>dmaap-messagerouter-msgrtr</name>
 	<description>Message Router - Restful interface built for kafka</description>
@@ -22,17 +22,18 @@
 	<parent>
 		<groupId>org.onap.oparent</groupId>
 		<artifactId>oparent</artifactId>
-		<version>1.1.0</version>
+		<version>1.2.1</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>
@@ -82,7 +83,7 @@
 	</developers>
 
 	<dependencies>
-	    <dependency>
+	    <!-- <dependency>
 			<groupId>org.apache.tomcat</groupId>
 			<artifactId>tomcat-catalina</artifactId>
 			<version>8.5.23</version>
@@ -96,7 +97,7 @@
 			<groupId>org.apache.tomcat.embed</groupId>
 			<artifactId>tomcat-embed-core</artifactId>
 			<version>8.5.23</version>
-		</dependency>
+		</dependency> -->
 		<dependency>
 			<groupId>commons-collections</groupId>
 			<artifactId>commons-collections</artifactId>
@@ -184,7 +185,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>
@@ -209,6 +210,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 -->
@@ -245,11 +252,6 @@
 			<artifactId>cxf-rt-transports-http-jetty</artifactId> <version>${cxf.version}</version> 
 			</dependency> -->
 		<!-- Begin - Spring Dependencies for DI -->
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-core</artifactId>
-			<version>${spring.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context</artifactId>
@@ -258,17 +260,17 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-expression</artifactId>
-			<version>4.3.16.RELEASE</version>
+			<version>4.3.18.RELEASE</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-webmvc</artifactId>
-			<version>4.3.15.RELEASE</version>
+			<version>4.3.18.RELEASE</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-core</artifactId>
-			<version>4.3.15.RELEASE</version>
+			<version>4.3.18.RELEASE</version>
 		</dependency>
 		<dependency>
 			<groupId>javax.servlet</groupId>
@@ -305,9 +307,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>
@@ -320,12 +327,35 @@
 			<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>javax.mail</groupId>
+			<artifactId>mail</artifactId>
+			<version>1.4.4</version>
+		</dependency>
 
 		<!-- our Highland Park library -->
 		<!-- <dependency> <groupId>com.att.nsa</groupId> <artifactId>highlandParkCore</artifactId> 
@@ -374,13 +404,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>