This is an automated email from the ASF dual-hosted git repository.
exceptionfactory pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 47d5ae5 NIFI-8990: Downgrade Gremlin from 3.5.1 to 3.4.4 to support
Graph DBs
47d5ae5 is described below
commit 47d5ae5d75ee94b4f8613f7eccfced243d2a4d89
Author: Matthew Burgess <[email protected]>
AuthorDate: Thu Aug 5 15:44:07 2021 -0400
NIFI-8990: Downgrade Gremlin from 3.5.1 to 3.4.4 to support Graph DBs
This closes #5284
Signed-off-by: David Handermann <[email protected]>
---
.../nifi-graph-test-clients/pom.xml | 41 ++++++++++++++++------
.../nifi-other-graph-services/pom.xml | 31 ++++++++++++++--
2 files changed, 60 insertions(+), 12 deletions(-)
diff --git a/nifi-nar-bundles/nifi-graph-bundle/nifi-graph-test-clients/pom.xml
b/nifi-nar-bundles/nifi-graph-bundle/nifi-graph-test-clients/pom.xml
index 2f09984..52e9b52 100644
--- a/nifi-nar-bundles/nifi-graph-bundle/nifi-graph-test-clients/pom.xml
+++ b/nifi-nar-bundles/nifi-graph-bundle/nifi-graph-test-clients/pom.xml
@@ -24,6 +24,9 @@
<artifactId>nifi-graph-test-clients</artifactId>
<packaging>jar</packaging>
+ <properties>
+ <gremlin.version>3.4.4</gremlin.version>
+ </properties>
<dependencyManagement>
<dependencies>
<!-- Override commons-io:2.3 from janusgraph-core -->
@@ -32,21 +35,45 @@
<artifactId>commons-io</artifactId>
<version>2.10.0</version>
</dependency>
- <!-- Override Gremlin -->
+ <!-- Override Gremlin and Groovy -->
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy</artifactId>
+ <version>2.5.14</version>
+ <classifier>indy</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-json</artifactId>
+ <version>2.5.14</version>
+ <classifier>indy</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-groovysh</artifactId>
+ <version>2.5.14</version>
+ <classifier>indy</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-jsr223</artifactId>
+ <version>2.5.14</version>
+ <classifier>indy</classifier>
+ </dependency>
<dependency>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-core</artifactId>
- <version>3.5.1</version>
+ <version>${gremlin.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-driver</artifactId>
- <version>3.5.1</version>
+ <version>${gremlin.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-groovy</artifactId>
- <version>3.5.1</version>
+ <version>${gremlin.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
@@ -83,12 +110,6 @@
<artifactId>janusgraph-inmemory</artifactId>
<version>0.5.3</version>
</dependency>
-
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy</artifactId>
- <version>2.5.14</version>
- </dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-mock</artifactId>
diff --git
a/nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/pom.xml
b/nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/pom.xml
index 2ad3272..765bfac 100644
--- a/nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/pom.xml
+++ b/nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/pom.xml
@@ -18,6 +18,9 @@
<artifactId>nifi-other-graph-services</artifactId>
<packaging>jar</packaging>
+ <properties>
+ <gremlin.version>3.4.4</gremlin.version>
+ </properties>
<dependencies>
<dependency>
<groupId>org.apache.nifi</groupId>
@@ -82,14 +85,38 @@
<version>1.0.4</version>
</dependency>
<dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy</artifactId>
+ <version>2.5.14</version>
+ <classifier>indy</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-json</artifactId>
+ <version>2.5.14</version>
+ <classifier>indy</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-groovysh</artifactId>
+ <version>2.5.14</version>
+ <classifier>indy</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-jsr223</artifactId>
+ <version>2.5.14</version>
+ <classifier>indy</classifier>
+ </dependency>
+ <dependency>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-core</artifactId>
- <version>3.5.1</version>
+ <version>${gremlin.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-driver</artifactId>
- <version>3.5.1</version>
+ <version>${gremlin.version}</version>
</dependency>
</dependencies>
