Merge changes Ie4716415,I6ce7ca81

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

diff --git a/pom.xml b/pom.xml
index 022dd50..cb47037 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.13-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>
@@ -210,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 -->
@@ -334,6 +340,10 @@
                                        <groupId>org.apache.tomcat</groupId>
                                        <artifactId>tomcat-util</artifactId>
                                </exclusion>
+                               <exclusion>
+                                       <groupId>javax.mail</groupId>
+                                       <artifactId>mail</artifactId>
+                               </exclusion>
                        </exclusions>
                </dependency>
                <dependency>
@@ -341,6 +351,11 @@
                        <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>