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

diff --git a/datarouter-node/pom.xml b/datarouter-node/pom.xml
index 27d21c0..52afa66 100755 (executable)
--- a/datarouter-node/pom.xml
+++ b/datarouter-node/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.onap.dmaap.datarouter</groupId>
         <artifactId>parent</artifactId>
-        <version>1.0.3-SNAPSHOT</version>
+        <version>1.0.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>datarouter-node</artifactId>
@@ -192,12 +192,6 @@
             <version>1.2.17</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.10</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>

diff --git a/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeServlet.java b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeServlet.java
index 2651335..a223b98 100644 (file)
--- a/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeServlet.java
+++ b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeServlet.java
@@ -282,8 +282,9 @@ public class NodeServlet extends HttpServlet {
         File data = new File(fbase);
         File meta = new File(fbase + ".M");
         OutputStream dos = null;
+        Writer mw = null;
         InputStream is = null;
-        try (Writer mw = new FileWriter(meta)) {
+        try {
             StringBuffer mx = new StringBuffer();
             mx.append(req.getMethod()).append('\t').append(fileid).append('\n');
             Enumeration hnames = req.getHeaderNames();
@@ -357,10 +358,12 @@ public class NodeServlet extends HttpServlet {
                 }
                 String dbase = di.getSpool() + "/" + pubid;
                 Files.createLink(Paths.get(dbase), dpath);
+                mw = new FileWriter(meta);
                 mw.write(metadata);
                 if (di.getSubId() == null) {
                     mw.write("X-ATT-DR-ROUTING\t" + t.getRouting() + "\n");
                 }
+                mw.close();
                 meta.renameTo(new File(dbase + ".M"));
             }
             resp.setStatus(HttpServletResponse.SC_NO_CONTENT);
@@ -385,6 +388,12 @@ public class NodeServlet extends HttpServlet {
                 } catch (Exception e) {
                 }
             }
+            if (mw != null) {
+                try {
+                    mw.close();
+                } catch (Exception e) {
+                }
+            }
             try {
                 data.delete();
             } catch (Exception e) {

diff --git a/datarouter-prov/pom.xml b/datarouter-prov/pom.xml
index 8f772e7..75dbb71 100755 (executable)
--- a/datarouter-prov/pom.xml
+++ b/datarouter-prov/pom.xml
@@ -26,7 +26,7 @@
     <parent>\r
         <groupId>org.onap.dmaap.datarouter</groupId>\r
         <artifactId>parent</artifactId>\r
-        <version>1.0.3-SNAPSHOT</version>\r
+        <version>1.0.4-SNAPSHOT</version>\r
         <relativePath>../pom.xml</relativePath>\r
     </parent>\r
     <artifactId>datarouter-prov</artifactId>\r
@@ -246,6 +246,12 @@
             <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
     </dependencies>\r
     <profiles>\r

diff --git a/datarouter-prov/src/test/java/datarouter/provisioning/AllTests.java b/datarouter-prov/src/test/java/datarouter/provisioning/IntegrationSuite.java
similarity index 98%
rename from datarouter-prov/src/test/java/datarouter/provisioning/AllTests.java
rename to datarouter-prov/src/test/java/datarouter/provisioning/IntegrationSuite.java
index 33a34c0..4d23857 100644 (file)
--- a/datarouter-prov/src/test/java/datarouter/provisioning/AllTests.java
+++ b/datarouter-prov/src/test/java/datarouter/provisioning/IntegrationSuite.java
@@ -45,6 +45,6 @@ import org.junit.runners.Suite.SuiteClasses;
     IntegrationTestRleBitSet.class
 })
 
-public class AllTests {
+public class IntegrationSuite {
 
 }

diff --git a/datarouter-subscriber/pom.xml b/datarouter-subscriber/pom.xml
index 615dbb4..ee28395 100755 (executable)
--- a/datarouter-subscriber/pom.xml
+++ b/datarouter-subscriber/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.onap.dmaap.datarouter</groupId>
         <artifactId>parent</artifactId>
-        <version>1.0.3-SNAPSHOT</version>
+        <version>1.0.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>datarouter-subscriber</artifactId>

diff --git a/pom.xml b/pom.xml
index 1292bfc..a615605 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -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>
@@ -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>

diff --git a/version.properties b/version.properties
index 688e881..05d01ad 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -27,7 +27,7 @@
 \r
 major=1\r
 minor=0\r
-patch=3\r
+patch=4\r
 \r
 base_version=${major}.${minor}.${patch}\r
 \r