Merge "adding Fiachra Corcoran to INFO.yaml as a committer Issue-ID: DMAAP-1189 Chang...

[dmaap/messagerouter/msgrtr.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index c3e747b..2ef8c0c 100644 (file)
--- 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.17-SNAPSHOT</version>
        <packaging>jar</packaging>
        <name>dmaap-messagerouter-msgrtr</name>
        <description>Message Router - Restful interface built for kafka</description>
@@ -22,16 +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>
@@ -81,21 +83,21 @@
        </developers>
 
        <dependencies>
-           <dependency>
+           <!-- <dependency>
                        <groupId>org.apache.tomcat</groupId>
                        <artifactId>tomcat-catalina</artifactId>
-                       <version>8.0.46</version>
+                       <version>8.5.23</version>
                </dependency>
                <dependency>
                        <groupId>org.apache.tomcat</groupId>
                        <artifactId>tomcat-util</artifactId>
-                       <version>8.0.46</version>
+                       <version>8.5.23</version>
                </dependency>
                <dependency>
                        <groupId>org.apache.tomcat.embed</groupId>
                        <artifactId>tomcat-embed-core</artifactId>
-                       <version>8.0.46</version>
-               </dependency>
+                       <version>8.5.23</version>
+               </dependency> -->
                <dependency>
                        <groupId>commons-collections</groupId>
                        <artifactId>commons-collections</artifactId>
@@ -183,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>
@@ -208,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 -->
@@ -246,23 +254,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>
@@ -299,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>
@@ -314,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> 
@@ -368,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>