Bumped the version

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

diff --git a/pom.xml b/pom.xml
index 27ba141..acd5902 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -16,12 +16,12 @@
        <parent>
                <groupId>org.onap.oparent</groupId>
                <artifactId>oparent</artifactId>
-               <version>1.1.0</version>
+               <version>1.2.1</version>
        </parent>
 
        <groupId>org.onap.dmaap.messagerouter.messageservice</groupId>
        <artifactId>dmaapMR1</artifactId>
-       <version>1.1.7-SNAPSHOT</version>
+       <version>1.1.10-SNAPSHOT</version>
        <name>dmaap-messagerouter-messageservice</name>
        <description>Message Router - Restful interface built for kafka</description>
        <licenses>
@@ -233,7 +233,7 @@
                <!-- <javax-mail-version>1.5.0</javax-mail-version> -->
                <module.ajsc.namespace.name>dmaap</module.ajsc.namespace.name>
                <module.ajsc.namespace.version>v1</module.ajsc.namespace.version>
-               <ajscRuntimeVersion>3.0.7-oss</ajscRuntimeVersion>
+               <ajscRuntimeVersion>3.0.10-oss</ajscRuntimeVersion>
 
                <!-- This will be the Absolute Root of the Project and should contain NO 
                        Versioning -->
@@ -258,11 +258,11 @@
                        8080 -->
                <serverPort>3904</serverPort>
                <sslport>3905</sslport>
-
+        <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
                <testRouteOffer>workstation</testRouteOffer>
                <testEnv>DEV</testEnv>
                <!-- <dmaapImg>${project.version}</dmaapImg> -->
-               <dmaapImg>1.1.7</dmaapImg>
+               <dmaapImg>1.1.10</dmaapImg>
                <camel.version>2.21.1</camel.version>
                <sitePath>/content/sites/site/org/onap/dmaap/messagerouter/messageservice/${project.artifactId}/${project.version}</sitePath>
                <skip.docker.build>true</skip.docker.build>
@@ -306,14 +306,46 @@
                <!-- <dependency> <groupId>csi-schemas-source</groupId> <artifactId>cmn-CommonDataModel</artifactId> 
                        <version>112.0.50</version> </dependency> -->
                <!-- TODO: add open source version here -->
-               
+
+
+       <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>
+       <dependency>
+               <groupId>com.sun.xml.bind</groupId>
+               <artifactId>jaxb-core</artifactId>
+               <version>2.3.0.1</version>
+               <scope>compile</scope>
+       </dependency>
+       <dependency>
+               <groupId>com.sun.xml.bind</groupId>
+               <artifactId>jaxb-impl</artifactId>
+               <version>2.3.0.1</version>
+               <scope>compile</scope>
+               <exclusions>
+                       <exclusion>
+                               <artifactId>jsr181-api</artifactId>
+                               <groupId>javax.jws</groupId>
+                       </exclusion>
+               </exclusions>
+       </dependency>
+        
                 <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
             <version>3.2.5</version>
            </dependency>
 
-               <dependency>
+               <!-- <dependency>
                        <groupId>com.att.cadi</groupId>
                        <artifactId>cadi-core</artifactId>
                        <version>1.3.0</version>
@@ -322,7 +354,7 @@
                        <groupId>com.att.aft</groupId>
                        <artifactId>dme2</artifactId>
                        <version>3.1.200-oss</version>
-               </dependency>
+               </dependency> -->
                <dependency>
                        <groupId>org.springframework</groupId>
                        <artifactId>spring-expression</artifactId>
@@ -425,7 +457,7 @@
                <dependency>
                        <groupId>org.onap.dmaap.messagerouter.msgrtr</groupId>
                        <artifactId>msgrtr</artifactId>
-                       <version>1.1.7</version>
+                       <version>1.1.14</version>
                        <exclusions>
                                <exclusion>
                                        <groupId>org.slf4j</groupId>
@@ -566,41 +598,20 @@
                <dependency>
                        <groupId>com.att.ajsc</groupId>
                        <artifactId>ajsc-archetype-parent</artifactId>
-                       <version>3.0.7-oss</version>
+                       <version>3.0.10-oss</version>
                        <type>pom</type>
                </dependency>
 
-               <dependency>
-                       <groupId>com.att.cadi</groupId>
-                       <artifactId>cadi-aaf</artifactId>
-                       <version>1.3.0</version>
-               </dependency>
-
-               <dependency>
-                       <groupId>com.att.inno</groupId>
-                       <artifactId>rosetta</artifactId>
-                       <version>1.2.11</version>
-               </dependency>
-               <dependency>
-                       <groupId>com.att.inno</groupId>
-                       <artifactId>env</artifactId>
-                       <version>1.2.11</version>
-               </dependency>
-               <dependency>
-                       <groupId>com.att.inno</groupId>
-                       <artifactId>xgen</artifactId>
-                       <version>1.2.11</version>
-               </dependency>
-               <dependency>
-                       <groupId>com.att.inno</groupId>
-                       <artifactId>rosetta</artifactId>
-                       <version>1.2.11</version>
-               </dependency>
-               <dependency>
-                       <groupId>backport-util-concurrent</groupId>
-                       <artifactId>backport-util-concurrent</artifactId>
-                       <version>3.1</version>
-               </dependency>
+       <dependency>
+               <groupId>org.onap.aaf.authz</groupId>
+               <artifactId>aaf-cadi-aaf</artifactId>
+               <version>2.1.5</version>
+       </dependency>
+       <dependency>
+               <groupId>backport-util-concurrent</groupId>
+               <artifactId>backport-util-concurrent</artifactId>
+               <version>3.1</version>
+       </dependency>
                <dependency>
                        <groupId>org.apache.camel</groupId>
                        <artifactId>camel-core</artifactId>
@@ -696,13 +707,13 @@
                <dependency>
                        <groupId>com.att.ajsc</groupId>
                        <artifactId>ajsc-runner</artifactId>
-                       <version>3.0.7-oss</version>
+                       <version>3.0.10-oss</version>
                        <scope>runtime</scope>
                </dependency>
                <dependency>
                        <groupId>com.att.ajsc</groupId>
                        <artifactId>ajsc-core</artifactId>
-                       <version>3.0.7-oss</version>
+                       <version>3.0.10-oss</version>
                        <scope>provided</scope>
                </dependency>
        </dependencies>