Merge changes I17a289cd,Ie0d50a2c

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

diff --git a/pom.xml b/pom.xml
index 85b4fe6..2428f29 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.18-SNAPSHOT</version>
+       <version>1.1.19-SNAPSHOT</version>
        <packaging>jar</packaging>
        <name>dmaap-messagerouter-msgrtr</name>
        <description>Message Router - Restful interface built for kafka</description>
@@ -197,7 +197,7 @@
                <dependency>
                        <groupId>commons-fileupload</groupId>
                        <artifactId>commons-fileupload</artifactId>
-                       <version>1.3.3</version>
+                       <version>1.4</version>
                </dependency>
 
                <dependency>
@@ -294,7 +294,7 @@
                <dependency>
                        <groupId>org.apache.zookeeper</groupId>
                        <artifactId>zookeeper</artifactId>
-                       <version>3.4.10</version>
+                       <version>3.4.14</version>
                </dependency>
 
                <!-- JSON libraries -->
@@ -352,9 +352,16 @@
                        <version>0.0.1</version>
                </dependency>
                <dependency>
-                       <groupId>javax.mail</groupId>
-                       <artifactId>mail</artifactId>
-                       <version>1.4.4</version>
+               <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 -->