Change trunk from 4.2 to 5.0

– update MessagingService (remove the 4.1 version that was only a placeholder in test code bc serialisation test files were previously incorrectly serialising random UUIds for TimeUUIDs)
 – update upgrade jvm-dtests
 – remove older serialization binary files we are no longer testing against

 patch by Mick Semb Wever; reviewed by Brandon Williams for CASSANDRA-17973
This commit is contained in:
Mick Semb Wever 2023-02-25 11:25:35 +01:00
parent 35f8da66f9
commit 7ca806c60a
No known key found for this signature in database
GPG Key ID: E91335D77E3E87CB
132 changed files with 57 additions and 363 deletions

View File

@ -1,4 +1,4 @@
4.2
5.0
* Reduce memory allocations of calls to ByteBufer.duplicate() made in org.apache.cassandra.transport.CBUtil#writeValue (CASSANDRA-18212)
* CEP-17: SSTable API (CASSANDRA-17056)
* Gossip stateMapOrdering does not have correct ordering when both EndpointState are in the bootstrapping set (CASSANDRA-18292)

View File

@ -52,7 +52,7 @@ restore snapshots created with the previous major version using the
using the provided 'sstableupgrade' tool.
4.2
5.0
===
New features

View File

@ -41,7 +41,7 @@ be sitting in front of a prompt:
----
Connected to Test Cluster at localhost:9160.
[cqlsh 6.2.0 | Cassandra 4.2-SNAPSHOT | CQL spec 3.4.6 | Native protocol v5]
[cqlsh 6.2.0 | Cassandra 5.0-SNAPSHOT | CQL spec 3.4.6 | Native protocol v5]
Use HELP for help.
cqlsh>
----

View File

@ -32,7 +32,7 @@
<property name="debuglevel" value="source,lines,vars"/>
<!-- default version and SCM information -->
<property name="base.version" value="4.2"/>
<property name="base.version" value="5.0"/>
<property name="scm.connection" value="scm:https://gitbox.apache.org/repos/asf/cassandra.git"/>
<property name="scm.developerConnection" value="scm:https://gitbox.apache.org/repos/asf/cassandra.git"/>
<property name="scm.url" value="https://gitbox.apache.org/repos/asf?p=cassandra.git;a=tree"/>
@ -453,10 +453,6 @@
<jflex file="${build.src.java}/org/apache/cassandra/index/sasi/analyzer/StandardTokenizerImpl.jflex" destdir="${build.src.gen-java}/" />
</target>
<target name="echo-base-version">
<echo message="${base.version}" />
</target>
<!-- create properties file with C version -->
<target name="createVersionPropFile" depends="get-git-sha">
<taskdef name="propertyfile" classname="org.apache.tools.ant.taskdefs.optional.PropertyFile"/>

2
debian/changelog vendored
View File

@ -1,4 +1,4 @@
cassandra (4.2) UNRELEASED; urgency=medium
cassandra (5.0) UNRELEASED; urgency=medium
* New release

File diff suppressed because one or more lines are too long

View File

@ -211,7 +211,6 @@ public class MessagingService extends MessagingServiceMBeanImpl
public static final int VERSION_30 = 10;
public static final int VERSION_3014 = 11;
public static final int VERSION_40 = 12;
public static final int VERSION_41 = 13;
public static final int minimum_version = VERSION_30;
public static final int current_version = VERSION_40;
static AcceptVersions accept_messaging = new AcceptVersions(minimum_version, current_version);

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

Some files were not shown because too many files have changed in this diff Show More