Repository: nifi Updated Branches: refs/heads/master eb0b4283e -> 65beec39b
NIFI-5242: Exclude JTS dependency from Elasticsearch client This closes #2741 Signed-off-by: Mike Thomsen <mikerthom...@gmail.com> Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/65beec39 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/65beec39 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/65beec39 Branch: refs/heads/master Commit: 65beec39bb94e1a3af8654bdc2741892526b8193 Parents: eb0b428 Author: Matthew Burgess <mattyb...@apache.org> Authored: Sun May 27 11:19:43 2018 -0400 Committer: Mike Thomsen <mikerthom...@gmail.com> Committed: Sun May 27 19:00:34 2018 -0400 ---------------------------------------------------------------------- .../nifi-elasticsearch-client-service/pom.xml | 6 ++++++ .../nifi-elasticsearch-restapi-processors/pom.xml | 12 ++++++++++++ 2 files changed, 18 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/65beec39/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/pom.xml ---------------------------------------------------------------------- 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 db79b05..120ff93 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 @@ -126,6 +126,12 @@ <artifactId>elasticsearch-rest-high-level-client</artifactId> <version>5.6.8</version> <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>com.vividsolutions</groupId> + <artifactId>jts</artifactId> + </exclusion> + </exclusions> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/nifi/blob/65beec39/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/pom.xml ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/pom.xml b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/pom.xml index 53505cf..09cb0ea 100644 --- a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/pom.xml +++ b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/pom.xml @@ -55,11 +55,23 @@ language governing permissions and limitations under the License. --> <groupId>org.elasticsearch.client</groupId> <artifactId>transport</artifactId> <version>${es.version}</version> + <exclusions> + <exclusion> + <groupId>com.vividsolutions</groupId> + <artifactId>jts</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.elasticsearch.client</groupId> <artifactId>elasticsearch-rest-high-level-client</artifactId> <version>${es.version}</version> + <exclusions> + <exclusion> + <groupId>com.vividsolutions</groupId> + <artifactId>jts</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.nifi</groupId>
