Repository: nifi Updated Branches: refs/heads/master e76c54234 -> 60064a9f6
NIFI-5884 Bumping hbase-client version from 1.1.2 to 1.1.13 This closes #3211. Signed-off-by: Koji Kawamura <ijokaruma...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/60064a9f Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/60064a9f Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/60064a9f Branch: refs/heads/master Commit: 60064a9f6874f56bc946dfd71c2568528040de0c Parents: e76c542 Author: Bryan Bende <bbe...@apache.org> Authored: Fri Dec 7 10:50:43 2018 -0500 Committer: Koji Kawamura <ijokaruma...@apache.org> Committed: Mon Dec 10 11:00:08 2018 +0900 ---------------------------------------------------------------------- .../nifi-hbase_1_1_2-client-service/pom.xml | 2 +- .../java/org/apache/nifi/hbase/HBase_1_1_2_ClientService.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/60064a9f/nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/nifi-hbase_1_1_2-client-service/pom.xml ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/nifi-hbase_1_1_2-client-service/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/nifi-hbase_1_1_2-client-service/pom.xml index 4d7744d..6b1d5ba 100644 --- a/nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/nifi-hbase_1_1_2-client-service/pom.xml +++ b/nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/nifi-hbase_1_1_2-client-service/pom.xml @@ -25,7 +25,7 @@ <artifactId>nifi-hbase_1_1_2-client-service</artifactId> <packaging>jar</packaging> <properties> - <hbase.version>1.1.2</hbase.version> + <hbase.version>1.1.13</hbase.version> </properties> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/nifi/blob/60064a9f/nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/nifi-hbase_1_1_2-client-service/src/main/java/org/apache/nifi/hbase/HBase_1_1_2_ClientService.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/nifi-hbase_1_1_2-client-service/src/main/java/org/apache/nifi/hbase/HBase_1_1_2_ClientService.java b/nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/nifi-hbase_1_1_2-client-service/src/main/java/org/apache/nifi/hbase/HBase_1_1_2_ClientService.java index 050c8d0..9425846 100644 --- a/nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/nifi-hbase_1_1_2-client-service/src/main/java/org/apache/nifi/hbase/HBase_1_1_2_ClientService.java +++ b/nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/nifi-hbase_1_1_2-client-service/src/main/java/org/apache/nifi/hbase/HBase_1_1_2_ClientService.java @@ -79,8 +79,9 @@ import java.util.concurrent.atomic.AtomicReference; @RequiresInstanceClassLoading @Tags({ "hbase", "client"}) -@CapabilityDescription("Implementation of HBaseClientService for HBase 1.1.2. This service can be configured by providing " + - "a comma-separated list of configuration files, or by specifying values for the other properties. If configuration files " + +@CapabilityDescription("Implementation of HBaseClientService using the HBase 1.1.x client. Although this service was originally built with the 1.1.2 " + + "client and has 1_1_2 in it's name, the client library has since been upgraded to 1.1.13 to leverage bug fixes. This service can be configured " + + "by providing a comma-separated list of configuration files, or by specifying values for the other properties. If configuration files " + "are provided, they will be loaded first, and the values of the additional properties will override the values from " + "the configuration files. In addition, any user defined properties on the processor will also be passed to the HBase " + "configuration.")
