diff --git a/CHANGELOG.MD b/CHANGELOG.MD index 9521fc4..604c74a 100644 --- a/CHANGELOG.MD +++ b/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/). +## 1.1.0 +###### 2020-09-03 +### Changed +* Adapted to Holodeck B2B 5.x API + ## 1.0.0 ###### 2019-03-06 ### Added diff --git a/README.md b/README.md index b690cc1..646023f 100644 --- a/README.md +++ b/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 4.1.0 and later. +This extension can be used with Holodeck B2B version 5.0.0 and later. ### Configuration To enable the trigger mechanism a _worker_ that will watch for _trigger documents_ has to be added to the diff --git a/pom.xml b/pom.xml index 250b713..2652c79 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.holodeckb2b.extensions pullrequest-trigger - 1.0.0 + 1.1.0 jar UTF-8 @@ -50,16 +50,10 @@ - - org.holodeckb2b - holodeckb2b-interfaces - 4.1.0 - provided - org.holodeckb2b holodeckb2b-core - 4.1.0 + 5.0.0 provided diff --git a/src/main/java/org/holodeckb2b/ebms3/pulling/trigger/filebased/WatchForTriggerFile.java b/src/main/java/org/holodeckb2b/ebms3/pulling/trigger/filebased/WatchForTriggerFile.java index 15b3901..56851b6 100644 --- a/src/main/java/org/holodeckb2b/ebms3/pulling/trigger/filebased/WatchForTriggerFile.java +++ b/src/main/java/org/holodeckb2b/ebms3/pulling/trigger/filebased/WatchForTriggerFile.java @@ -30,6 +30,7 @@ import org.holodeckb2b.common.messagemodel.SelectivePullRequest; import org.holodeckb2b.common.util.Utils; import org.holodeckb2b.common.workerpool.AbstractWorkerTask; +import org.holodeckb2b.core.pmode.PModeUtils; import org.holodeckb2b.interfaces.core.HolodeckB2BCoreInterface; import org.holodeckb2b.interfaces.general.EbMSConstants; import org.holodeckb2b.interfaces.messagemodel.IPullRequest; @@ -41,7 +42,6 @@ import org.holodeckb2b.interfaces.pmode.IUserMessageFlow; import org.holodeckb2b.interfaces.submit.MessageSubmitException; import org.holodeckb2b.interfaces.workerpool.TaskConfigurationException; -import org.holodeckb2b.pmode.PModeUtils; /** * This worker reads all "Pull Request trigger documents" from the specified directory and then submits the @@ -75,7 +75,8 @@ public void setParameters(final Map parameters) throws TaskConfigurat log.error("Unable to configure task: Missing required parameter \"watchPath\""); throw new TaskConfigurationException("Missing required parameter \"watchPath\""); } else if (!Paths.get(pathParameter).isAbsolute()) - watchPath = Paths.get(HolodeckB2BCoreInterface.getConfiguration().getHolodeckB2BHome(), pathParameter).toString(); + watchPath = HolodeckB2BCoreInterface.getConfiguration().getHolodeckB2BHome() + .resolve(pathParameter).toString(); else watchPath = pathParameter;