NIFI-4848: Update HttpComponents version - httpclient 4.5.3 -> 4.5.5 - httpcore 4.4.4 -> 4.4.9 - ThreadSafe annotation is removed since 4.4.5, HTTPCLIENT-1743. Removed the annotation from DebugFlow processor. - httpasyncclient 4.1.2 -> 4.1.3 - This closes #2453
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/678dfc1a Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/678dfc1a Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/678dfc1a Branch: refs/heads/HDF-3.1-maint Commit: 678dfc1aefb919dc290fc0ed8e2169b0c2556b2c Parents: a0bd611 Author: Koji Kawamura <ijokaruma...@apache.org> Authored: Wed Feb 7 15:42:54 2018 +0900 Committer: Matt Gilman <matt.c.gil...@gmail.com> Committed: Wed Feb 7 09:02:38 2018 -0500 ---------------------------------------------------------------------- nifi-commons/nifi-site-to-site-client/pom.xml | 2 +- .../main/java/org/apache/nifi/processors/standard/DebugFlow.java | 2 -- pom.xml | 4 ++-- 3 files changed, 3 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/678dfc1a/nifi-commons/nifi-site-to-site-client/pom.xml ---------------------------------------------------------------------- diff --git a/nifi-commons/nifi-site-to-site-client/pom.xml b/nifi-commons/nifi-site-to-site-client/pom.xml index 21e8fb2..08a33db 100644 --- a/nifi-commons/nifi-site-to-site-client/pom.xml +++ b/nifi-commons/nifi-site-to-site-client/pom.xml @@ -62,7 +62,7 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpasyncclient</artifactId> - <version>4.1.2</version> + <version>4.1.3</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/nifi/blob/678dfc1a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/DebugFlow.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/DebugFlow.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/DebugFlow.java index 3d12ee5..6e55157 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/DebugFlow.java +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/DebugFlow.java @@ -28,7 +28,6 @@ import java.util.Set; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; -import org.apache.http.annotation.ThreadSafe; import org.apache.nifi.annotation.behavior.EventDriven; import org.apache.nifi.annotation.documentation.CapabilityDescription; import org.apache.nifi.annotation.documentation.Tags; @@ -51,7 +50,6 @@ import org.apache.nifi.processor.exception.ProcessException; import org.apache.nifi.processor.io.OutputStreamCallback; import org.apache.nifi.processor.util.StandardValidators; -@ThreadSafe() @EventDriven() @Tags({"test", "debug", "processor", "utility", "flow", "FlowFile"}) @CapabilityDescription("The DebugFlow processor aids testing and debugging the FlowFile framework by allowing various " http://git-wip-us.apache.org/repos/asf/nifi/blob/678dfc1a/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 3b2f1b2..3d800ce 100644 --- a/pom.xml +++ b/pom.xml @@ -308,12 +308,12 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> - <version>4.5.3</version> + <version>4.5.5</version> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpcore</artifactId> - <version>4.4.4</version> + <version>4.4.9</version> </dependency> <dependency> <groupId>javax.mail</groupId>