X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=0dbf6110d01dd714d3ac82181407c74846b6a3f6;hb=38203bb37230f7ccd53f435a1d9d13d7d0480930;hp=a2bdebd26a6a60261acf01150715b02aa4a5414f;hpb=3817e083dedf67b4fb03c638412fc644b19d7718;p=dmaap%2Fmessagerouter%2Fmessageservice.git

diff --git a/pom.xml b/pom.xml
index a2bdebd..0dbf611 100644
--- 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.11-SNAPSHOT</version>
 	<name>dmaap-messagerouter-messageservice</name>
 	<description>Message Router - Restful interface built for kafka</description>
 	<licenses>
@@ -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>
@@ -345,7 +345,7 @@
             <version>3.2.5</version>
            </dependency>
 
-		<dependency>
+		<!-- <dependency>
 			<groupId>com.att.cadi</groupId>
 			<artifactId>cadi-core</artifactId>
 			<version>1.3.0</version>
@@ -354,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>
@@ -457,7 +457,7 @@
 		<dependency>
 			<groupId>org.onap.dmaap.messagerouter.msgrtr</groupId>
 			<artifactId>msgrtr</artifactId>
-			<version>1.1.7</version>
+			<version>1.1.15</version>
 			<exclusions>
 				<exclusion>
 					<groupId>org.slf4j</groupId>
@@ -602,37 +602,16 @@
 			<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>