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

samt pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 1371883  Update bundled driver dependencies
1371883 is described below

commit 1371883db3d8bf7d7c54e0baaca89c6c2d2a5abe
Author: Sam Tunnicliffe <[email protected]>
AuthorDate: Wed Mar 17 15:07:34 2021 +0000

    Update bundled driver dependencies
    
    This commit updates that bundled java and python drivers
    to their latest released versions, 3.11.0 and 3.25.0
    respectively.
    
    Patch by Sam Tunnicliffe and Adam Holmberg; reviewed by
    Brandon Williams for CASSANDRA-13951
    
    Co-authored-by: Adam Holmberg <[email protected]>
---
 CHANGES.txt                                        |   1 +
 build.xml                                          |  10 +---------
 ...jar => cassandra-driver-core-3.11.0-shaded.jar} | Bin 2781089 -> 2782668 
bytes
 ...p => cassandra-driver-internal-only-3.25.0.zip} | Bin 347058 -> 345177 bytes
 4 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 6ed7b96..90eac99 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 4.0-beta5
+ * Update bundled java and python drivers to 3.11.0 and 3.25.0 respectively 
(CASSANDRA-13951)
  * Add io.netty.tryReflectionSetAccessible=true to j11 server options in order 
to enable netty to use Unsafe direct byte buffer construction (CASSANDRA-16493)
  * Make cassandra-stress -node support host:port notation (CASSANDRA-16529)
  * Better handle legacy gossip application states during (and after) upgrades 
(CASSANDRA-16525)
diff --git a/build.xml b/build.xml
index 111c267..17f0e96 100644
--- a/build.xml
+++ b/build.xml
@@ -649,15 +649,13 @@
          </dependency>
           <dependency groupId="com.google.code.findbugs" artifactId="jsr305" 
version="2.0.2" />
           <dependency groupId="com.clearspring.analytics" artifactId="stream" 
version="2.5.2" />
-          <!-- UPDATE AND UNCOMMENT ON THE DRIVER RELEASE, BEFORE 4.0 RELEASE
-          <dependency groupId="com.datastax.cassandra" 
artifactId="cassandra-driver-core" version="3.10.0" classifier="shaded">
+          <dependency groupId="com.datastax.cassandra" 
artifactId="cassandra-driver-core" version="3.11.0" classifier="shaded">
             <exclusion groupId="io.netty" artifactId="netty-buffer"/>
             <exclusion groupId="io.netty" artifactId="netty-codec"/>
             <exclusion groupId="io.netty" artifactId="netty-handler"/>
             <exclusion groupId="io.netty" artifactId="netty-transport"/>
             <exclusion groupId="org.slf4j" artifactId="slf4j-api"/>
           </dependency>
-          -->
           <dependency groupId="org.eclipse.jdt.core.compiler" artifactId="ecj" 
version="${ecj.version}" />
           <dependency groupId="org.caffinitas.ohc" artifactId="ohc-core" 
version="${ohc.version}">
             <exclusion groupId="org.slf4j" artifactId="slf4j-api"/>
@@ -753,9 +751,7 @@
         <dependency groupId="org.apache.hadoop" 
artifactId="hadoop-minicluster"/>
         <dependency groupId="com.google.code.findbugs" artifactId="jsr305"/>
         <dependency groupId="org.antlr" artifactId="antlr"/>
-        <!-- UPDATE AND UNCOMMENT ON THE DRIVER RELEASE, BEFORE 4.0 RELEASE
         <dependency groupId="com.datastax.cassandra" 
artifactId="cassandra-driver-core" classifier="shaded"/>
-        -->
         <dependency groupId="org.eclipse.jdt.core.compiler" artifactId="ecj"/>
         <dependency groupId="org.caffinitas.ohc" artifactId="ohc-core"/>
         <dependency groupId="org.caffinitas.ohc" artifactId="ohc-core-j8"/>
@@ -786,9 +782,7 @@
         <dependency groupId="junit" artifactId="junit"/>
         <dependency groupId="org.mockito" artifactId="mockito-core" />
         <dependency groupId="org.reflections" artifactId="reflections" />
-        <!-- UPDATE AND UNCOMMENT ON THE DRIVER RELEASE, BEFORE 4.0 RELEASE
         <dependency groupId="com.datastax.cassandra" 
artifactId="cassandra-driver-core" classifier="shaded"/>
-        -->
         <dependency groupId="io.netty" artifactId="netty-bom"  type="pom" />
         <dependency groupId="io.netty" artifactId="netty-all"/>
         <dependency groupId="org.eclipse.jdt.core.compiler" artifactId="ecj"/>
@@ -865,14 +859,12 @@
         <dependency groupId="org.apache.hadoop" 
artifactId="hadoop-minicluster" optional="true"/>
 
         <!-- don't need the Java Driver to run, but if you use the hadoop 
stuff or UDFs -->
-        <!-- UPDATE AND UNCOMMENT ON THE DRIVER RELEASE, BEFORE 4.0 RELEASE
           <dependency groupId="com.datastax.cassandra" 
artifactId="cassandra-driver-core" classifier="shaded" optional="true">
             <exclusion groupId="io.netty" artifactId="netty-buffer"/>
             <exclusion groupId="io.netty" artifactId="netty-codec"/>
             <exclusion groupId="io.netty" artifactId="netty-handler"/>
             <exclusion groupId="io.netty" artifactId="netty-transport"/>
           </dependency>
-        -->
           <!-- don't need jna to run, but nice to have -->
         <dependency groupId="net.java.dev.jna" artifactId="jna"/>
 
diff --git a/lib/cassandra-driver-core-3.10.3-1af7382fe-shaded.jar 
b/lib/cassandra-driver-core-3.11.0-shaded.jar
similarity index 80%
rename from lib/cassandra-driver-core-3.10.3-1af7382fe-shaded.jar
rename to lib/cassandra-driver-core-3.11.0-shaded.jar
index adf439a..e85a7aa 100644
Binary files a/lib/cassandra-driver-core-3.10.3-1af7382fe-shaded.jar and 
b/lib/cassandra-driver-core-3.11.0-shaded.jar differ
diff --git a/lib/cassandra-driver-internal-only-3.24.0-a04c5929.zip 
b/lib/cassandra-driver-internal-only-3.25.0.zip
similarity index 86%
rename from lib/cassandra-driver-internal-only-3.24.0-a04c5929.zip
rename to lib/cassandra-driver-internal-only-3.25.0.zip
index 03f7d09..ecfd6a9 100644
Binary files a/lib/cassandra-driver-internal-only-3.24.0-a04c5929.zip and 
b/lib/cassandra-driver-internal-only-3.25.0.zip differ

---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to