pom updates for version settings 16/84116/11
authorefiacor <fiachra.corcoran@est.tech>
Tue, 9 Apr 2019 13:52:17 +0000 (13:52 +0000)
committerConor Ward <conor.ward@est.tech>
Tue, 16 Apr 2019 08:58:47 +0000 (08:58 +0000)
    Refactored some of the fabric8 also.

Change-Id: Ib5a62cab9d917728d42f54a1bbe42b937d48793e
Issue-ID: DMAAP-854
Signed-off-by: efiacor <fiachra.corcoran@est.tech>
datarouter-docker-compose/pom.xml
datarouter-node/pom.xml
datarouter-prov/pom.xml
datarouter-subscriber/pom.xml
pom.xml

index 4c26142..fbc0855 100644 (file)
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.onap.dmaap.datarouter</groupId>
     <artifactId>parent</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>${revision}</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>datarouter-docker-compose</artifactId>
index cab4ce1..06aa3fc 100755 (executable)
     <parent>
         <groupId>org.onap.dmaap.datarouter</groupId>
         <artifactId>parent</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>${revision}</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>datarouter-node</artifactId>
     <packaging>jar</packaging>
-    <name>datarouter-node</name>
-    <url>https://github.com/att/DMAAP_DATAROUTER</url>
+    <url>https://docs.onap.org/en/latest/submodules/dmaap/datarouter.git/docs/index.html</url>
     <properties>
-        <sonar.skip>false</sonar.skip>
-        <sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
         <sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath>
-        <docker.location>${basedir}/target/${artifactId}</docker.location>
-
-        <timestamp>${maven.build.timestamp}</timestamp>
-        <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
-
-        <datarouter.node.image.name>onap/dmaap/datarouter-node</datarouter.node.image.name>
+        <docker.location>${basedir}/target/${project.artifactId}</docker.location>
+        <datarouter.node.image.name>${docker.image.root}${project.artifactId}</datarouter.node.image.name>
+        <sonar.language>java</sonar.language>
+        <sonar.skip>false</sonar.skip>
     </properties>
     <dependencies>
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>${google.guava.version}</version>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-library</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
         </dependency>
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
-            <version>${commons-codec.version}</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.10</version>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.json</groupId>
             <artifactId>json</artifactId>
-            <version>20160810</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.mail</groupId>
-            <artifactId>javax.mail-api</artifactId>
-            <version>${javax.mail-api.version}</version>
         </dependency>
         <dependency>
             <groupId>com.att.eelf</groupId>
             <artifactId>eelf-core</artifactId>
-            <version>0.0.1</version>
-        </dependency>
-        <dependency>
-            <groupId>com.thoughtworks.xstream</groupId>
-            <artifactId>xstream</artifactId>
-            <version>${thoughtworks.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.codehaus.janino</groupId>
-            <artifactId>janino</artifactId>
-            <version>3.0.7</version>
         </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>${qos.logback.version}</version>
-            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-core</artifactId>
-            <version>${qos.logback.version}</version>
-            <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-server</artifactId>
-            <version>${jetty.version}</version>
+            <groupId>com.intellij</groupId>
+            <artifactId>annotations</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-continuation</artifactId>
-            <version>${jetty.version}</version>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-util</artifactId>
-            <version>${jetty.version}</version>
+            <artifactId>jetty-server</artifactId>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-deploy</artifactId>
-            <version>${jetty.version}</version>
+            <artifactId>jetty-util</artifactId>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-servlet</artifactId>
-            <version>${jetty.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-servlets</artifactId>
-            <version>${jetty.version}</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-http</artifactId>
-            <version>${jetty.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-security</artifactId>
-            <version>${jetty.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-websocket</artifactId>
-            <version>${jetty.websocket.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-io</artifactId>
-            <version>${jetty.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>1.3.2</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-            <version>2.4</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>2.1</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpcore</artifactId>
-            <version>4.4</version>
-        </dependency>
-        <dependency>
-            <groupId>org.mozilla</groupId>
-            <artifactId>rhino</artifactId>
-            <version>1.7R3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.james</groupId>
-            <artifactId>apache-mime4j-core</artifactId>
-            <version>0.7</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-            <version>4.5.3</version>
+            <groupId>org.onap.aaf.authz</groupId>
+            <artifactId>aaf-cadi-core</artifactId>
         </dependency>
         <dependency>
             <groupId>org.sonatype.http-testing-harness</groupId>
             <artifactId>junit-runner</artifactId>
-            <version>0.11</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.databene</groupId>
-                    <artifactId>contiperf</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>1.10.19</version>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-module-junit4</artifactId>
-            <version>1.6.4</version>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-api-mockito</artifactId>
-            <version>1.6.4</version>
-            <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>3.0</version>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-api-support</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.onap.aaf.authz</groupId>
-            <artifactId>aaf-cadi-aaf</artifactId>
-            <version>${aaf-cadi-aaf.version}</version>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
         </dependency>
     </dependencies>
     <profiles>
         <profile>
             <id>docker</id>
             <properties>
-                <skipDockerBuild>false</skipDockerBuild>
-                <skipDockerTag>false</skipDockerTag>
                 <skipTests>true</skipTests>
             </properties>
             <build>
                 <plugins>
-
-                    <!-- Setup image tags per https://wiki.onap.org/display/DW/Independent+Versioning+and+Release+Process#IndependentVersioningandReleaseProcess-StandardizedDockerTagging -->
                     <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 'ver: ' + 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>
+                        <groupId>org.codehaus.gmaven</groupId>
+                        <artifactId>gmaven-plugin</artifactId>
                     </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>${datarouter.node.image.name}</name>
                                 </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>
+                        <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>
     </profiles>
-
     <build>
         <finalName>datarouter-node</finalName>
         <resources>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                </configuration>
-                <version>3.6.0</version>
             </plugin>
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
-                <version>2.10</version>
                 <executions>
                     <execution>
                         <id>copy-dependencies</id>
                         <phase>package</phase>
-                        <goals>
-                            <goal>copy-dependencies</goal>
-                        </goals>
                         <configuration>
                             <outputDirectory>${project.build.directory}/docker-stage/opt/app/datartr/lib</outputDirectory>
-                            <overWriteReleases>false</overWriteReleases>
-                            <overWriteSnapshots>false</overWriteSnapshots>
-                            <overWriteIfNewer>true</overWriteIfNewer>
                         </configuration>
                     </execution>
                 </executions>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <configuration>
-                    <failOnError>false</failOnError>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>attach-javadocs</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>2.2.1</version>
-                <executions>
-                    <execution>
-                        <id>attach-sources</id>
-                        <goals>
-                            <goal>jar-no-fork</goal>
-                        </goals>
-                    </execution>
-                </executions>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>cobertura-maven-plugin</artifactId>
-                <version>2.7</version>
-                <configuration>
-                    <formats>
-                        <format>html</format>
-                        <format>xml</format>
-                    </formats>
-                    <check/>
-                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.sonatype.plugins</groupId>
                 <artifactId>nexus-staging-maven-plugin</artifactId>
-                <version>1.6.7</version>
-                <extensions>true</extensions>
-                <configuration>
-                    <nexusUrl>${onap.nexus.url}</nexusUrl>
-                    <stagingProfileId>176c31dfe190a</stagingProfileId>
-                    <serverId>ecomp-staging</serverId>
-                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>${jacoco.version}</version>
-                <configuration>
-                    <excludes>
-                        <exclude>**/gen/**</exclude>
-                        <exclude>**/generated-sources/**</exclude>
-                        <exclude>**/yang-gen/**</exclude>
-                        <exclude>**/pax/**</exclude>
-                    </excludes>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>pre-unit-test</id>
-                        <goals>
-                            <goal>prepare-agent</goal>
-                        </goals>
-                        <configuration>
-                            <destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
-                            <propertyName>surefireArgLine</propertyName>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>post-unit-test</id>
-                        <phase>test</phase>
-                        <goals>
-                            <goal>report</goal>
-                        </goals>
-                        <configuration>
-                            <dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
-                            <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>pre-integration-test</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>prepare-agent</goal>
-                        </goals>
-                        <configuration>
-                            <destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
-                            <propertyName>failsafeArgLine</propertyName>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>post-integration-test</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>report</goal>
-                        </goals>
-                        <configuration>
-                            <dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
-                            <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>properties-maven-plugin</artifactId>
             </plugin>
         </plugins>
     </build>
index d0f757b..c6f6ff3 100755 (executable)
-<!--\r
-  ============LICENSE_START==================================================\r
-  * org.onap.dmaap\r
-  * ===========================================================================\r
-  * Copyright Â© 2017 AT&T Intellectual Property. All rights reserved.\r
-  * Modifications Copyright (C) 2018 Nokia. All rights reserved.\r
-  * ===========================================================================\r
-  * Licensed under the Apache License, Version 2.0 (the "License");\r
-  * you may not use this file except in compliance with the License.\r
-  * You may obtain a copy of the License at\r
-  *\r
-   *      http://www.apache.org/licenses/LICENSE-2.0\r
-  *\r
-   * Unless required by applicable law or agreed to in writing, software\r
-  * distributed under the License is distributed on an "AS IS" BASIS,\r
-  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-  * See the License for the specific language governing permissions and\r
-  * limitations under the License.\r
-  * ============LICENSE_END====================================================\r
-  *\r
-  * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
-  *\r
--->\r
-<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/maven-v4_0_0.xsd">\r
-    <modelVersion>4.0.0</modelVersion>\r
-    <parent>\r
-        <groupId>org.onap.dmaap.datarouter</groupId>\r
-        <artifactId>parent</artifactId>\r
-        <version>2.1.0-SNAPSHOT</version>\r
-        <relativePath>../pom.xml</relativePath>\r
-    </parent>\r
-    <artifactId>datarouter-prov</artifactId>\r
-    <packaging>jar</packaging>\r
-    <name>datarouter-prov</name>\r
-    <url>https://github.com/att/DMAAP_DATAROUTER</url>\r
-    <properties>\r
-        <sonar.language>java</sonar.language>\r
-        <sonar.skip>false</sonar.skip>\r
-        <sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>\r
-        <sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath>\r
-\r
-        <docker.location>${basedir}/target/${artifactId}</docker.location>\r
-        <datarouter.prov.image.name>onap/dmaap/datarouter-prov</datarouter.prov.image.name>\r
-\r
-        <timestamp>${maven.build.timestamp}</timestamp>\r
-        <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>\r
-\r
-        <docker.verbose>true</docker.verbose>\r
-        <docker.apiVersion>1.23</docker.apiVersion>\r
-    </properties>\r
-    <dependencies>\r
-        <dependency>\r
-            <groupId>xml-apis</groupId>\r
-            <artifactId>xml-apis</artifactId>\r
-            <version>${xml-apis.version}</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.dom4j</groupId>\r
-            <artifactId>dom4j</artifactId>\r
-            <version>${dom4j.version}</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>commons-codec</groupId>\r
-            <artifactId>commons-codec</artifactId>\r
-            <version>${commons-codec.version}</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>com.google.guava</groupId>\r
-            <artifactId>guava</artifactId>\r
-            <version>${google.guava.version}</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>ch.qos.logback</groupId>\r
-            <artifactId>logback-classic</artifactId>\r
-            <version>${qos.logback.version}</version>\r
-            <scope>compile</scope>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>ch.qos.logback</groupId>\r
-            <artifactId>logback-core</artifactId>\r
-            <version>${qos.logback.version}</version>\r
-            <scope>compile</scope>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>com.thoughtworks.xstream</groupId>\r
-            <artifactId>xstream</artifactId>\r
-            <version>${thoughtworks.version}</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.json</groupId>\r
-            <artifactId>json</artifactId>\r
-            <version>20160810</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>javax.mail</groupId>\r
-            <artifactId>javax.mail-api</artifactId>\r
-            <version>${javax.mail-api.version}</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>com.att.eelf</groupId>\r
-            <artifactId>eelf-core</artifactId>\r
-            <version>0.0.1</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.eclipse.jetty</groupId>\r
-            <artifactId>jetty-server</artifactId>\r
-            <version>${jetty.version}</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.eclipse.jetty</groupId>\r
-            <artifactId>jetty-continuation</artifactId>\r
-            <version>${jetty.version}</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.eclipse.jetty</groupId>\r
-            <artifactId>jetty-util</artifactId>\r
-            <version>${jetty.version}</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.eclipse.jetty</groupId>\r
-            <artifactId>jetty-deploy</artifactId>\r
-            <version>${jetty.version}</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.eclipse.jetty</groupId>\r
-            <artifactId>jetty-servlet</artifactId>\r
-            <version>${jetty.version}</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.eclipse.jetty</groupId>\r
-            <artifactId>jetty-servlets</artifactId>\r
-            <version>${jetty.version}</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.eclipse.jetty</groupId>\r
-            <artifactId>jetty-http</artifactId>\r
-            <version>${jetty.version}</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.eclipse.jetty</groupId>\r
-            <artifactId>jetty-security</artifactId>\r
-            <version>${jetty.version}</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.eclipse.jetty</groupId>\r
-            <artifactId>jetty-websocket</artifactId>\r
-            <version>${jetty.websocket.version}</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.eclipse.jetty</groupId>\r
-            <artifactId>jetty-io</artifactId>\r
-            <version>${jetty.version}</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.apache.commons</groupId>\r
-            <artifactId>commons-io</artifactId>\r
-            <version>1.3.2</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>commons-lang</groupId>\r
-            <artifactId>commons-lang</artifactId>\r
-            <version>2.4</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>commons-io</groupId>\r
-            <artifactId>commons-io</artifactId>\r
-            <version>2.1</version>\r
-            <scope>compile</scope>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.apache.httpcomponents</groupId>\r
-            <artifactId>httpcore</artifactId>\r
-            <version>4.4</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.mozilla</groupId>\r
-            <artifactId>rhino</artifactId>\r
-            <version>1.7R3</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.apache.james</groupId>\r
-            <artifactId>apache-mime4j-core</artifactId>\r
-            <version>0.7</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.apache.httpcomponents</groupId>\r
-            <artifactId>httpclient</artifactId>\r
-            <version>4.5.3</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.sonatype.http-testing-harness</groupId>\r
-            <artifactId>junit-runner</artifactId>\r
-            <version>0.11</version>\r
-            <exclusions>\r
-                <exclusion>\r
-                    <groupId>org.databene</groupId>\r
-                    <artifactId>contiperf</artifactId>\r
-                </exclusion>\r
-            </exclusions>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>junit</groupId>\r
-            <artifactId>junit</artifactId>\r
-            <version>4.10</version>\r
-            <scope>test</scope>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.mockito</groupId>\r
-            <artifactId>mockito-core</artifactId>\r
-            <version>1.10.19</version>\r
-            <scope>test</scope>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.powermock</groupId>\r
-            <artifactId>powermock-module-junit4</artifactId>\r
-            <version>1.6.4</version>\r
-            <scope>test</scope>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.powermock</groupId>\r
-            <artifactId>powermock-api-mockito</artifactId>\r
-            <version>1.6.4</version>\r
-            <scope>test</scope>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.apache.commons</groupId>\r
-            <artifactId>commons-lang3</artifactId>\r
-            <version>3.0</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.mariadb.jdbc</groupId>\r
-            <artifactId>mariadb-java-client</artifactId>\r
-            <version>2.2.5</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.eclipse.jetty.cdi</groupId>\r
-            <artifactId>cdi-websocket</artifactId>\r
-            <version>${jetty.version}</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>com.h2database</groupId>\r
-            <artifactId>h2</artifactId>\r
-            <version>1.4.197</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.hibernate</groupId>\r
-            <artifactId>hibernate-entitymanager</artifactId>\r
-            <version>5.2.9.Final</version>\r
-            <exclusions>\r
-                <exclusion>\r
-                    <groupId>dom4j</groupId>\r
-                    <artifactId>dom4j</artifactId>\r
-                </exclusion>\r
-            </exclusions>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.onap.aaf.authz</groupId>\r
-            <artifactId>aaf-cadi-aaf</artifactId>\r
-            <version>${aaf-cadi-aaf.version}</version>\r
-        </dependency>\r
-    </dependencies>\r
-    <profiles>\r
-        <profile>\r
-            <id>docker</id>\r
-            <properties>\r
-                <skipDockerBuild>false</skipDockerBuild>\r
-                <skipDockerTag>false</skipDockerTag>\r
-                <skipTests>true</skipTests>\r
-            </properties>\r
-            <build>\r
-                <plugins>\r
-\r
-                    <!-- Setup image tags per https://wiki.onap.org/display/DW/Independent+Versioning+and+Release+Process#IndependentVersioningandReleaseProcess-StandardizedDockerTagging -->\r
-                    <plugin>\r
-                      <groupId>org.codehaus.groovy.maven</groupId>\r
-                      <artifactId>gmaven-plugin</artifactId>\r
-                      <executions>\r
-                          <execution>\r
-                              <phase>validate</phase>\r
-                              <goals>\r
-                                  <goal>execute</goal>\r
-                              </goals>\r
-                              <configuration>\r
-                                  <properties>\r
-                                      <ver>${project.version}</ver>\r
-                                      <timestamp>${maven.build.timestamp}</timestamp>\r
-                                  </properties>\r
-                                  <source>\r
-                                      println 'ver: ' + project.properties['ver'];\r
-                                      if ( project.properties['ver'].endsWith("-SNAPSHOT") ) {\r
-                                          project.properties['dockertag1']=project.properties['ver'] + "-latest";\r
-                                          project.properties['dockertag2']=project.properties['ver'] + "-" + project.properties['timestamp'];\r
-                                      } else {\r
-                                          project.properties['dockertag1']=project.properties['ver'] + "-STAGING-latest";\r
-                                          project.properties['dockertag2']=project.properties['ver'] + "-STAGING-" + project.properties['timestamp'];\r
-                                      }\r
-                                      println 'docker tag 1: ' + project.properties['dockertag1'];\r
-                                      println 'docker tag 2: ' + project.properties['dockertag2'];\r
-                                  </source>\r
-                              </configuration>\r
-                          </execution>\r
-                      </executions>\r
-                    </plugin>\r
-                    <plugin>\r
-                        <groupId>io.fabric8</groupId>\r
-                        <artifactId>docker-maven-plugin</artifactId>\r
-                        <version>0.28.0</version>\r
-                        <configuration>\r
-                            <verbose>${docker.verbose}</verbose>\r
-                            <apiVersion>${docker.apiVersion}</apiVersion>\r
-                            <pullRegistry>${docker.pull.registry}</pullRegistry>\r
-                            <pushRegistry>${docker.push.registry}</pushRegistry>\r
-                            <images>\r
-                                <image>\r
-                                    <name>${datarouter.prov.image.name}</name>\r
-                                    <build>\r
-                                        <cleanup>try</cleanup>\r
-                                        <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>\r
-                                        <dockerFile>Dockerfile</dockerFile>\r
-                                        <tags>\r
-                                            <tag>${dockertag1}</tag>\r
-                                            <tag>${dockertag2}</tag>\r
-                                        </tags>\r
-                                    </build>\r
-                                </image>\r
-                            </images>\r
-                        </configuration>\r
-                         <executions>\r
-                             <execution>\r
-                                 <id>generate-images</id>\r
-                                 <phase>install</phase>\r
-                                 <goals>\r
-                                     <goal>build</goal>\r
-                                 </goals>\r
-                             </execution>\r
-                             <execution>\r
-                                 <id>push-images</id>\r
-                                 <phase>deploy</phase>\r
-                                 <goals>\r
-                                     <goal>push</goal>\r
-                                 </goals>\r
-                             </execution>\r
-                         </executions>\r
-                    </plugin>\r
-                </plugins>\r
-            </build>\r
-        </profile>\r
-    </profiles>\r
-    <build>\r
-        <finalName>datarouter-prov</finalName>\r
-        <resources>\r
-            <resource>\r
-                <directory>src/main/resources</directory>\r
-                <filtering>true</filtering>\r
-                <includes>\r
-                    <include>**/*.properties</include>\r
-                </includes>\r
-            </resource>\r
-            <resource>\r
-                <directory>src/main/resources</directory>\r
-                <filtering>true</filtering>\r
-                <includes>\r
-                    <include>**/provserver.properties</include>\r
-                </includes>\r
-            </resource>\r
-            <resource>\r
-                <directory>src/main/resources</directory>\r
-                <filtering>true</filtering>\r
-                <includes>\r
-                    <include>**/EelfMessages.properties</include>\r
-                </includes>\r
-            </resource>\r
-        </resources>\r
-        <plugins>\r
-            <plugin>\r
-                <artifactId>maven-assembly-plugin</artifactId>\r
-                <version>2.4</version>\r
-                <configuration>\r
-                    <descriptorRefs>\r
-                        <descriptorRef>jar-with-dependencies</descriptorRef>\r
-                    </descriptorRefs>\r
-                    <outputDirectory>${basedir}/target/docker-stage/opt/app/datartr/lib</outputDirectory>\r
-                    <archive>\r
-                        <manifest>\r
-                            <addClasspath>true</addClasspath>\r
-                            <mainClass>org.onap.dmaap.datarouter.provisioning.Main</mainClass>\r
-                        </manifest>\r
-                    </archive>\r
-                </configuration>\r
-                <executions>\r
-                    <execution>\r
-                        <id>make-assembly</id>\r
-                        <!-- this is used for inheritance merges -->\r
-                        <phase>package</phase>\r
-                        <!-- bind to the packaging phase -->\r
-                        <goals>\r
-                            <goal>single</goal>\r
-                        </goals>\r
-                    </execution>\r
-                </executions>\r
-            </plugin>\r
-            <plugin>\r
-                <groupId>org.apache.maven.plugins</groupId>\r
-                <artifactId>maven-compiler-plugin</artifactId>\r
-                <configuration>\r
-                    <source>1.8</source>\r
-                    <target>1.8</target>\r
-                </configuration>\r
-                <version>3.6.0</version>\r
-            </plugin>\r
-\r
-            <!-- Copy files to docker-stage to be included in image -->\r
-            <plugin>\r
-                <artifactId>maven-resources-plugin</artifactId>\r
-                <version>2.7</version>\r
-                <executions>\r
-                    <execution>\r
-                        <id>copy-dockerfile</id>\r
-                        <phase>validate</phase>\r
-                        <goals>\r
-                            <goal>copy-resources</goal>\r
-                        </goals>\r
-                        <configuration>\r
-                            <outputDirectory>${basedir}/target/docker-stage</outputDirectory>\r
-                            <overwrite>true</overwrite>\r
-                            <resources>\r
-                                <resource>\r
-                                    <directory>${basedir}/src/main/resources/docker</directory>\r
-                                    <filtering>true</filtering>\r
-                                    <includes>\r
-                                        <include>Dockerfile</include>\r
-                                    </includes>\r
-                                </resource>\r
-                            </resources>\r
-                        </configuration>\r
-                    </execution>\r
-                    <execution>\r
-                        <id>copy-startup-script</id>\r
-                        <phase>validate</phase>\r
-                        <goals>\r
-                            <goal>copy-resources</goal>\r
-                        </goals>\r
-                        <configuration>\r
-                            <outputDirectory>${basedir}/target/docker-stage/opt</outputDirectory>\r
-                            <overwrite>true</overwrite>\r
-                            <resources>\r
-                                <resource>\r
-                                    <directory>${basedir}/src/main/resources/docker</directory>\r
-                                    <filtering>true</filtering>\r
-                                    <includes>\r
-                                        <include>startup.sh</include>\r
-                                    </includes>\r
-                                </resource>\r
-                            </resources>\r
-                        </configuration>\r
-                    </execution>\r
-                    <execution>\r
-                        <id>copy-resources-2</id>\r
-                        <phase>validate</phase>\r
-                        <goals>\r
-                            <goal>copy-resources</goal>\r
-                        </goals>\r
-                        <configuration>\r
-                            <outputDirectory>${basedir}/target/docker-stage/opt/app/datartr/etc</outputDirectory>\r
-                            <resources>\r
-                                <resource>\r
-                                    <directory>${basedir}/src/main/resources</directory>\r
-                                    <includes>\r
-                                        <include>misc/**</include>\r
-                                        <include>**/**</include>\r
-                                    </includes>\r
-                                </resource>\r
-                            </resources>\r
-                        </configuration>\r
-                    </execution>\r
-                    <execution>\r
-                        <id>copy-resources-3</id>\r
-                        <phase>validate</phase>\r
-                        <goals>\r
-                            <goal>copy-resources</goal>\r
-                        </goals>\r
-                        <configuration>\r
-                            <outputDirectory>${basedir}/target/docker-stage/opt/app/datartr</outputDirectory>\r
-                            <resources>\r
-                                <resource>\r
-                                    <directory>${basedir}/data</directory>\r
-                                    <includes>\r
-                                        <include>misc/**</include>\r
-                                        <include>**/**</include>\r
-                                    </includes>\r
-                                </resource>\r
-                            </resources>\r
-                        </configuration>\r
-                    </execution>\r
-                    <execution>\r
-                        <id>copy-resources-4</id>\r
-                        <phase>validate</phase>\r
-                        <goals>\r
-                            <goal>copy-resources</goal>\r
-                        </goals>\r
-                        <configuration>\r
-                            <outputDirectory>${basedir}/target/docker-stage/opt/app/datartr/aaf_certs</outputDirectory>\r
-                            <resources>\r
-                                <resource>\r
-                                    <directory>${basedir}/aaf_certs</directory>\r
-                                    <includes>\r
-                                        <include>misc/**</include>\r
-                                        <include>**/**</include>\r
-                                    </includes>\r
-                                </resource>\r
-                            </resources>\r
-                        </configuration>\r
-                    </execution>\r
-                </executions>\r
-            </plugin>\r
-            <plugin>\r
-                <groupId>org.apache.maven.plugins</groupId>\r
-                <artifactId>maven-dependency-plugin</artifactId>\r
-                <version>2.10</version>\r
-                <executions>\r
-                    <execution>\r
-                        <id>copy-dependencies</id>\r
-                        <phase>package</phase>\r
-                        <goals>\r
-                            <goal>copy-dependencies</goal>\r
-                        </goals>\r
-                        <configuration>\r
-                            <outputDirectory>${basedir}/target/docker-stage/opt/app/datartr/aaf_certs</outputDirectory>\r
-                            <overWriteReleases>false</overWriteReleases>\r
-                            <overWriteSnapshots>false</overWriteSnapshots>\r
-                            <overWriteIfNewer>true</overWriteIfNewer>\r
-                        </configuration>\r
-                    </execution>\r
-                </executions>\r
-            </plugin>\r
-            <plugin>\r
-                <groupId>org.apache.maven.plugins</groupId>\r
-                <artifactId>maven-javadoc-plugin</artifactId>\r
-                <configuration>\r
-                    <failOnError>false</failOnError>\r
-                </configuration>\r
-                <executions>\r
-                    <execution>\r
-                        <id>attach-javadocs</id>\r
-                        <goals>\r
-                            <goal>jar</goal>\r
-                        </goals>\r
-                    </execution>\r
-                </executions>\r
-            </plugin>\r
-            <plugin>\r
-                <groupId>org.apache.maven.plugins</groupId>\r
-                <artifactId>maven-source-plugin</artifactId>\r
-                <version>2.2.1</version>\r
-                <executions>\r
-                    <execution>\r
-                        <id>attach-sources</id>\r
-                        <goals>\r
-                            <goal>jar-no-fork</goal>\r
-                        </goals>\r
-                    </execution>\r
-                </executions>\r
-            </plugin>\r
-            <plugin>\r
-                <groupId>org.codehaus.mojo</groupId>\r
-                <artifactId>cobertura-maven-plugin</artifactId>\r
-                <version>2.7</version>\r
-                <configuration>\r
-                    <formats>\r
-                        <format>html</format>\r
-                        <format>xml</format>\r
-                    </formats>\r
-                    <check/>\r
-                </configuration>\r
-            </plugin>\r
-            <plugin>\r
-                <groupId>org.sonatype.plugins</groupId>\r
-                <artifactId>nexus-staging-maven-plugin</artifactId>\r
-                <version>1.6.7</version>\r
-                <extensions>true</extensions>\r
-                <configuration>\r
-                    <nexusUrl>${onap.nexus.url}</nexusUrl>\r
-                    <stagingProfileId>176c31dfe190a</stagingProfileId>\r
-                    <serverId>ecomp-staging</serverId>\r
-                </configuration>\r
-            </plugin>\r
-            <plugin>\r
-                <groupId>org.jacoco</groupId>\r
-                <artifactId>jacoco-maven-plugin</artifactId>\r
-                <version>${jacoco.version}</version>\r
-                <configuration>\r
-                    <excludes>\r
-                        <exclude>**/gen/**</exclude>\r
-                        <exclude>**/generated-sources/**</exclude>\r
-                        <exclude>**/yang-gen/**</exclude>\r
-                        <exclude>**/pax/**</exclude>\r
-                    </excludes>\r
-                </configuration>\r
-                <executions>\r
-                    <execution>\r
-                        <id>pre-unit-test</id>\r
-                        <goals>\r
-                            <goal>prepare-agent</goal>\r
-                        </goals>\r
-                        <configuration>\r
-                            <destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>\r
-                            <propertyName>surefireArgLine</propertyName>\r
-                        </configuration>\r
-                    </execution>\r
-                    <execution>\r
-                        <id>post-unit-test</id>\r
-                        <phase>test</phase>\r
-                        <goals>\r
-                            <goal>report</goal>\r
-                        </goals>\r
-                        <configuration>\r
-                            <dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>\r
-                            <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>\r
-                        </configuration>\r
-                    </execution>\r
-                    <execution>\r
-                        <id>pre-integration-test</id>\r
-                        <phase>pre-integration-test</phase>\r
-                        <goals>\r
-                            <goal>prepare-agent</goal>\r
-                        </goals>\r
-                        <configuration>\r
-                            <destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>\r
-                            <propertyName>failsafeArgLine</propertyName>\r
-                        </configuration>\r
-                    </execution>\r
-                    <execution>\r
-                        <id>post-integration-test</id>\r
-                        <phase>post-integration-test</phase>\r
-                        <goals>\r
-                            <goal>report</goal>\r
-                        </goals>\r
-                        <configuration>\r
-                            <dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>\r
-                            <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>\r
-                        </configuration>\r
-                    </execution>\r
-                </executions>\r
-            </plugin>\r
-        </plugins>\r
-    </build>\r
-</project>\r
+<!--
+  ============LICENSE_START==================================================
+  * org.onap.dmaap
+  * ===========================================================================
+  * Copyright Â© 2017 AT&T Intellectual Property. All rights reserved.
+  * Modifications Copyright (C) 2018 Nokia. 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/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.onap.dmaap.datarouter</groupId>
+        <artifactId>parent</artifactId>
+        <version>${revision}</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>datarouter-prov</artifactId>
+    <packaging>jar</packaging>
+    <url>https://docs.onap.org/en/latest/submodules/dmaap/datarouter.git/docs/index.html</url>
+    <properties>
+        <sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath>
+        <docker.location>${basedir}/target/${project.artifactId}</docker.location>
+        <datarouter.prov.image.name>${docker.image.root}${project.artifactId}</datarouter.prov.image.name>
+        <sonar.exclusions>**/src/main/java/org/onap/dmaap/datarouter/reports/**</sonar.exclusions>
+        <sonar.language>java</sonar.language>
+        <sonar.skip>false</sonar.skip>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-library</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.intellij</groupId>
+            <artifactId>annotations</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>javax.mail</groupId>
+            <artifactId>javax.mail-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.att.eelf</groupId>
+            <artifactId>eelf-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.aaf.authz</groupId>
+            <artifactId>aaf-cadi-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-server</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-continuation</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-util</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-servlet</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-http</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-io</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpcore</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.sonatype.http-testing-harness</groupId>
+            <artifactId>junit-runner</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-module-junit4</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-api-mockito</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-api-support</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.mariadb.jdbc</groupId>
+            <artifactId>mariadb-java-client</artifactId>
+            <version>2.2.5</version>
+        </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>1.4.197</version>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-entitymanager</artifactId>
+            <version>5.2.9.Final</version>
+        </dependency>
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-core</artifactId>
+            <version>1.3</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate.javax.persistence</groupId>
+            <artifactId>hibernate-jpa-2.1-api</artifactId>
+            <version>1.0.2.Final</version>
+        </dependency>
+    </dependencies>
+    <profiles>
+        <profile>
+            <id>docker</id>
+            <properties>
+                <skipTests>true</skipTests>
+            </properties>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.gmaven</groupId>
+                        <artifactId>gmaven-plugin</artifactId>
+                    </plugin>
+                    <plugin>
+                        <groupId>io.fabric8</groupId>
+                        <artifactId>docker-maven-plugin</artifactId>
+                        <configuration>
+                            <images>
+                                <image>
+                                    <name>${datarouter.prov.image.name}</name>
+                                    <build>
+                                        <cleanup>try</cleanup>
+                                        <dockerFileDir>${basedir}/target/docker-stage</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>
+    </profiles>
+    <build>
+        <finalName>datarouter-prov</finalName>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+                <includes>
+                    <include>**/*.properties</include>
+                </includes>
+            </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+                <includes>
+                    <include>**/provserver.properties</include>
+                </includes>
+            </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+                <includes>
+                    <include>**/EelfMessages.properties</include>
+                </includes>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>2.4</version>
+                <configuration>
+                    <descriptorRefs>
+                        <descriptorRef>jar-with-dependencies</descriptorRef>
+                    </descriptorRefs>
+                    <outputDirectory>${basedir}/target/docker-stage/opt/app/datartr/lib</outputDirectory>
+                    <archive>
+                        <manifest>
+                            <addClasspath>true</addClasspath>
+                            <mainClass>org.onap.dmaap.datarouter.provisioning.Main</mainClass>
+                        </manifest>
+                    </archive>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>make-assembly</id>
+                        <!-- this is used for inheritance merges -->
+                        <phase>package</phase>
+                        <!-- bind to the packaging phase -->
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+            </plugin>
+            <!-- Copy files to docker-stage to be included in image -->
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>2.7</version>
+                <executions>
+                    <execution>
+                        <id>copy-dockerfile</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${basedir}/target/docker-stage</outputDirectory>
+                            <overwrite>true</overwrite>
+                            <resources>
+                                <resource>
+                                    <directory>${basedir}/src/main/resources/docker</directory>
+                                    <filtering>true</filtering>
+                                    <includes>
+                                        <include>Dockerfile</include>
+                                    </includes>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>copy-startup-script</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${basedir}/target/docker-stage/opt</outputDirectory>
+                            <overwrite>true</overwrite>
+                            <resources>
+                                <resource>
+                                    <directory>${basedir}/src/main/resources/docker</directory>
+                                    <filtering>true</filtering>
+                                    <includes>
+                                        <include>startup.sh</include>
+                                    </includes>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>copy-resources-2</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${basedir}/target/docker-stage/opt/app/datartr/etc</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>${basedir}/src/main/resources</directory>
+                                    <includes>
+                                        <include>misc/**</include>
+                                        <include>**/**</include>
+                                    </includes>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>copy-resources-3</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${basedir}/target/docker-stage/opt/app/datartr</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>${basedir}/data</directory>
+                                    <includes>
+                                        <include>misc/**</include>
+                                        <include>**/**</include>
+                                    </includes>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>copy-resources-4</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${basedir}/target/docker-stage/opt/app/datartr/aaf_certs</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>${basedir}/aaf_certs</directory>
+                                    <includes>
+                                        <include>misc/**</include>
+                                        <include>**/**</include>
+                                    </includes>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-dependencies</id>
+                        <phase>package</phase>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/docker-stage/opt/app/datartr/lib</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>cobertura-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.sonatype.plugins</groupId>
+                <artifactId>nexus-staging-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>**/src/main/java/org/onap/dmaap/datarouter/reports/**</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>properties-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+</project>
index 96d55b7..6c577a3 100755 (executable)
     <parent>
         <groupId>org.onap.dmaap.datarouter</groupId>
         <artifactId>parent</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>${revision}</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>datarouter-subscriber</artifactId>
     <packaging>jar</packaging>
-    <name>datarouter-subscriber</name>
     <properties>
+        <sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath>
+        <docker.location>${basedir}/target/${project.artifactId}</docker.location>
+        <datarouter.sub.image.name>${docker.image.root}${project.artifactId}</datarouter.sub.image.name>
         <sonar.language>java</sonar.language>
         <sonar.skip>false</sonar.skip>
-        <sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
-        <sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath>
-
-        <docker.location>${basedir}/target/${artifactId}</docker.location>
-        <datarouter.prov.image.name>onap/dmaap/datarouter-subscriber</datarouter.prov.image.name>
-
-        <timestamp>${maven.build.timestamp}</timestamp>
-        <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
     </properties>
     <dependencies>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>${google.guava.version}</version>
-        </dependency>
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
-            <version>${commons-codec.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-server</artifactId>
-            <version>${jetty.version}</version>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-continuation</artifactId>
-            <version>${jetty.version}</version>
+            <artifactId>jetty-server</artifactId>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-util</artifactId>
-            <version>${jetty.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-deploy</artifactId>
-            <version>${jetty.version}</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-servlet</artifactId>
-            <version>${jetty.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-servlets</artifactId>
-            <version>${jetty.version}</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-http</artifactId>
-            <version>${jetty.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-security</artifactId>
-            <version>${jetty.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-websocket</artifactId>
-            <version>${jetty.websocket.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-io</artifactId>
-            <version>${jetty.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.thoughtworks.xstream</groupId>
-            <artifactId>xstream</artifactId>
-            <version>${thoughtworks.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <version>${qos.logback.version}</version>
-            <scope>compile</scope>
+            <groupId>org.sonatype.http-testing-harness</groupId>
+            <artifactId>junit-runner</artifactId>
         </dependency>
         <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-core</artifactId>
-            <version>${qos.logback.version}</version>
-            <scope>compile</scope>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-module-junit4</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-            <version>4.5.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.sonatype.http-testing-harness</groupId>
-            <artifactId>junit-runner</artifactId>
-            <version>0.11</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.databene</groupId>
-                    <artifactId>contiperf</artifactId>
-                </exclusion>
-            </exclusions>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.10</version>
-            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
         </dependency>
         <dependency>
             <groupId>log4j</groupId>
             <version>1.2.17</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>1.3.2</version>
-        </dependency>
     </dependencies>
     <profiles>
         <profile>
             <id>docker</id>
             <properties>
-                <skipDockerBuild>false</skipDockerBuild>
-                <skipDockerTag>false</skipDockerTag>
                 <skipTests>true</skipTests>
             </properties>
             <build>
                 <plugins>
-
-                    <!-- Setup image tags per https://wiki.onap.org/display/DW/Independent+Versioning+and+Release+Process#IndependentVersioningandReleaseProcess-StandardizedDockerTagging -->
                     <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 'ver: ' + 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>
+                        <groupId>org.codehaus.gmaven</groupId>
+                        <artifactId>gmaven-plugin</artifactId>
                     </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>${datarouter.prov.image.name}</name>
+                                    <name>${datarouter.sub.image.name}</name>
                                     <build>
                                         <cleanup>try</cleanup>
                                         <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
                                 </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>
+                        <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>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                </configuration>
-                <version>3.6.0</version>
             </plugin>
             <plugin>
                 <artifactId>maven-resources-plugin</artifactId>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
-                <version>2.10</version>
                 <executions>
                     <execution>
                         <id>copy-dependencies</id>
                         <phase>package</phase>
-                        <goals>
-                            <goal>copy-dependencies</goal>
-                        </goals>
                         <configuration>
-                            <outputDirectory>${project.build.directory}/opt/app/subscriber/lib</outputDirectory>
-                            <overWriteReleases>false</overWriteReleases>
-                            <overWriteSnapshots>false</overWriteSnapshots>
-                            <overWriteIfNewer>true</overWriteIfNewer>
+                            <outputDirectory>${project.build.directory}/docker-stage/opt/app/subscriber/lib</outputDirectory>
                         </configuration>
                     </execution>
                 </executions>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>2.2.1</version>
-                <executions>
-                    <execution>
-                        <id>attach-sources</id>
-                        <goals>
-                            <goal>jar-no-fork</goal>
-                        </goals>
-                    </execution>
-                </executions>
             </plugin>
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>${jacoco.version}</version>
-                <configuration>
-                    <excludes>
-                        <exclude>**/gen/**</exclude>
-                        <exclude>**/generated-sources/**</exclude>
-                        <exclude>**/yang-gen/**</exclude>
-                        <exclude>**/pax/**</exclude>
-                    </excludes>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>pre-unit-test</id>
-                        <goals>
-                            <goal>prepare-agent</goal>
-                        </goals>
-                        <configuration>
-                            <destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
-                            <propertyName>surefireArgLine</propertyName>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>post-unit-test</id>
-                        <phase>test</phase>
-                        <goals>
-                            <goal>report</goal>
-                        </goals>
-                        <configuration>
-                            <dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
-                            <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>pre-integration-test</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>prepare-agent</goal>
-                        </goals>
-                        <configuration>
-                            <destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
-                            <propertyName>failsafeArgLine</propertyName>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>post-integration-test</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>report</goal>
-                        </goals>
-                        <configuration>
-                            <dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
-                            <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>properties-maven-plugin</artifactId>
             </plugin>
         </plugins>
     </build>
diff --git a/pom.xml b/pom.xml
index 4f52e1c..1e239cd 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
     <groupId>org.onap.dmaap.datarouter</groupId>
     <artifactId>parent</artifactId>
     <name>dmaap-datarouter</name>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>${revision}</version>
     <packaging>pom</packaging>
-    <url>https://github.com/att/DMAAP_DATAROUTER</url>
+    <url>https://docs.onap.org/en/latest/submodules/dmaap/datarouter.git/docs/index.html</url>
     <parent>
         <groupId>org.onap.oparent</groupId>
         <artifactId>oparent</artifactId>
         <version>1.2.3</version>
     </parent>
     <properties>
-        <datarouter.version>2.0.2-SNAPSHOT</datarouter.version>
+        <!--revision can be set in the version.properties file at project root and is loaded by all sub modules-->
+        <revision>${snapshot_version}</revision>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
+
+        <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
+        <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
+        <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
+        <sitePath>/content/sites/site/org/onap/dmaap/datarouter/${project.artifactId}/${project.version}</sitePath>
+
         <sonar.language>java</sonar.language>
         <sonar.skip>false</sonar.skip>
         <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
         <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
         <sonar.jacoco.reportPaths>${project.build.directory}/coverage-reports/jacoco.exec</sonar.jacoco.reportPaths>
         <sonar.jacoco.itReportPath>${project.build.directory}/coverage-reports/jacoco-it.exec</sonar.jacoco.itReportPath>
-        <sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
         <sonar.projectVersion>${project.version}</sonar.projectVersion>
+
+        <docker.skip.build>false</docker.skip.build>
+        <docker.verbose>true</docker.verbose>
+        <docker.image.root>onap/dmaap/</docker.image.root>
+        <timestamp>${maven.build.timestamp}</timestamp>
+        <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
+
+        <!--dependency version across all modules-->
         <jetty.version>9.4.14.v20181114</jetty.version>
-        <jetty.websocket.version>8.2.0.v20160908</jetty.websocket.version>
         <javax.mail-api.version>1.5.5</javax.mail-api.version>
-        <dom4j.version>2.1.1</dom4j.version>
-        <xml-apis.version>1.4.01</xml-apis.version>
-        <thoughtworks.version>1.4.10</thoughtworks.version>
-        <google.guava.version>26.0-jre</google.guava.version>
+        <javax.servlet-api.version>4.0.1</javax.servlet-api.version>
         <qos.logback.version>1.2.3</qos.logback.version>
         <aaf-cadi-aaf.version>2.1.10</aaf-cadi-aaf.version>
-        <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
-        <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
-        <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
-        <sitePath>/content/sites/site/org/onap/dmaap/datarouter/${project.artifactId}/${project.version}</sitePath>
-        <skip.docker.build>true</skip.docker.build>
-        <skip.docker.tag>true</skip.docker.tag>
-        <skip.docker.push>true</skip.docker.push>
         <commons-codec.version>1.10</commons-codec.version>
-        <sonar.exclusions>**/src/main/java/org/onap/dmaap/datarouter/reports/**</sonar.exclusions>
+        <gmaven-plugin.version>1.5</gmaven-plugin.version>
+        <io.fabric8.version>0.28.0</io.fabric8.version>
+        <docker.apiVersion>1.23</docker.apiVersion>
+        <commons-lang.version>2.4</commons-lang.version>
+        <commons-io.version>2.6</commons-io.version>
+        <httpcore.version>4.4</httpcore.version>
+        <httpclient.version>4.5.3</httpclient.version>
+        <junit-runner.version>0.11</junit-runner.version>
+        <junit.version>4.12</junit.version>
+        <mockito-core.version>1.10.19</mockito-core.version>
+        <powermock.version>1.7.4</powermock.version>
+        <powermock-api-mockito.version>1.7.4</powermock-api-mockito.version>
+        <commons-lang3.version>3.0</commons-lang3.version>
+        <eelf-core.version>1.0.0</eelf-core.version>
+        <json.version>20160810</json.version>
+        <sl4j-api.version>1.7.25</sl4j-api.version>
+        <hamcrest-lib.version>1.3</hamcrest-lib.version>
+        <annotations.version>12.0</annotations.version>
+
     </properties>
     <modules>
         <module>datarouter-prov</module>
         <module>datarouter-subscriber</module>
         <module>datarouter-docker-compose</module>
     </modules>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.hamcrest</groupId>
+                <artifactId>hamcrest-library</artifactId>
+                <version>${hamcrest-lib.version}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-api</artifactId>
+                <version>${sl4j-api.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-codec</groupId>
+                <artifactId>commons-codec</artifactId>
+                <version>${commons-codec.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>ch.qos.logback</groupId>
+                <artifactId>logback-classic</artifactId>
+                <version>${qos.logback.version}</version>
+                <scope>compile</scope>
+            </dependency>
+            <dependency>
+                <groupId>ch.qos.logback</groupId>
+                <artifactId>logback-core</artifactId>
+                <version>${qos.logback.version}</version>
+                <scope>compile</scope>
+            </dependency>
+            <dependency>
+                <groupId>com.intellij</groupId>
+                <artifactId>annotations</artifactId>
+                <version>${annotations.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>javax.servlet</groupId>
+                <artifactId>javax.servlet-api</artifactId>
+                <version>${javax.servlet-api.version}</version>
+                <scope>compile</scope>
+            </dependency>
+            <dependency>
+                <groupId>javax.mail</groupId>
+                <artifactId>javax.mail-api</artifactId>
+                <version>${javax.mail-api.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-server</artifactId>
+                <version>${jetty.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-continuation</artifactId>
+                <version>${jetty.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-util</artifactId>
+                <version>${jetty.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-servlet</artifactId>
+                <version>${jetty.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-http</artifactId>
+                <version>${jetty.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-io</artifactId>
+                <version>${jetty.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.jetty.cdi</groupId>
+                <artifactId>cdi-websocket</artifactId>
+                <version>${jetty.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.onap.aaf.authz</groupId>
+                <artifactId>aaf-cadi-core</artifactId>
+                <version>${aaf-cadi-aaf.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-io</groupId>
+                <artifactId>commons-io</artifactId>
+                <version>${commons-io.version}</version>
+                <scope>compile</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.httpcomponents</groupId>
+                <artifactId>httpcore</artifactId>
+                <version>${httpcore.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.httpcomponents</groupId>
+                <artifactId>httpclient</artifactId>
+                <version>${httpclient.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.sonatype.http-testing-harness</groupId>
+                <artifactId>junit-runner</artifactId>
+                <version>${junit-runner.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.databene</groupId>
+                        <artifactId>contiperf</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>${junit.version}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.mockito</groupId>
+                <artifactId>mockito-core</artifactId>
+                <version>${mockito-core.version}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.powermock</groupId>
+                <artifactId>powermock-api-mockito</artifactId>
+                <version>${powermock-api-mockito.version}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.powermock</groupId>
+                <artifactId>powermock-module-junit4</artifactId>
+                <version>${powermock.version}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.powermock</groupId>
+                <artifactId>powermock-api-support</artifactId>
+                <version>${powermock.version}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.powermock</groupId>
+                <artifactId>powermock-core</artifactId>
+                <version>${powermock.version}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-lang3</artifactId>
+                <version>${commons-lang3.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.att.eelf</groupId>
+                <artifactId>eelf-core</artifactId>
+                <version>${eelf-core.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.json</groupId>
+                <artifactId>json</artifactId>
+                <version>${json.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
     <build>
         <plugins>
-            <plugin>
-                <groupId>io.fabric8</groupId>
-                <artifactId>docker-maven-plugin</artifactId>
-                <version>0.28.0</version>
-                <configuration>
-                    <skipDockerBuild>true</skipDockerBuild>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.sonatype.plugins</groupId>
                 <artifactId>nexus-staging-maven-plugin</artifactId>
-                <version>1.6.7</version>
-                <extensions>true</extensions>
-                <configuration>
-                    <nexusUrl>${onap.nexus.url}</nexusUrl>
-                    <stagingProfileId>176c31dfe190a</stagingProfileId>
-                    <serverId>ecomp-staging</serverId>
-                </configuration>
             </plugin>
             <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-                <version>${jacoco.version}</version>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
                     <excludes>
-                        <exclude>**/gen/**</exclude>
-                        <exclude>**/generated-sources/**</exclude>
-                        <exclude>**/yang-gen/**</exclude>
-                        <exclude>**/pax/**</exclude>
-                        <exclude>**/src/main/java/org/onap/dmaap/datarouter/reports/**</exclude>
+                        <exclude>IntegrationSuite.java</exclude>
                     </excludes>
                 </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>flatten-maven-plugin</artifactId>
+                <version>1.0.1</version>
+                <configuration>
+                    <updatePomFile>true</updatePomFile>
+                    <outputDirectory>target</outputDirectory>
+                </configuration>
                 <executions>
                     <execution>
-                        <id>pre-unit-test</id>
-                        <goals>
-                            <goal>prepare-agent</goal>
-                        </goals>
-                        <configuration>
-                            <destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
-                            <propertyName>surefireArgLine</propertyName>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>post-unit-test</id>
-                        <phase>test</phase>
+                        <id>flatten</id>
+                        <phase>process-resources</phase>
                         <goals>
-                            <goal>report</goal>
+                            <goal>flatten</goal>
                         </goals>
-                        <configuration>
-                            <dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
-                            <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>pre-integration-test</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>prepare-agent</goal>
-                        </goals>
-                        <configuration>
-                            <destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
-                            <propertyName>failsafeArgLine</propertyName>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>post-integration-test</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>report</goal>
-                        </goals>
-                        <configuration>
-                            <dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
-                            <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <excludes>
-                        <exclude>IntegrationSuite.java</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
             <plugin>
                 <artifactId>maven-checkstyle-plugin</artifactId>
                 <executions>
                 </executions>
             </plugin>
         </plugins>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>3.6.0</version>
+                    <configuration>
+                        <source>1.8</source>
+                        <target>1.8</target>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-dependency-plugin</artifactId>
+                    <version>2.10</version>
+                    <executions>
+                        <execution>
+                            <id>copy-dependencies</id>
+                            <goals>
+                                <goal>copy-dependencies</goal>
+                            </goals>
+                            <configuration>
+                                <overWriteReleases>false</overWriteReleases>
+                                <overWriteSnapshots>false</overWriteSnapshots>
+                                <overWriteIfNewer>true</overWriteIfNewer>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <version>3.0.1</version>
+                    <configuration>
+                        <failOnError>false</failOnError>
+                    </configuration>
+                    <executions>
+                        <execution>
+                            <id>attach-javadocs</id>
+                            <goals>
+                                <goal>jar</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-source-plugin</artifactId>
+                    <version>2.2.1</version>
+                    <executions>
+                        <execution>
+                            <id>attach-sources</id>
+                            <goals>
+                                <goal>jar-no-fork</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>cobertura-maven-plugin</artifactId>
+                    <version>2.7</version>
+                    <configuration>
+                        <formats>
+                            <format>html</format>
+                            <format>xml</format>
+                        </formats>
+                        <check/>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.codehaus.gmaven</groupId>
+                    <artifactId>gmaven-plugin</artifactId>
+                    <version>${gmaven-plugin.version}</version>
+                    <executions>
+                        <execution>
+                            <phase>validate</phase>
+                            <goals>
+                                <goal>execute</goal>
+                            </goals>
+                            <configuration>
+                                <properties>
+                                    <ver>${project.version}</ver>
+                                </properties>
+                                <!-- Setup image tags per https://wiki.onap.org/display/DW/Independent+Versioning+and+Release+Process#IndependentVersioningandReleaseProcess-StandardizedDockerTagging -->
+                                <source>
+                                    println 'ver: ' + 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>${io.fabric8.version}</version>
+                    <configuration>
+                        <skipBuild>${docker.skip.build}</skipBuild>
+                        <verbose>${docker.verbose}</verbose>
+                        <apiVersion>${docker.apiVersion}</apiVersion>
+                        <pullRegistry>${docker.pull.registry}</pullRegistry>
+                        <pushRegistry>${docker.push.registry}</pushRegistry>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>properties-maven-plugin</artifactId>
+                    <version>1.0.0</version>
+                    <executions>
+                        <execution>
+                            <phase>validate</phase>
+                            <goals>
+                                <goal>read-project-properties</goal>
+                            </goals>
+                            <configuration>
+                                <files>
+                                    <file>../version.properties</file>
+                                </files>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
+            </plugins>
+        </pluginManagement>
     </build>
     <distributionManagement>
         <repository>