AAF integration modifications

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

diff --git a/pom.xml b/pom.xml
index d596a81..7438ac0 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -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.8-oss</ajscRuntimeVersion>
+               <ajscRuntimeVersion>3.0.10-oss</ajscRuntimeVersion>
 
                <!-- This will be the Absolute Root of the Project and should contain NO 
                        Versioning -->
@@ -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.9</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.8-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.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>
@@ -696,13 +707,13 @@
                <dependency>
                        <groupId>com.att.ajsc</groupId>
                        <artifactId>ajsc-runner</artifactId>
-                       <version>3.0.8-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.8-oss</version>
+                       <version>3.0.10-oss</version>
                        <scope>provided</scope>
                </dependency>
        </dependencies>
@@ -1326,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>