Merge branch 'v0.6'

Signed-off-by: Oleksandr Porunov <alexandr.porunov@gmail.com>
smcquillan · May 12, 2022 · ac9e1fe · ac9e1fe
2 parents 3478a6d + 177c764
commit ac9e1fe
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/janusgraph-cql/pom.xml b/janusgraph-cql/pom.xml
@@ -135,6 +135,10 @@
             </exclusions>
         </dependency>
 
+        <dependency>
+            <groupId>org.graalvm.nativeimage</groupId>
+            <artifactId>svm</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.datastax.oss</groupId>
             <artifactId>java-driver-core</artifactId>
@@ -160,6 +164,10 @@
                     <groupId>io.netty</groupId>
                     <artifactId>netty-handler</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.graalvm.nativeimage</groupId>
+                    <artifactId>svm</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -189,7 +197,7 @@
         <dependency>
             <groupId>com.datastax.cassandra</groupId>
             <artifactId>cassandra-driver-core</artifactId>
-            <version>3.11.0</version>
+            <version>3.11.2</version>
             <exclusions>
                 <exclusion>
                     <groupId>com.github.jnr</groupId>

diff --git a/pom.xml b/pom.xml
@@ -100,7 +100,7 @@
         <test.excluded.groups>MEMORY_TESTS,PERFORMANCE_TESTS,BRITTLE_TESTS</test.excluded.groups>
         <dependency.locations.enabled>false</dependency.locations.enabled>
         <cassandra.version>3.11.10</cassandra.version>
-        <cassandra-driver.version>4.13.0</cassandra-driver.version>
+        <cassandra-driver.version>4.14.1</cassandra-driver.version>
         <scylladb.version>4.4.0</scylladb.version>
         <testcontainers.version>1.16.2</testcontainers.version>
         <easymock.version>4.3</easymock.version>
@@ -111,6 +111,7 @@
         <!-- align with org.apache.solr:solr-solrj -->
         <jetty.version>9.4.44.v20210927</jetty.version>
         <log4j2.version>2.17.1</log4j2.version>
+        <graalvm-nativeimage.version>22.0.0.2</graalvm-nativeimage.version>
     </properties>
     <modules>
         <module>janusgraph-grpc</module>
@@ -1152,7 +1153,7 @@
             <dependency>
                 <groupId>org.graalvm.nativeimage</groupId>
                 <artifactId>svm</artifactId>
-                <version>21.0.0.2</version>
+                <version>${graalvm-nativeimage.version}</version>
             </dependency>
             <dependency>
                 <groupId>javax.servlet</groupId>