This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/master by this push:
new c6e8bf2 NIFI-6794 resolving pom issue creating resolving merge
conflict
c6e8bf2 is described below
commit c6e8bf204cf02066905999d9957901e1a124afca
Author: Joe Witt <[email protected]>
AuthorDate: Mon Oct 28 12:55:26 2019 -0700
NIFI-6794 resolving pom issue creating resolving merge conflict
---
.../nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/pom.xml | 1 +
1 file changed, 1 insertion(+)
diff --git
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/pom.xml
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/pom.xml
index b93a19f..b1ffe55 100644
---
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/pom.xml
+++
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/pom.xml
@@ -143,6 +143,7 @@
<artifactId>httpclient</artifactId>
<version>4.5.10</version>
</dependency>
+ <dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-record-path</artifactId>
<version>1.10.0-SNAPSHOT</version>
