[DMAAP-MR] Update certs etc
[dmaap/messagerouter/messageservice.git] / pom.xml
diff --git a/pom.xml b/pom.xml
index 90c38e4..80fe6b9 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,24 +1,14 @@
-<!--
-     ============LICENSE_START=======================================================
-     org.onap.dmaap
-     ================================================================================
-     Copyright © 2017 AT&T Intellectual Property. All rights reserved.
-     ================================================================================
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-           http://www.apache.org/licenses/LICENSE-2.0
-     
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
-     ============LICENSE_END=========================================================
-   
-     ECOMP is a trademark and service mark of AT&T Intellectual Property.
-     
- -->
+<!-- ============LICENSE_START======================================================= 
+       org.onap.dmaap ================================================================================ 
+       Copyright © 2017 AT&T Intellectual Property. All rights reserved. ================================================================================ 
+       Licensed under the Apache License, Version 2.0 (the "License"); you may not 
+       use this file except in compliance with the License. You may obtain a copy 
+       of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required 
+       by applicable law or agreed to in writing, software distributed under the 
+       License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
+       OF ANY KIND, either express or implied. See the License for the specific 
+       language governing permissions and limitations under the License. ============LICENSE_END========================================================= 
+       ECOMP is a trademark and service mark of AT&T Intellectual Property. -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.onap.oparent</groupId>
                <artifactId>oparent</artifactId>
-               <version>0.1.1</version>
+               <version>2.1.0</version>
        </parent>
-       
+
        <groupId>org.onap.dmaap.messagerouter.messageservice</groupId>
        <artifactId>dmaapMR1</artifactId>
-       <version>1.0.2-SNAPSHOT</version>
+       <version>1.1.19-SNAPSHOT</version>
        <name>dmaap-messagerouter-messageservice</name>
        <description>Message Router - Restful interface built for kafka</description>
-        <licenses>
-         <license>
-           <name>Apache License Version 2.0</name>
-         </license>
+       <licenses>
+               <license>
+                       <name>Apache License Version 2.0</name>
+               </license>
        </licenses>
 
        <developers>
-          <developer>
-            <name>Rajashree</name>
-            <email></email>
-            <organization>ATT</organization>
-            <organizationUrl>www.att.com</organizationUrl>
-          </developer>
-          <developer>
-            <name>Ramkumar</name>
-            <email></email>
-            <organization>ATT</organization>
-            <organizationUrl>www.att.com</organizationUrl>
-          </developer>
-        </developers>
-       
+               <developer>
+                       <name>Rajashree</name>
+                       <email></email>
+                       <organization>ATT</organization>
+                       <organizationUrl>www.att.com</organizationUrl>
+               </developer>
+               <developer>
+                       <name>Ramkumar</name>
+                       <email></email>
+                       <organization>ATT</organization>
+                       <organizationUrl>www.att.com</organizationUrl>
+               </developer>
+       </developers>
+
        <build>
                <plugins>
-               <plugin>
+             <plugin>
+                    <groupId>org.jacoco</groupId>
+                    <artifactId>jacoco-maven-plugin</artifactId>
+                    <executions>
+                        <execution>
+                            <id>prepare-agent</id>
+                            <goals>
+                                <goal>prepare-agent</goal>
+                            </goals>
+                        </execution>
+                        <execution>
+                            <id>report</id>
+                            <goals>
+                                <goal>report</goal>
+                            </goals>
+                            <configuration>
+                                <dataFile>${project.build.directory}/code-coverage/jacoco.exec</dataFile>
+                                <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
+                       <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-site-plugin</artifactId>
                                <version>3.6</version>
                                        </dependency>
                                </dependencies>
                        </plugin>
-                       
-                               <plugin>
-                                               <groupId>org.apache.maven.plugins</groupId>
-                                               <artifactId>maven-jar-plugin</artifactId>
-                                               <version>3.0.2</version>
-                               </plugin>
-                                       
-               <!--    <plugin>
+
+                       <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-javadoc-plugin</artifactId>
-                               <version>2.10.4</version>
-                               <configuration>
-                                       <additionalparam>-Xdoclint:none</additionalparam>
-                               </configuration>
-                               <executions>
-                                       <execution>
-                                               <id>attach-javadocs</id>
-                                               <goals>
-                                                       <goal>jar</goal>
-                                               </goals>
-                                       </execution>
-                               </executions>
-                       </plugin> -->
+                               <artifactId>maven-jar-plugin</artifactId>
+                               <version>3.0.2</version>
+                       </plugin>
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-source-plugin</artifactId>
                                                </goals>
                                        </execution>
                                </executions>
-                       </plugin>               
+                       </plugin>
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-release-plugin</artifactId>
                                        </dependency>
                                </dependencies>
                        </plugin>
+                
 
-                       <plugin>
-                               <groupId>com.spotify</groupId>
-                               <artifactId>docker-maven-plugin</artifactId>
-                               <version>1.0.0</version>
-                               <configuration>
-                                       <imageName>onap/dmaap/dmaap-mr</imageName>
-                                       <dockerDirectory>${dockerLocation}</dockerDirectory> 
-                                       <serverId>docker-hub</serverId>
-                                       <imageTags>
-                                               <imageTag>${dmaapImg}</imageTag>
-                                               <imageTag>latest</imageTag>
-                                       </imageTags>
-                                       <forceTags>true</forceTags>
-                               <resources>
-                                       <resource>
-                                         <targetPath>/</targetPath>
-                                         <directory>${dockerLocation}</directory>
-                                         <include>${project.build.finalName}.jar</include>
-                                       </resource>
-                                       <resource>
-                                         <targetPath>/</targetPath>
-                                         <directory>${project.build.directory}</directory>
-                                         <include>**/**</include>
-                                       </resource>
-                                 </resources>
-                                </configuration>
-                               <executions>
-                          <execution>
-                                       <id>build-image</id>
-                                       <phase>package</phase>
-                                       <goals>
-                                         <goal>build</goal>
-                                       </goals>
-                                       <configuration>
-                                         <skipDockerBuild>${skip.docker.build}</skipDockerBuild>
-                                       </configuration>
-                                 </execution> 
-
-                                 <execution>
-                                       <id>tag-image-project-version</id>
-                                       <phase>package</phase>
-                                       <goals>
-                                         <goal>tag</goal>
-                                       </goals>
-                                       <configuration>
-                                         <image>onap/dmaap/dmaap-mr</image>
-                                         <newName>${docker.push.registry}/onap/dmaap/dmaap-mr:${project.version}</newName>
-                                         <skipDockerTag>${skip.docker.push}</skipDockerTag>
-                                       </configuration>
-                                 </execution>
-                                 
-                                 <execution>
-                                       <id>tag-image-latest</id>
-                                       <phase>package</phase>
-                                       <goals>
-                                         <goal>tag</goal>
-                                       </goals>
-                                       <configuration>
-                                         <image>onap/dmaap/dmaap-mr</image>
-                                         <newName>${docker.push.registry}/onap/dmaap/dmaap-mr:latest</newName>
-                                         <skipDockerTag>${skip.docker.push}</skipDockerTag>
-                                       </configuration>
-                                 </execution>
-                                 
-                                <execution>
-                                       <id>push-image-latest</id>
-                                       <phase>deploy</phase>
-                                       <goals>
-                                         <goal>push</goal>
-                                       </goals>
-                                       <configuration>
-                                         <imageName>${docker.push.registry}/onap/dmaap/dmaap-mr:${project.version}</imageName>
-                                         <skipDockerPush>${skip.docker.push}</skipDockerPush>
-                                       </configuration>
-                                 </execution>
-                                 
-                                 <execution>
-                                       <id>push-image</id>
-                                       <phase>deploy</phase>
-                                       <goals>
-                                         <goal>push</goal>
-                                       </goals>
-                                       <configuration>
-                                         <imageName>${docker.push.registry}/onap/dmaap/dmaap-mr:latest</imageName>
-                                         <skipDockerPush>${skip.docker.push}</skipDockerPush>
-                                       </configuration>
-                                 </execution>
-                               </executions>
-                       </plugin>                                                                                                                                                                                                                                                                                                        
                        <plugin>
                                <groupId>com.blackducksoftware.integration</groupId>
                                <artifactId>hub-maven-plugin</artifactId>
                                        </execution>
                                </executions>
                        </plugin>
-                       
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-compiler-plugin</artifactId>
-                               <version>3.1</version>
-                               <configuration>
-                                       <compilerId>groovy-eclipse-compiler</compilerId>
-                                       <verbose>true</verbose>
-                                       <source>1.7</source>
-                                       <target>1.7</target>
-                               </configuration>
-                               <dependencies>
-                                       <dependency>
-                                               <groupId>org.codehaus.groovy</groupId>
-                                               <artifactId>groovy-eclipse-compiler</artifactId>
-                                               <version>2.8.0-01</version>
-                                       </dependency>
-                                       <dependency>
-                                               <groupId>org.codehaus.groovy</groupId>
-                                               <artifactId>groovy-eclipse-batch</artifactId>
-                                               <version>2.1.5-03</version>
-                                       </dependency>
-                               </dependencies>
-                       </plugin>
+
+                       <!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> 
+                               <version>3.1</version> <configuration> <compilerId>groovy-eclipse-compiler</compilerId> 
+                               <verbose>true</verbose> <source>1.7</source> <target>1.7</target> </configuration> 
+                               <dependencies> <dependency> <groupId>org.codehaus.groovy</groupId> <artifactId>groovy-eclipse-compiler</artifactId> 
+                               <version>2.8.0-01</version> </dependency> <dependency> <groupId>org.codehaus.groovy</groupId> 
+                               <artifactId>groovy-eclipse-batch</artifactId> <version>2.1.5-03</version> 
+                               </dependency> </dependencies> </plugin> -->
                        <plugin>
                                <groupId>org.codehaus.groovy</groupId>
                                <artifactId>groovy-eclipse-compiler</artifactId>
                                <version>2.8.0-01</version>
                                <extensions>true</extensions>
                        </plugin>
-                                       
+
                </plugins>
        </build>
 
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
                <dockerLocation>${basedir}/target/swm/package/nix/dist_files/</dockerLocation>
                <docker.image.prefix>simpledemo</docker.image.prefix>
-
+               <!-- <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>1.0.0</ajscRuntimeVersion>
+               <ajscRuntimeVersion>3.0.11-oss</ajscRuntimeVersion>
 
                <!-- This will be the Absolute Root of the Project and should contain NO 
                        Versioning -->
                        8080 -->
                <serverPort>3904</serverPort>
                <sslport>3905</sslport>
-       
+        <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
                <testRouteOffer>workstation</testRouteOffer>
                <testEnv>DEV</testEnv>
-               <dmaapImg>1.0.2-SNAPSHOT</dmaapImg>
-               <camel.version>2.15.5</camel.version>
+               <!-- <dmaapImg>${project.version}</dmaapImg> -->
+               <timestamp>${maven.build.timestamp}</timestamp>
+        <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
+               <camel.version>2.21.5</camel.version>
+               <camel.version.latest>3.5.0</camel.version.latest>
                <sitePath>/content/sites/site/org/onap/dmaap/messagerouter/messageservice/${project.artifactId}/${project.version}</sitePath>
                <skip.docker.build>true</skip.docker.build>
-        <skip.docker.push>true</skip.docker.push>
+               <skip.docker.tag>true</skip.docker.tag>
+               <skip.docker.push>true</skip.docker.push>
                <nexusproxy>https://nexus.onap.org</nexusproxy>
                <docker.push.registry>nexus3.onap.org:10003</docker.push.registry>
+               <spring.version>3.2.18.RELEASE</spring.version>
+               <sonar.language>java</sonar.language>
+        <sonar.skip>false</sonar.skip>
+        <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
+        <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
+        <sonar.projectVersion>${project.version}</sonar.projectVersion>
        </properties>
 
        <!-- Distribution management -->
                so). If you have a startup failure related to a missing dme2 class not found 
                exception, please contact the AJSC team for assistance. You can email support 
                at ajsc-Support <DL-ajsc-Support@att.com>. For more information regarding 
-               the usage of the AJSC service pom.xml and management of dependencies, please 
-               goto wiki link:http://wiki.web.att.com/display/ajsc/pom.xml -->
+               the usage of the AJSC service pom.xml and management of dependencies, -->
        <dependencies>
 
                <!-- cmn-CommonDataModel dependency added to resolve build issue not finding 
                        version 100.0.64 -->
-               
+
+               <!-- <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>
-                       <groupId>csi-schemas-source</groupId>
-                       <artifactId>cmn-CommonDataModel</artifactId>
-                       <version>112.0.50</version>
-               </dependency> -->
-       <!-- TODO: add open source version here -->
-               <dependency>
                        <groupId>com.att.cadi</groupId>
                        <artifactId>cadi-core</artifactId>
                        <version>1.3.0</version>
                </dependency>
                <dependency>
-                       <groupId>commons-io</groupId>
-                       <artifactId>commons-io</artifactId>
-                       <version>2.4</version>
+                       <groupId>com.att.aft</groupId>
+                       <artifactId>dme2</artifactId>
+                       <version>3.1.200-oss</version>
+               </dependency> -->
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-expression</artifactId>
+                       <version>4.3.18.RELEASE</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-messaging</artifactId>
+                       <version>4.1.9.RELEASE</version>
+               </dependency>
+               <!-- <dependency> <groupId>com.sun.mail</groupId> <artifactId>javax.mail</artifactId> 
+                       <version>${javax-mail-version}</version> <exclusions> javax activation is 
+                       part of the JDK now <exclusion> <groupId>javax.activation</groupId> <artifactId>activation</artifactId> 
+                       </exclusion> </exclusions> </dependency> -->
+
+       <dependency>
+       <groupId>org.apache.zookeeper</groupId>
+       <artifactId>zookeeper</artifactId>
+       <version>3.4.14</version>
+   </dependency>
+   <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.6.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <version>1.6.1</version>
+      <exclusions>
+        <exclusion>
+          <groupId>*</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
+       <dependency>
+               <groupId>org.apache.kafka</groupId>
+               <artifactId>kafka_2.11</artifactId>
+               <version>2.3.0</version>
+       </dependency>
+       <dependency>
+               <groupId>commons-codec</groupId>
+               <artifactId>commons-codec</artifactId>
+               <version>1.14</version>
+       </dependency>
+       <dependency>
+               <groupId>commons-io</groupId>
+               <artifactId>commons-io</artifactId>
+               <version>2.7</version>
+       </dependency>
+       <dependency>
+               <groupId>org.quartz-scheduler</groupId>
+               <artifactId>quartz</artifactId>
+               <version>2.3.2</version>
+       </dependency>
+       <dependency>
+               <groupId>com.fasterxml.woodstox</groupId>
+               <artifactId>woodstox-core</artifactId>
+               <version>5.3.0</version>
+       </dependency>
+               <dependency>
+                       <groupId>org.grails</groupId>
+                       <artifactId>grails-bootstrap</artifactId>
+                       <version>4.0.1</version>
+                       <scope>compile</scope>
+                       <exclusions>
+                               <exclusion>
+                                       <artifactId>ant</artifactId>
+                                       <groupId>org.apache.ant</groupId>
+                               </exclusion>
+                               <exclusion>
+                                       <artifactId>jna</artifactId>
+                                       <groupId>net.java.dev.jna</groupId>
+                               </exclusion>
+                               <exclusion>
+                                       <artifactId>ant-trax</artifactId>
+                                       <groupId>org.apache.ant</groupId>
+                               </exclusion>
+                               <exclusion>
+                                       <artifactId>gant_groovy1.8</artifactId>
+                                       <groupId>org.codehaus.gant</groupId>
+                               </exclusion>
+                               <exclusion>
+                                       <artifactId>ant-launcher</artifactId>
+                                       <groupId>org.apache.ant</groupId>
+                               </exclusion>
+                               <exclusion>
+                                       <artifactId>jline</artifactId>
+                                       <groupId>jline</groupId>
+                               </exclusion>
+                               <exclusion>
+                                       <artifactId>ivy</artifactId>
+                                       <groupId>org.apache.ivy</groupId>
+                               </exclusion>
+                               <exclusion>
+                                       <artifactId>jansi</artifactId>
+                                       <groupId>org.fusesource.jansi</groupId>
+                               </exclusion>
+                               <exclusion>
+                                       <artifactId>commons-logging</artifactId>
+                                       <groupId>commons-logging</groupId>
+                               </exclusion>
+                               <exclusion>
+                                       <artifactId>ant-junit</artifactId>
+                                       <groupId>org.apache.ant</groupId>
+                               </exclusion>
+                       </exclusions>
+               </dependency>
+               <dependency>
+                       <groupId>commons-fileupload</groupId>
+                       <artifactId>commons-fileupload</artifactId>
+                       <version>1.4</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-webmvc</artifactId>
+                       <version>4.3.18.RELEASE</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-core</artifactId>
+                       <version>4.3.18.RELEASE</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-beans</artifactId>
+                       <version>4.3.18.RELEASE</version>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-context</artifactId>
+                       <version>4.3.18.RELEASE</version>
                </dependency>
                <dependency>
                        <groupId>org.apache.commons</groupId>
                        <version>1.3.2</version>
                </dependency>
                <dependency>
-                         <groupId>com.att.nsa</groupId>
-                         <artifactId>msgrtr</artifactId>
-                         <version>0.0.5</version>
+                       <groupId>org.onap.dmaap.messagerouter.msgrtr</groupId>
+                       <artifactId>msgrtr</artifactId>
+                       <version>1.1.23</version>
                        <exclusions>
+                               <exclusion>
+                                       <groupId>org.apache.kafka</groupId>
+                               <artifactId>kafka_2.11</artifactId>
+                               </exclusion>
                                <exclusion>
                                        <groupId>org.slf4j</groupId>
                                        <artifactId>slf4j-log4j12</artifactId>
                                        <artifactId>tomcat-util</artifactId>
                                </exclusion>
 
+                               <exclusion>
+                                       <groupId>commons-beanutils</groupId>
+                                       <artifactId>commons-beanutils</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>javax.mail</groupId>
+                                       <artifactId>mail</artifactId>
+                               </exclusion>
                        </exclusions>
                </dependency>
-
                <dependency>
-                       <groupId>org.codehaus.jackson</groupId>
-                       <artifactId>jackson-jaxrs</artifactId>
-                       <version>1.9.13</version>
+                       <groupId>org.mockito</groupId>
+                       <artifactId>mockito-core</artifactId>
+                       <version>1.10.19</version>
+                       <scope>test</scope>
                </dependency>
-               
                <dependency>
-                       <groupId>org.codehaus.jackson</groupId>
-                       <artifactId>jackson-mapper-asl</artifactId>
-                       <version>1.9.13</version>
+                       <groupId>org.powermock</groupId>
+                       <artifactId>powermock-module-junit4</artifactId>
+                       <version>1.6.4</version>
+                       <scope>test</scope>
                </dependency>
                <dependency>
-                       <groupId>org.codehaus.jackson</groupId>
-                       <artifactId>jackson-core-asl</artifactId>
-                       <version>1.9.13</version>
+                       <groupId>org.powermock</groupId>
+                       <artifactId>powermock-api-mockito</artifactId>
+                       <version>1.6.4</version>
+                       <scope>test</scope>
+               </dependency>
+               <!-- <dependency> <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-jaxrs</artifactId> 
+                       <version>1.9.13</version> </dependency> <dependency> <groupId>org.codehaus.jackson</groupId> 
+                       <artifactId>jackson-mapper-asl</artifactId> <version>1.9.13</version> </dependency> 
+                       <dependency> <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-core-asl</artifactId> 
+                       <version>1.9.13</version> </dependency> -->
+
+               <dependency>
+                       <groupId>com.fasterxml.jackson.jaxrs</groupId>
+                       <artifactId>jackson-jaxrs-json-provider</artifactId>
+                       <version>2.2.3</version>
                </dependency>
-               
+
                <dependency>
                        <groupId>com.fasterxml.jackson.core</groupId>
                        <artifactId>jackson-core</artifactId>
-                       <version>2.4.3</version>
+                       <version>2.11.2</version>
                </dependency>
-               
+
                <dependency>
-                   <groupId>com.fasterxml.jackson.core</groupId>
-                   <artifactId>jackson-databind</artifactId>
-                   <version>2.3.3</version>
+                       <groupId>com.fasterxml.jackson.core</groupId>
+                       <artifactId>jackson-databind</artifactId>
+                       <version>2.11.2</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.grails</groupId>
+                       <artifactId>grails-web</artifactId>
+                       <version>2.5.4</version>
+                       <exclusions>
+                               <exclusion>
+                                       <groupId>org.grails</groupId>
+                                       <artifactId>grails-web-jsp</artifactId>
+                               </exclusion>
+                       </exclusions>
                </dependency>
-               
                <dependency>
-               <groupId>junit</groupId>
-               <artifactId>junit</artifactId>
-               <version>4.11</version>
-               <scope>test</scope>
-      </dependency>
+                       <groupId>org.codehaus.groovy</groupId>
+                       <artifactId>groovy-all</artifactId>
+                       <version>2.4.8</version>
+                       <scope>compile</scope>
+                       <exclusions>
+                               <exclusion>
+                                       <artifactId>jline</artifactId>
+                                       <groupId>jline</groupId>
+                               </exclusion>
+                       </exclusions>
+               </dependency>
+
+               <dependency>
+                       <groupId>junit</groupId>
+                       <artifactId>junit</artifactId>
+                       <version>4.11</version>
+                       <scope>test</scope>
+               </dependency>
 
                <dependency>
                        <groupId>org.json</groupId>
                <dependency>
                        <groupId>org.apache.cxf</groupId>
                        <artifactId>cxf-rt-rs-extension-providers</artifactId>
-                       <version>3.0.4</version>
+                       <version>3.2.2</version>
+                       <!-- <exclusions> <exclusion> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-transports-http</artifactId> 
+                               </exclusion> </exclusions> -->
+                       <exclusions>
+                               <exclusion>
+                                       <groupId>org.apache.cxf</groupId>
+                                       <artifactId>cxf-core</artifactId>
+                               </exclusion>
+                       </exclusions>
                </dependency>
+               <!-- <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-transports-http</artifactId> 
+                       <version>3.1.14</version> </dependency> -->
                <dependency>
                        <groupId>org.codehaus.jettison</groupId>
                        <artifactId>jettison</artifactId>
                        <version>1.3.7</version>
                </dependency>
 
+               <!-- <dependency> <groupId>dom4j</groupId> <artifactId>dom4j</artifactId> 
+                       <version>1.6.1</version> <scope>provided</scope> </dependency> -->
                <dependency>
-                       <groupId>dom4j</groupId>
-                       <artifactId>dom4j</artifactId>
-                       <version>1.6.1</version>
-                       <scope>provided</scope>
+                       <groupId>com.att.ajsc</groupId>
+                       <artifactId>ajsc-archetype-parent</artifactId>
+                       <version>3.0.11-oss</version>
+                       <type>pom</type>
                </dependency>
+
+       <dependency>
+               <groupId>org.onap.aaf.authz</groupId>
+               <artifactId>aaf-cadi-aaf</artifactId>
+               <version>2.1.13</version>
+       </dependency>
+       <dependency>
+               <groupId>backport-util-concurrent</groupId>
+               <artifactId>backport-util-concurrent</artifactId>
+               <version>3.1</version>
+       </dependency>
                <dependency>
-                       <groupId>com.att.aft</groupId>
-                       <artifactId>dme2</artifactId>
-                       <version>3.1.200</version>
-                       <!-- <scope>provided</scope> -->
+                       <groupId>org.apache.camel</groupId>
+                       <artifactId>camel-core</artifactId>
+                       <version>3.4.0</version>
                </dependency>
                <dependency>
-                 <groupId>com.att.ajsc</groupId>
-                 <artifactId>ajsc-archetype-parent</artifactId>
-                 <version>1.0.0</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>                   
+                       <groupId>org.apache.camel</groupId>
+                       <artifactId>camel-quartz</artifactId>
+                       <version>${camel.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.apache.camel</groupId>
+                       <artifactId>camel-spring</artifactId>
+                       <version>${camel.version.latest}</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.apache.camel</groupId>
+                       <artifactId>camel-restlet</artifactId>
+                       <version>${camel.version}</version>
+                       <exclusions>
+                               <exclusion>
+                                       <artifactId>org.restlet</artifactId>
+                                       <groupId>org.restlet.jse</groupId>
+                               </exclusion>
+                       </exclusions>
+               </dependency>
+               <dependency>
+                       <groupId>org.apache.camel</groupId>
+                       <artifactId>camel-servlet</artifactId>
+                       <version>${camel.version}</version>
+                       <!-- <exclusions> <exclusion> <groupId>commons-httpclient</groupId> <artifactId>commons-httpclient</artifactId> 
+                               </exclusion> </exclusions> -->
+               </dependency>
+               <!-- <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> 
+                       <version>4.0</version> </dependency> -->
+
+               <dependency>
+                       <groupId>org.apache.camel</groupId>
+                       <artifactId>camel-http4</artifactId>
+                       <version>${camel.version}</version>
+                       <exclusions>
+                               <exclusion>
+                                       <groupId>org.apache.geronimo.specs</groupId>
+                                       <artifactId>geronimo-servlet_2.5_spec</artifactId>
+                               </exclusion>
+                       </exclusions>
+               </dependency>
+               <dependency>
+                       <groupId>org.apache.camel</groupId>
+                       <artifactId>camel-groovy</artifactId>
+                       <version>${camel.version.latest}</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.apache.camel</groupId>
+                       <artifactId>camel-twitter</artifactId>
+                       <version>${camel.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.apache.camel</groupId>
+                       <artifactId>camel-mail</artifactId>
+                       <version>${camel.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.apache.camel</groupId>
+                       <artifactId>camel-smpp</artifactId>
+                       <version>${camel.version}</version>
+               </dependency>
                <dependency>
-                       <groupId>backport-util-concurrent</groupId>
-                       <artifactId>backport-util-concurrent</artifactId>
-                       <version>3.1</version>
+                       <groupId>org.apache.camel</groupId>
+                       <artifactId>camel-jms</artifactId>
+                       <version>${camel.version}</version>
                </dependency>
                <dependency>
-                               <groupId>org.apache.camel</groupId>
-                               <artifactId>camel-core</artifactId>
-                               <version>${camel.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.apache.camel</groupId>
-                               <artifactId>camel-quartz</artifactId>
-                               <version>${camel.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.apache.camel</groupId>
-                               <artifactId>camel-spring</artifactId>
-                               <version>${camel.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.apache.camel</groupId>
-                               <artifactId>camel-restlet</artifactId>
-                               <version>${camel.version}</version>
-                               <exclusions>
-                                       <exclusion>
-                                               <artifactId>org.restlet</artifactId>
-                                               <groupId>org.restlet.jse</groupId>
-                                       </exclusion>
-                               </exclusions>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.apache.camel</groupId>
-                               <artifactId>camel-servlet</artifactId>
-                               <version>${camel.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.apache.camel</groupId>
-                               <artifactId>camel-http4</artifactId>
-                               <version>${camel.version}</version>
-                               <exclusions>
-                                       <exclusion>
-                                               <groupId>org.apache.geronimo.specs</groupId>
-                                               <artifactId>geronimo-servlet_2.5_spec</artifactId>
-                                       </exclusion>
-                               </exclusions>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.apache.camel</groupId>
-                               <artifactId>camel-groovy</artifactId>
-                               <version>${camel.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.apache.camel</groupId>
-                               <artifactId>camel-twitter</artifactId>
-                               <version>${camel.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.apache.camel</groupId>
-                               <artifactId>camel-mail</artifactId>
-                               <version>${camel.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.apache.camel</groupId>
-                               <artifactId>camel-smpp</artifactId>
-                               <version>${camel.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.apache.camel</groupId>
-                               <artifactId>camel-jms</artifactId>
-                               <version>${camel.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.apache.camel</groupId>
-                               <artifactId>camel-script</artifactId>
-                               <version>${camel.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.apache.camel</groupId>
-                               <artifactId>camel-xmpp</artifactId>
-                               <version>${camel.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.apache.camel</groupId>
-                               <artifactId>camel-velocity</artifactId>
-                               <version>${camel.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>com.att.ajsc</groupId>
-                               <artifactId>ajsc-runner</artifactId>
-                               <version>1.0.0</version>
-                               <scope>runtime</scope>
-                       </dependency>
-                       <dependency>
-                               <groupId>com.att.ajsc</groupId>
-                               <artifactId>ajsc-core</artifactId>
-                               <version>1.0.0</version>
-                               <scope>provided</scope>
-                       </dependency>
+                       <groupId>org.apache.camel</groupId>
+                       <artifactId>camel-script</artifactId>
+                       <version>${camel.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.apache.camel</groupId>
+                       <artifactId>camel-xmpp</artifactId>
+                       <version>${camel.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.igniterealtime.smack</groupId>
+                       <artifactId>smack-tcp</artifactId>
+                       <version>4.1.0-rc1</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.apache.camel</groupId>
+                       <artifactId>camel-velocity</artifactId>
+                       <version>${camel.version.latest}</version>
+               </dependency>
+               <dependency>
+                       <groupId>com.att.ajsc</groupId>
+                       <artifactId>ajsc-runner</artifactId>
+                       <version>3.0.11-oss</version>
+                       <scope>runtime</scope>
+               </dependency>
+               <dependency>
+                       <groupId>com.att.ajsc</groupId>
+                       <artifactId>ajsc-core</artifactId>
+                       <version>3.0.11-oss</version>
+                       <scope>provided</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-test</artifactId>
+                       <version>3.2.12.RELEASE</version>
+                       <scope>test</scope>
+               </dependency>
        </dependencies>
        <!-- <build> <resources> <resource> <directory>${basedir}/ajsc-shared-config/etc</directory> 
                </resource> </resources> </build> -->
                <!-- Use this profile to run the AJSC locally. This profile can be successfully 
                        shutdown WITHIN eclipse even in a Windows environment. Debugging is also 
                        available with this profile. -->
-       <profile>
-      <id>docker</id>
-      <properties>
-        
-        <skip.docker.build>false</skip.docker.build>
-        <skip.docker.tag>false</skip.docker.tag>
-        <skip.docker.push>false</skip.docker.push>
-      </properties>
-    </profile>
-    
-    <profile>
+               <profile>
+                       <id>docker</id>
+                       <properties>
+                               <skip.docker.build>false</skip.docker.build>
+                               <skip.docker.tag>false</skip.docker.tag>
+                               <skip.docker.push>false</skip.docker.push>
+                       </properties>
+                       <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.groovy.maven</groupId>
+                        <artifactId>gmaven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <phase>validate</phase>
+                                <goals>
+                                    <goal>execute</goal>
+                                </goals>
+                                <configuration>
+                                    <properties>
+                                        <ver>${project.version}</ver>
+                                        <timestamp>${maven.build.timestamp}</timestamp>
+                                    </properties>
+                                    <source>
+                                        println project.properties['ver'];
+                                        if ( project.properties['ver'].endsWith("-SNAPSHOT") ) {
+                                        project.properties['dockertag1']=project.properties['ver'] + "-latest";
+                                        project.properties['dockertag2']=project.properties['ver'] + "-" + project.properties['timestamp'];
+                                        } else {
+                                        project.properties['dockertag1']=project.properties['ver'] + "-STAGING-latest";
+                                        project.properties['dockertag2']=project.properties['ver'] + "-STAGING-" + project.properties['timestamp'];
+                                        }
+                                        println 'docker tag 1: ' + project.properties['dockertag1'];
+                                        println 'docker tag 2: ' + project.properties['dockertag2'];
+                                    </source>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                   <plugin>
+                        <groupId>io.fabric8</groupId>
+                        <artifactId>docker-maven-plugin</artifactId>
+                        <version>0.28.0</version>  
+                        <configuration>
+                            <verbose>${docker.verbose}</verbose>
+                            <apiVersion>${docker.apiVersion}</apiVersion>
+                            <pullRegistry>${docker.pull.registry}</pullRegistry>
+                            <pushRegistry>${docker.push.registry}</pushRegistry>
+                            <images>
+                                <image>                            
+                                    <name>onap/dmaap/dmaap-mr</name>
+                                    <build>
+                                        <cleanup>try</cleanup>
+                                        <dockerFileDir>${dockerLocation}</dockerFileDir>
+                                        <dockerFile>Dockerfile</dockerFile>
+                                        <tags>
+                                            <tag>${dockertag1}</tag>
+                                            <tag>${dockertag2}</tag>
+                                        </tags>
+                                    </build>
+                                </image>
+                            </images>
+                        </configuration>
+                         <executions>
+                             <execution>
+                                 <id>generate-images</id>
+                                 <phase>install</phase>
+                                 <goals>
+                                     <goal>build</goal>
+                                 </goals>
+                             </execution>
+                             <execution>
+                                 <id>push-images</id>
+                                 <phase>deploy</phase>
+                                 <goals>
+                                     <goal>push</goal>
+                                 </goals>
+                             </execution>
+                         </executions>
+                    </plugin>
+                </plugins>
+            </build>
+               </profile>
+
+               <profile>
                        <id>runLocal</id>
                        <build>
                                <defaultGoal>initialize</defaultGoal>
                                </plugins>
                        </build>
                </profile>
-       
+
                <profile>
                        <id>runAjsc</id>
                        <build>
                                                                                        <key>logback.configurationFile</key>
                                                                                        <value>${basedir}/ajsc-shared-config/etc/logback.xml</value>
                                                                                </systemProperty>
+                                                                               <systemProperty>
+                                                                                       <key>com.att.eelf.logging.file</key>
+                                                                                       <value>logback.xml</value>
+                                                                               </systemProperty>
+                                                                               <systemProperty>
+                                                                                       <key>com.att.eelf.logging.path</key>
+                                                                                       <value>${basedir}/ajsc-shared-config/etc</value>
+                                                                               </systemProperty>
+                                                                               <systemProperty>
+                                                                                       <key>logging.config</key>
+                                                                                       <value>${basedir}/ajsc-shared-config/etc/logback.xml</value>
+                                                                               </systemProperty>
                                                                                <systemProperty>
                                                                                        <key>AJSC_SHARED_CONFIG</key>
                                                                                        <value>${basedir}/ajsc-shared-config</value>
                                                <version>2.8.0-01</version>
                                                <extensions>true</extensions>
                                        </plugin>
-                                       
+
                                        <plugin>
                                                <groupId>org.codehaus.mojo</groupId>
                                                <artifactId>exec-maven-plugin</artifactId>
                                                                        </resources>
                                                                </configuration>
                                                        </execution>
-                                       <execution>
-                                               <id>copy-docker-file</id>
-                                               <phase>package</phase>
-                                               <goals>
-                                                       <goal>copy-resources</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <outputDirectory>${dockerLocation}</outputDirectory>
-                                                       <overwrite>true</overwrite>
-                                                       <resources>
-                                                               <resource>
-                                                                       <directory>${basedir}/src/main/resources/docker</directory>
-                                                                       <filtering>true</filtering>
-                                                                       <includes>
-                                                                               <include>**/*</include>
-                                                                       </includes>
-                                                               </resource>
-                                                       </resources>
-                                               </configuration>
-                                       </execution>
+                                                       <execution>
+                                                               <id>copy-docker-file</id>
+                                                               <phase>prepare-package</phase>
+                                                               <goals>
+                                                                       <goal>copy-resources</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <outputDirectory>${dockerLocation}</outputDirectory>
+                                                                       <overwrite>true</overwrite>
+                                                                       <resources>
+                                                                               <resource>
+                                                                                       <directory>${basedir}/src/main/resources/docker</directory>
+                                                                                       <filtering>true</filtering>
+                                                                                       <includes>
+                                                                                               <include>**/*</include>
+                                                                                       </includes>
+                                                                               </resource>
+                                                                       </resources>
+                                                               </configuration>
+                                                       </execution>
 
                                                </executions>
                                        </plugin>
                        </build>
                </profile>
        </profiles>
-       
+
 </project>