Update compatibility with HB2B 5.1.x

Author: sfieten

CHANGELOG.MD

@@ -2,6 +2,11 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 2.0.0
+###### 
+### Changed
+* Compatibility with Holodeck B2B 5.1.x
+
 ## 1.1.0
 ###### 2020-09-03
 ### Changed

README.md

@@ -12,7 +12,7 @@ Issue tracker https://github.com/holodeck-b2b/pullrequest-trigger/issues
 
 ## Installation
 ### Prerequisites
-This extension can be used with Holodeck B2B version 5.0.0 and later.
+This extension can be used with Holodeck B2B version 5.1.0 and later.
 
 ### Configuration
 To enable the trigger mechanism a _worker_ that will watch for _trigger documents_ has to be added to the

pom.xml

@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.holodeckb2b.extensions</groupId>
 	<artifactId>pullrequest-trigger</artifactId>
-	<version>1.1.0</version>
+	<version>2.0.0</version>
 	<packaging>jar</packaging>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -53,7 +53,7 @@
 		<dependency>
 			<groupId>org.holodeckb2b</groupId>
 			<artifactId>holodeckb2b-core</artifactId>
-			<version>5.0.0</version>
+			<version>5.1.0</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>

src/main/java/org/holodeckb2b/ebms3/pulling/trigger/filebased/WatchForTriggerFile.java

@@ -28,8 +28,9 @@
 
 import org.holodeckb2b.common.messagemodel.PullRequest;
 import org.holodeckb2b.common.messagemodel.SelectivePullRequest;
-import org.holodeckb2b.common.util.Utils;
-import org.holodeckb2b.common.workerpool.AbstractWorkerTask;
+import org.holodeckb2b.common.workers.AbstractWorkerTask;
+import org.holodeckb2b.commons.util.FileUtils;
+import org.holodeckb2b.commons.util.Utils;
 import org.holodeckb2b.core.pmode.PModeUtils;
 import org.holodeckb2b.interfaces.core.HolodeckB2BCoreInterface;
 import org.holodeckb2b.interfaces.general.EbMSConstants;
@@ -126,7 +127,7 @@ public boolean accept(final File file) {
 	                HolodeckB2BCoreInterface.getMessageSubmitter().submitMessage(pullRequest);
 	                log.info("Pull Request based on " + f.getName() + " succesfully submitted to Holodeck B2B");
 	                // Change extension to reflect success
-	                Files.move(Paths.get(tFileName), Utils.createFileWithUniqueName(baseFileName + ".triggered")
+	                Files.move(Paths.get(tFileName), FileUtils.createFileWithUniqueName(baseFileName + ".triggered")
 	                           , StandardCopyOption.REPLACE_EXISTING);
 	            }
 	        } catch (final Exception e) {
@@ -135,7 +136,7 @@ public boolean accept(final File file) {
 	                        + ". Details: " + e.getMessage());
 	            // Change extension to reflect error and write error information
 	            try {
-	                final Path rejectFilePath = Utils.createFileWithUniqueName(baseFileName + ".rejected");
+	                final Path rejectFilePath = FileUtils.createFileWithUniqueName(baseFileName + ".rejected");
 	                Files.move(Paths.get(tFileName), rejectFilePath, StandardCopyOption.REPLACE_EXISTING);
 	                writeErrorFile(rejectFilePath, e);
 	            } catch (IOException ex) {