diff --git a/CHANGES.txt b/CHANGES.txt index e1c21b0d2..974b9ceaa 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,5 +1,6 @@ 0.5.0 ----- + * Upgrade sidecar version to 0.4.0 * Exclude IP address from RingInstance equality so node replacement does not fail bulk write jobs (CASSANALYTICS-175) * Regenerate bloom filters for CQLSSTableWriter (CASSANALYTICS-167) * Avoid Spark 4 partitioning warnings during bulk reads (CASSANALYTICS-171) diff --git a/cassandra-analytics-integration-framework/build.gradle b/cassandra-analytics-integration-framework/build.gradle index a88c0da9a..6c1c65b0f 100644 --- a/cassandra-analytics-integration-framework/build.gradle +++ b/cassandra-analytics-integration-framework/build.gradle @@ -86,6 +86,9 @@ dependencies { exclude(group: 'org.apache.logging.log4j') exclude(group: 'org.slf4j') exclude(group: 'ch.qos.logback') + // kafka-avro-serializer is only needed when sidecar publishes CDC events to a + // Schema-Registry-backed Kafka topic, which our in-jvm integration tests do not exercise. + exclude(group: 'io.confluent') } api(group: 'org.apache.cassandra', name: 'sidecar-server-common', version: "${sidecarVersion}") } diff --git a/cassandra-analytics-integration-framework/src/main/java/org/apache/cassandra/sidecar/testing/SharedClusterIntegrationTestBase.java b/cassandra-analytics-integration-framework/src/main/java/org/apache/cassandra/sidecar/testing/SharedClusterIntegrationTestBase.java index 460d8565b..a10046865 100644 --- a/cassandra-analytics-integration-framework/src/main/java/org/apache/cassandra/sidecar/testing/SharedClusterIntegrationTestBase.java +++ b/cassandra-analytics-integration-framework/src/main/java/org/apache/cassandra/sidecar/testing/SharedClusterIntegrationTestBase.java @@ -738,6 +738,7 @@ static InstanceMetadata buildInstanceMetadata(Vertx vertx, hostName = ipAddress; } int port = tryGetIntConfig(config, "native_transport_port", 9042); + int storagePort = tryGetIntConfig(config, "storage_port", 7000); String[] dataDirectories = (String[]) config.get("data_file_directories"); String stagingDir = stagingDir(dataDirectories); @@ -762,6 +763,7 @@ static InstanceMetadata buildInstanceMetadata(Vertx vertx, .id(config.num()) .host(hostName) .port(port) + .storagePort(storagePort) .dataDirs(Arrays.asList(dataDirectories)) .cdcDir(config.getString("cdc_raw_directory")) .commitlogDir(config.getString("commitlog_directory")) diff --git a/gradle.properties b/gradle.properties index 30e1aa3b9..aa3b798cb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -23,7 +23,7 @@ description=Apache Cassandra Analytics analyticsJDKLevel=17 cassandra40Version=4.0.17 cassandra50Version=5.0.5 -sidecarVersion=0.2.0 +sidecarVersion=0.4.0 intellijVersion=9.0.4 junitVersion=5.10.2 assertjCoreVersion=3.24.2