diff options
| -rwxr-xr-x | datarouter-node/pom.xml | 8 | ||||
| -rw-r--r-- | datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeServlet.java | 11 | ||||
| -rwxr-xr-x | datarouter-prov/pom.xml | 8 | ||||
| -rw-r--r-- | datarouter-prov/src/test/java/datarouter/provisioning/IntegrationSuite.java (renamed from datarouter-prov/src/test/java/datarouter/provisioning/AllTests.java) | 2 | ||||
| -rwxr-xr-x | datarouter-subscriber/pom.xml | 2 | ||||
| -rwxr-xr-x | pom.xml | 13 | ||||
| -rw-r--r-- | version.properties | 2 |
7 files changed, 32 insertions, 14 deletions
diff --git a/datarouter-node/pom.xml b/datarouter-node/pom.xml index 27d21c05..52afa663 100755 --- 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> @@ -193,12 +193,6 @@ <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> <version>1.10.19</version> 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 26513358..a223b98c 100644 --- 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 8f772e7f..75dbb718 100755 --- a/datarouter-prov/pom.xml +++ b/datarouter-prov/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-prov</artifactId>
@@ -246,6 +246,12 @@ <groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
<version>5.2.9.Final</version>
+ <exclusions>
+ <exclusion>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
<profiles>
diff --git a/datarouter-prov/src/test/java/datarouter/provisioning/AllTests.java b/datarouter-prov/src/test/java/datarouter/provisioning/IntegrationSuite.java index 33a34c07..4d23857b 100644 --- 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 615dbb41..ee28395c 100755 --- 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> @@ -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 688e881b..05d01ad2 100644 --- a/version.properties +++ b/version.properties @@ -27,7 +27,7 @@ major=1
minor=0
-patch=3
+patch=4
base_version=${major}.${minor}.${patch}
|