Merge "Create ZIP with Dmaap DR docker-compose stuff"

diff --combined pom.xml
index 84dbfa1,1292bfc..a615605
--- 1/pom.xml
--- 2/pom.xml
+++ b/pom.xml
@@@ -26,13 -26,13 +26,13 @@@
      <groupId>org.onap.dmaap.datarouter</groupId>
      <artifactId>parent</artifactId>
      <name>dmaap-datarouter</name>
 -    <version>1.0.3-SNAPSHOT</version>
 +    <version>1.0.4-SNAPSHOT</version>
      <packaging>pom</packaging>
      <url>https://github.com/att/DMAAP_DATAROUTER</url>
      <parent>
          <groupId>org.onap.oparent</groupId>
          <artifactId>oparent</artifactId>
 -        <version>1.1.0</version>
 +        <version>1.2.1</version>
      </parent>
      <properties>
          <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@@ -68,6 -68,7 +68,7 @@@
          <module>datarouter-prov</module>
          <module>datarouter-node</module>
          <module>datarouter-subscriber</module>
+         <module>datarouter-docker-compose</module>
      </modules>
      <build>
          <plugins>
@@@ -148,15 -149,6 +149,15 @@@
                      </execution>
                  </executions>
              </plugin>
 +            <plugin>
 +                <groupId>org.apache.maven.plugins</groupId>
 +                <artifactId>maven-surefire-plugin</artifactId>
 +                <configuration>
 +                    <excludes>
 +                        <exclude>IntegrationSuite.java</exclude>
 +                    </excludes>
 +                </configuration>
 +            </plugin>
          </plugins>
      </build>
      <distributionManagement>