cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m..@apache.org
Subject [cassandra] 01/01: Merge branch 'cassandra-3.11' into cassandra-4.0
Date Mon, 30 Aug 2021 19:42:14 GMT
This is an automated email from the ASF dual-hosted git repository.

mck pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit a6ea52118c93deab6fe8c1ed074f1e9ad2b593fb
Merge: 6709111 b0cdaec
Author: Mick Semb Wever <mck@apache.org>
AuthorDate: Mon Aug 30 21:09:39 2021 +0200

    Merge branch 'cassandra-3.11' into cassandra-4.0

 CHANGES.txt | 1 +
 build.xml   | 2 ++
 2 files changed, 3 insertions(+)

diff --cc CHANGES.txt
index 4236e0c,aa0ad38..8b4018a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,20 -1,19 +1,21 @@@
 -3.11.12
 +4.0.1
+  * Exclude Jackson 1.x transitive dependency of hadoop* provided dependencies (CASSANDRA-16854)
 + * Tolerate missing DNS entry when completing a host replacement (CASSANDRA-16873)
 + * Harden PrunableArrayQueue against Pruner implementations that might throw exceptions
(CASSANDRA-16866)
 + * Move RepairedDataInfo to the execution controller rather than the ReadCommand to avoid
unintended sharing (CASSANDRA-16721)
 + * Bump zstd-jni version to 1.5.0-4 (CASSANDRA-16884)
 + * Remove assumption that all urgent messages are small (CASSANDRA-16877)
 + * ArrayClustering.unsharedHeapSize does not include the data so undercounts the heap size
(CASSANDRA-16845)
 + * Improve help, doc and error messages about sstabledump -k and -x arguments (CASSANDRA-16818)
 + * Add repaired/unrepaired bytes back to nodetool (CASSANDRA-15282)
 + * Upgrade lz4-java to 1.8.0 to add RH6 support back (CASSANDRA-16753)
 + * Improve DiagnosticEventService.publish(event) logging message of events (CASSANDRA-16749)
 + * Cleanup dependency scopes (CASSANDRA-16704)
 + * Make JmxHistogram#getRecentValues() and JmxTimer#getRecentValues() thread-safe (CASSANDRA-16707)
 +Merged from 3.11:
   * Validate SASI tokenizer options before adding index to schema (CASSANDRA-15135)
   * Fixup scrub output when no data post-scrub and clear up old use of row, which really
means partition (CASSANDRA-16835)
 - * Fix ant-junit dependency issue (CASSANDRA-16827)
   * Reduce thread contention in CommitLogSegment and HintsBuffer (CASSANDRA-16072)
 - * Avoid sending CDC column if not enabled (CASSANDRA-16770)
 -Merged from 3.0:
 - * Fix secondary indexes on primary key columns skipping some writes (CASSANDRA-16868)
 - * Fix incorrect error message in LegacyLayout (CASSANDRA-15136)
 - * Use JMX to validate nodetool --jobs parameter (CASSANDRA-16104)
 - * Handle properly UnsatisfiedLinkError in NativeLibrary#getProcessID() (CASSANDRA-16578)
 - * Remove mutation data from error log message (CASSANDRA-16817)
 -
 -
 -3.11.11
   * Make cqlsh use the same set of reserved keywords than the server uses (CASSANDRA-15663)
   * Optimize bytes skipping when reading SSTable files (CASSANDRA-14415)
   * Enable tombstone compactions when unchecked_tombstone_compaction is set in TWCS (CASSANDRA-14496)
diff --cc build.xml
index 2bb22a7,34bca92..a8cfe11
--- a/build.xml
+++ b/build.xml
@@@ -527,33 -368,30 +527,35 @@@
              <exclusion groupId="org.hamcrest" artifactId="hamcrest-core"/>
            </dependency>
            <dependency groupId="org.mockito" artifactId="mockito-core" version="3.2.4"
scope="test"/>
 +          <dependency groupId="org.quicktheories" artifactId="quicktheories" version="0.26"
scope="test"/>
 +          <dependency groupId="com.google.code.java-allocation-instrumenter" artifactId="java-allocation-instrumenter"
version="${allocation-instrumenter.version}" scope="test">
 +            <exclusion groupId="com.google.guava" artifactId="guava"/>
 +          </dependency>
            <dependency groupId="org.apache.cassandra" artifactId="dtest-api" version="0.0.8"
scope="test"/>
            <dependency groupId="org.reflections" artifactId="reflections" version="0.9.12"
scope="test"/>
 -          <dependency groupId="org.quicktheories" artifactId="quicktheories" version="0.25"
scope="test"/>
            <dependency groupId="org.apache.hadoop" artifactId="hadoop-core" version="1.0.3"
scope="provided">
 -          	<exclusion groupId="org.mortbay.jetty" artifactId="servlet-api"/>
 -          	<exclusion groupId="commons-logging" artifactId="commons-logging"/>
 -          	<exclusion groupId="org.eclipse.jdt" artifactId="core"/>
 -		    <exclusion groupId="ant" artifactId="ant"/>
 -		    <exclusion groupId="junit" artifactId="junit"/>
 +            <exclusion groupId="org.mortbay.jetty" artifactId="servlet-api"/>
 +            <exclusion groupId="commons-logging" artifactId="commons-logging"/>
 +            <exclusion groupId="org.eclipse.jdt" artifactId="core"/>
 +            <exclusion groupId="ant" artifactId="ant"/>
 +            <exclusion groupId="junit" artifactId="junit"/>
+             <exclusion groupId="org.codehaus.jackson" artifactId="jackson-mapper-asl"/>
 +            <exclusion groupId="org.slf4j" artifactId="slf4j-api"/>
            </dependency>
            <dependency groupId="org.apache.hadoop" artifactId="hadoop-minicluster" version="1.0.3"
scope="provided">
 -		    <exclusion groupId="asm" artifactId="asm"/> <!-- this is the outdated version
3.1 -->
 +            <exclusion groupId="asm" artifactId="asm"/> <!-- this is the outdated
version 3.1 -->
 +            <exclusion groupId="org.slf4j" artifactId="slf4j-api"/>
+             <exclusion groupId="org.codehaus.jackson" artifactId="jackson-mapper-asl"/>
            </dependency>
 -          <dependency groupId="net.java.dev.jna" artifactId="jna" version="4.2.2"/>
 +          <dependency groupId="net.java.dev.jna" artifactId="jna" version="5.6.0"/>
  
 -          <dependency groupId="org.jacoco" artifactId="org.jacoco.agent" version="${jacoco.version}"/>
 -          <dependency groupId="org.jacoco" artifactId="org.jacoco.ant" version="${jacoco.version}"/>
 +          <dependency groupId="org.jacoco" artifactId="org.jacoco.agent" version="${jacoco.version}"
scope="test"/>
 +          <dependency groupId="org.jacoco" artifactId="org.jacoco.ant" version="${jacoco.version}"
scope="test"/>
  
 -          <dependency groupId="org.jboss.byteman" artifactId="byteman-install" version="${byteman.version}"/>
 -          <dependency groupId="org.jboss.byteman" artifactId="byteman" version="${byteman.version}"/>
 -          <dependency groupId="org.jboss.byteman" artifactId="byteman-submit" version="${byteman.version}"/>
 -          <dependency groupId="org.jboss.byteman" artifactId="byteman-bmunit" version="${byteman.version}"/>
 +          <dependency groupId="org.jboss.byteman" artifactId="byteman-install" version="${byteman.version}"
scope="provided"/>
 +          <dependency groupId="org.jboss.byteman" artifactId="byteman" version="${byteman.version}"
scope="provided"/>
 +          <dependency groupId="org.jboss.byteman" artifactId="byteman-submit" version="${byteman.version}"
scope="provided"/>
 +          <dependency groupId="org.jboss.byteman" artifactId="byteman-bmunit" version="${byteman.version}"
scope="provided"/>
  
            <dependency groupId="net.bytebuddy" artifactId="byte-buddy" version="${bytebuddy.version}"
/>
            <dependency groupId="net.bytebuddy" artifactId="byte-buddy-agent" version="${bytebuddy.version}"
/>

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org


Mime
View raw message