AAF integration modifications

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

diff --git a/pom.xml b/pom.xml
index a2bdebd..7438ac0 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -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.9</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.2-SNAPSHOT</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>
@@ -1358,6 +1337,34 @@
                                                        </execution>
                                                </executions>
                                        </plugin>
+                                  <plugin>
+                       <groupId>org.apache.maven.plugins</groupId>
+                       <artifactId>maven-enforcer-plugin</artifactId>
+                       <executions>
+                               <execution>
+                                       <id>enforce-no-snapshots</id>
+                                       <goals>
+                                               <goal>enforce</goal>
+                                       </goals>
+                                       <configuration>
+                                               <rules>
+                                                       <requireReleaseDeps>
+                                                               <message>No Snapshots Allowed!</message>
+                                                               <excludes>
+                                                                       <exclude>org.onap.aaf.authz:aaf-cadi-client</exclude>
+                                                                       <exclude>org.onap.aaf.authz:aaf-misc-env</exclude>
+                                                                       <exclude>org.onap.aaf.authz:aaf-cadi-aaf</exclude>
+                                                                       <exclude>org.onap.aaf.authz:aaf-auth-client</exclude>
+                                                                       <exclude>org.onap.aaf.authz:aaf-cadi-core</exclude>
+                                                                       <exclude>org.onap.aaf.authz:aaf-misc-rosetta</exclude>
+                                                               </excludes>
+                                                       </requireReleaseDeps>
+                                               </rules>
+                                               <fail>true</fail>
+                                       </configuration>
+                               </execution>
+                       </executions>
+               </plugin>
                                </plugins>
                                <pluginManagement>
                                        <plugins>