This is an automated email from the ASF dual-hosted git repository.

pvillard 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 51956a4426 NIFI-11479 Upgraded JanusGraph from 0.5.3 to 0.6.3
51956a4426 is described below

commit 51956a442690822adeb6bc562f6698bf32aada22
Author: exceptionfactory <[email protected]>
AuthorDate: Fri Apr 21 12:56:22 2023 -0500

    NIFI-11479 Upgraded JanusGraph from 0.5.3 to 0.6.3
    
    - Set Guava to 31.1 overriding 29.0 from JanusGraph 0.6.3
    
    Signed-off-by: Pierre Villard <[email protected]>
    
    This closes #7192.
---
 .../nifi-graph-bundle/nifi-graph-test-clients/pom.xml        | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 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 65d1059d84..bab1e92a44 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
@@ -26,6 +26,8 @@
     <packaging>jar</packaging>
     <properties>
         <gremlin.version>3.6.2</gremlin.version>
+        <janusgraph.version>0.6.3</janusgraph.version>
+        <guava.version>31.1-jre</guava.version>
     </properties>
     <dependencyManagement>
         <dependencies>
@@ -51,6 +53,12 @@
                 <artifactId>gremlin-groovy</artifactId>
                 <version>${gremlin.version}</version>
             </dependency>
+            <!-- Override Guava 29.0 from JanusGraph 0.6.3 -->
+            <dependency>
+                <groupId>com.google.guava</groupId>
+                <artifactId>guava</artifactId>
+                <version>${guava.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
     <dependencies>
@@ -79,7 +87,7 @@
         <dependency>
             <groupId>org.janusgraph</groupId>
             <artifactId>janusgraph-core</artifactId>
-            <version>0.5.3</version>
+            <version>${janusgraph.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>commons-logging</groupId>
@@ -94,7 +102,7 @@
         <dependency>
             <groupId>org.janusgraph</groupId>
             <artifactId>janusgraph-inmemory</artifactId>
-            <version>0.5.3</version>
+            <version>${janusgraph.version}</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>

Reply via email to