Commit Graph

535 Commits

Author SHA1 Message Date
Stefan Miklosovic 60c7f05138
Cleanup of dependency-check-suppressions.xml, suppressing CVE-2025-67735
patch by Stefan Miklosovic; reviewed by Michael Semb Wever for CASSANDRA-21159
2026-02-17 11:40:01 +11:00
MichaelMorris 8b6195a975
Upgrade logback version to 1.5.18 and slf4j dependencies to 2.0.17
Dropback of CASSANDRA-20429 to cassandra-5.0

patch by Michael Morris; reviewed by Stefan Miklosovic, Brandon Williams for CASSANDRA-21137
2026-02-06 13:28:03 +11:00
Josh McKenzie 940739a488 Add JDK21 support
Patch by Josh McKenzie; reviewed by Mick Semb Wever and Ekaterina Dimitrova for CASSANDRA-18831

Co-authored-by: Aleksey Yeschenko
Co-authored-by: Achilles Benetopoulos
Co-authored-by: Mick Semb Wever
2026-02-02 12:39:05 -05:00
Mick Semb Wever cd707ba67d
Merge branch 'cassandra-5.0' into trunk
* cassandra-5.0:
  Implement microbench test target type
2026-01-27 20:22:38 +01:00
Mick Semb Wever b3ee9713f8
Implement microbench test target type
Add microbench-test target for quick test run
 Unify declaration and add assertions on target types
 Fix dirname usages for macos
 Parameter for docker_timeout
 Add more jmh class ignores (that are broken)
 Add disableResume() and better host debug to Jenkinsfile

 patch by Mick Semb Wever; reviewed by Dmitry Konstantinov for CASSANDRA-18873
2026-01-27 11:31:17 +01:00
Yaman Ziadeh 7c3c3a1d86 Initial async-profiler Nodetool implementation
patch by Yaman Ziadeh, Bernardo Botella, Stefan Miklosovic; reviewed by Dmitry Konstantinov, Jyothsna Konisa for CASSANDRA-20854
2026-01-12 15:02:13 -08:00
Maxim Muzafarov 9a30a3469c
Add configuration for sorted imports in source files
Patch by Maxim Muzafarov; Reviewed by Michael Semb Wever for CASSANDRA-17925
2025-12-30 22:34:12 +01:00
Abe Ratnofsky 66a7a36647 Merge branch 'cassandra-5.0' into trunk
* cassandra-5.0:
  Switch lz4-java to at.yawk.lz4 version due to CVE
2025-12-18 11:02:13 -08:00
Abe Ratnofsky 6fd83986e9 Merge branch 'cassandra-4.1' into cassandra-5.0
* cassandra-4.1:
  Switch lz4-java to at.yawk.lz4 version due to CVE
2025-12-18 10:59:09 -08:00
Dmitry Konstantinov d2c48faf71 Jenkins: increase splits for simulator-dtest to 2 (support for multiple splits is added) and for test-burn to 4
Patch by Dmitry Konstantinov; reviewed by Michael Semb Wever, Jyothsna Konisa for CASSANDRA-21082
2025-12-17 21:33:31 +00:00
Doug Rohrer d40e4ecc09 Merge branch 'cassandra-5.0' into trunk 2025-10-24 14:40:15 -04:00
Doug Rohrer b4dcef7841 Merge branch 'cassandra-4.1' into cassandra-5.0 2025-10-24 14:26:39 -04:00
Mick Semb Wever c501c338e6
Merge branch 'cassandra-5.0' into trunk
* cassandra-5.0:
  Add a github action that runs .build/docker/check-code.sh
2025-10-13 12:35:36 +02:00
Mick Semb Wever 8aad9d6c05
Add a github action that runs .build/docker/check-code.sh
Runs on each supported JDK

 patch by Mick Semb Wever; reviewed by Štefan Miklošovič for CASSANDRA-20931
2025-10-13 12:34:51 +02:00
Stefan Miklosovic a94736ca50
Update snakeyaml to 2.4
patch by Stefan Miklosovic; reviewed by Brandon Williams for CASSANDRA-20928
2025-09-26 20:07:57 +02:00
Stefan Miklosovic f96353cfd1
Merge branch 'cassandra-5.0' into trunk 2025-09-26 16:15:08 +02:00
Stefan Miklosovic ed04f46b27
Merge branch 'cassandra-4.1' into cassandra-5.0 2025-09-26 16:08:54 +02:00
Stefan Miklosovic 4757411e94
Merge branch 'cassandra-4.0' into cassandra-4.1 2025-09-26 16:06:15 +02:00
Stefan Miklosovic 0026c0dc4c
Update OWASP dependency-check to 12.1.6, suppress unrelevant CVEs
patch by Stefan Miklosovic; reviewed by Brandon Williams for CASSANDRA-20924
2025-09-26 16:02:06 +02:00
Stefan Miklosovic 7b4fbde8e4
Update Netty to 4.1.125.Final
patch by Stefan Miklosovic; reviewed by Brandon Williams for CASSANDRA-20925
2025-09-26 13:13:58 +02:00
Stefan Miklosovic 71871bee70
Merge branch 'cassandra-5.0' into trunk 2025-09-19 13:32:34 +02:00
Raymond Huffman a52d2ce783
Update jackson-dataformat-yaml to 2.19.2 and snakeyaml to 2.1
This is backport of CASSANDRA-18875 to 5.0 where we upgrade 2.1 of snakeyaml and bump jackson-dataformat-yaml to 2.19.2.

The change in trunk (5.1) is about excluding Jackson dependencies from wiremock so 2.19.2 of Jackson is used everywhere in test as well,
otherwise there would be Jackson annotations of 2.13.4 used.

patch by Raymond Huffman; reviewed by Mick Semb Wever and Stefan Miklosovic for CASSANDRA-18875

Co-authored-by: Griffin Davis <gcd@ibm.com>
2025-09-19 13:29:05 +02:00
Mick Semb Wever 5c7d8d8982
Merge branch 'cassandra-5.0' into trunk
* cassandra-5.0:
  Fix resolution of base job branch determination in .build/run-ci
2025-09-04 11:16:29 +02:00
Mick Semb Wever 8ccdbb88ed
Fix resolution of base job branch determination in .build/run-ci
patch by Mick Semb Wever; reviewed by Štefan Miklošovič for CASSANDRA-20875
2025-09-03 23:08:17 +02:00
Stefan Miklosovic deadaea157
Merge branch 'cassandra-5.0' into trunk 2025-09-01 10:27:32 +02:00
Stefan Miklosovic dd8839320f
Fix job name determination in .build/run-ci for trunk case
patch by Stefan Miklosovic; reviewed by Michael Semb Wever for CASSANDRA-20874
2025-09-01 10:26:57 +02:00
Stefan Miklosovic e57fdf1676
Merge branch 'cassandra-5.0' into trunk 2025-08-28 17:26:30 +02:00
Stefan Miklosovic decd51eb5d
ninja: add license to .build/run-ci.d/requirements.txt to pass rat check 2025-08-28 17:23:29 +02:00
mck 4a548b0f28
Merge branch 'cassandra-5.0' into trunk
* cassandra-5.0:
  K8s immutable provisioning of ci-cassandra.apache.org jenkins instances
2025-08-27 23:39:44 +02:00
Richa Mishra 05f0e513e8
K8s immutable provisioning of ci-cassandra.apache.org jenkins instances
.build/run-ci is a a python script used to create and interact with k8s provisioned ci-cassandra.apache.org clones
See .build/run-ci.d/README.md for docs on usage.

.jenkins/k8s/ contains the k8s jenkins helm chart, JSaC configuration, and docker image for provisioning.

.build/run-ci.d/  contains python requirements and tests for .build/run-ci

 patch by Richa Mishra, Nishant Barola, Aleksandr Volochnev, Mick Semb Wever; reviewed by Richa Mishra, Nishant Barola, Aleksandr Volochnev, Brandon Hsieh, Mick Semb Wever, Brandon Williams for CASSANDRA-18145

Co-authored-by: Richa Mishra <richa.mishra@infracloud.io>
Co-authored-by: Nishant Barola <nishant.barola@infracloud.io>
Co-authored-by: Aleksandr Volochnev <a.volochnev@gmail.com>
Co-authored-by: Mick Semb Wever <mck@apache.org>
2025-08-27 23:33:16 +02:00
Stefan Miklosovic 9598a96512
Merge branch 'cassandra-5.0' into trunk 2025-08-25 17:44:58 +02:00
Stefan Miklosovic af0197e195
Merge branch 'cassandra-4.1' into cassandra-5.0 2025-08-25 17:41:43 +02:00
Stefan Miklosovic 6c068b999f
Merge branch 'cassandra-4.0' into cassandra-4.1 2025-08-25 17:38:44 +02:00
Stefan Miklosovic f9dbfd431e
Update Jackson to 2.19.2
patch by Stefan Miklosovic; reviewed by Brandon Williams for CASSANDRA-20848
2025-08-25 17:34:38 +02:00
Stefan Miklosovic 7c6ae891e7
Merge branch 'cassandra-5.0' into trunk 2025-08-25 17:28:31 +02:00
Stefan Miklosovic 4a1c4052af
Merge branch 'cassandra-4.1' into cassandra-5.0 2025-08-25 17:26:09 +02:00
Maxim Muzafarov 94b251f3ce
Migrate all nodetool commands from airline to picocli
Replace io.airlift:airline dependency with info.picocli:picocli across
all nodetool command implementations. This migration includes:

- Convert 160+ nodetool command classes from airline to picocli
- Add AbstractCommand base class for commands and utility methods
- Add NodetoolCommand top-level class for the cli utility
- Update all command classes to use @Command, @Option, and @Parameters
- Add plain text files to test command help output
- Add mock test classes for improved test coverage and parse validation
- Modify test infrastructure to work with picocli-based commands
- Add new layouts for cli formatting to preserve backwards compatibility

The migration maintains backward compatibility while providing improved
command-line parsing, better help system, and more robust argument
validation through picocli enhanced features.

patch by Maxim Muzafarov; reviewed by Caleb Rackliffe, Dmitry Konstantinov, Stefan Miklosovic for CASSANDRA-17445
2025-07-26 18:19:18 +02:00
mck fdc1006443
Merge branch 'cassandra-5.0' into trunk
* cassandra-5.0:
  Remove auto-installation of golang when generating native protocol doc pages
2025-05-26 14:41:16 +02:00
mck 1066f6a427
Remove auto-installation of golang when generating native protocol doc pages
patch by Mick Semb Wever; reviewed by Štefan Miklošovič for CASSANDRA-20678
2025-05-26 14:39:58 +02:00
Andy Tolbert f80a234d1e Migrate sstableloader code to its own tools directory and artifact
As part of a broader effort to decouple java driver code from the
server code, this moves sstableloader to its own tools directory.

As sstableloader is also used as a library (CASSANDRA-10637), added
a new artifact 'cassandra-sstableloader' that will get deployed to
maven along with 'cassandra-all'.

While I expect this is likely a niche use case, this will allow users
to continue using BulkExport as a library.

Moves sstableloader-specific targets to its own build.xml in
tools/sstableloader/build.xml.

Also updates IDE project files and circleci to utilize new
sstableloader-specific targets.

patch by Andy Tolbert; reviewed by Stefan Miklosovic and Mick Semb Wever for CASSANDRA-20328
2025-05-18 12:35:52 -05:00
David Capwell f2dd1adccd Accords gradle build fails due to ephemeral issues with rat and checkstyle
patch by David Capwell; reviewed by Michael Semb Wever for CASSANDRA-20590
2025-05-02 11:27:50 -07:00
mck 0459108ca7
Merge branch 'cassandra-5.0' into trunk
* cassandra-5.0:
  In ubuntu2004_test automatically find the latest available patch version for each C* major.minor
2025-04-27 20:19:55 +02:00
Mick Semb Wever ec26d53d6c
In ubuntu2004_test automatically find the latest available patch version for each C* major.minor
Inspired by https://github.com/apache/cassandra-builds/pull/108
Closes https://github.com/apache/cassandra/pull/4025

 patch by Mick Semb Wever; reviewed by Siyao (Jane) He for CASSJAVA-40
2025-04-27 20:18:52 +02:00
Nikolay Izhikov fc97fd1037
Upgrade logback version to 1.5.18 and slf4j dependencies to 2.0.17
patch by Nikolay Izhikov; reviewed by Stefan Miklosovic, Maxim Muzafarov, Brandon Williams for CASSANDRA-20429
2025-04-25 14:24:35 +02:00
David Capwell 777cf84f64 Accord: PreLoadContext must properly and consistently support ranges
patch by David Capwell; reviewed by Benedict Elliott Smith for CASSANDRA-19355
2025-04-17 11:59:50 -07:00
David Capwell a324003c59 Get simulator working (again)
Co-authored-by: Ariel Weisberg <aweisberg@apple.com>
Co-authored-by: Benedict Elliott Smith <benedict@apache.org>
2025-04-17 11:59:49 -07:00
Alex Petrov 169f790cb1 Use pinned Harry version 2025-04-17 11:59:49 -07:00
Jacek Lewandowski bfa0e59f7f CASSANDRA-18774: Fix pre-commit hook 2025-04-17 11:59:48 -07:00
David Capwell 8633a301f7 CEP-15: (C*) Accord message processing should avoid being passed on to a Stage and run directly in the messageing handler
patch by David Capwell; reviewed by Ariel Weisberg, Benedict Elliott Smith for CASSANDRA-18364
2025-04-17 11:59:48 -07:00
David Capwell 6c62cc4ffa Remove git hook for pre-push as it is redundant and causes issues when merging to mainline
patch by David Capwell; reviewed by Caleb Rackliffe for CASSANDRA-18309
2025-04-17 11:59:48 -07:00
Blake Eggleston 34bd73e2a7 CEP-15/Accord Immutable State Refactor
Patch by Blake Eggleston; Reviewed by David Capwell and Benedict Elliott Smith for Cassandra-18192
2025-04-17 11:59:48 -07:00
Blake Eggleston 09c8fa1030 CEP-15 (C*): Messaging and storage engine integration
patch by Blake Eggleston; reviewed by Benedict Elliott Smith, David Capwell for CASSANDRA-17103
2025-04-17 11:59:47 -07:00
Ariel Weisberg 1bcd91f531 Merge branch 'cassandra-5.0' into trunk 2025-04-08 15:22:58 -04:00
Ariel Weisberg 944baa08da Merge branch 'cassandra-4.1' into cassandra-5.0 2025-04-08 15:19:16 -04:00
mck 63e0188b2e
Merge branch 'cassandra-5.0' into trunk
* cassandra-5.0:
  Move generate-snyk-file target dependency from build-project to dependency-check
2025-04-08 16:01:14 +02:00
mck b4f46ec473
Merge branch 'cassandra-4.1' into cassandra-5.0
* cassandra-4.1:
  Move generate-snyk-file target dependency from build-project to dependency-check
2025-04-08 15:32:08 +02:00
mck 09bc381d59
Merge branch 'cassandra-4.0' into cassandra-4.1
* cassandra-4.0:
  Move generate-snyk-file target dependency from build-project to dependency-check
2025-04-08 15:29:08 +02:00
mck f6de28f727
Move generate-snyk-file target dependency from build-project to dependency-check
patch by Mick Semb Wever; reviewed by Brandon Williams, Alex Petrov for CASSANDRA-20319
2025-04-08 15:25:30 +02:00
mck 54bca21dab
Merge branch 'cassandra-5.0' into trunk
* cassandra-5.0:
  Upgrade java-driver-core to 3.12.1 and org.apache coords
2025-04-07 16:15:50 +02:00
mck 694a88bdbe
Upgrade java-driver-core to 3.12.1 and org.apache coords
patch by Mick Semb Wever; reviewed by Brandon Williams for CASSANDRA-17231
2025-04-07 15:45:39 +02:00
Stefan Miklosovic 6468b2898d
Merge branch 'cassandra-5.0' into trunk 2025-04-03 09:19:28 +02:00
Stefan Miklosovic abb3e8bdbb
Merge branch 'cassandra-4.1' into cassandra-5.0 2025-04-03 09:18:23 +02:00
Stefan Miklosovic 147a224a88
Merge branch 'cassandra-4.0' into cassandra-4.1 2025-04-03 09:17:28 +02:00
Doug Rohrer 51cf55747b
Update OWASP dependency checker to version 12.1.0
patch by Doug Rohrer; reviewed by Stefan Miklosovic for CASSANDRA-20501
2025-04-03 09:16:06 +02:00
Stefan Miklosovic 89d153affd
Merge branch 'cassandra-5.0' into trunk 2025-04-02 22:46:32 +02:00
Stefan Miklosovic 27a6ef3ea8
Update netty to 4.1.119.Final and netty-tcnative to 2.0.70.Final
patch by Stefan Miklosovic; reviewed by Dmitry Konstantinov for CASSANDRA-20314
2025-04-02 22:43:52 +02:00
Stefan Miklosovic 9d6c3c43b8
Merge branch 'cassandra-5.0' into trunk 2025-04-02 12:11:24 +02:00
Stefan Miklosovic 7076623ac7
Merge branch 'cassandra-4.1' into cassandra-5.0 2025-04-02 12:07:43 +02:00
Stefan Miklosovic 49ec0dc692
Merge branch 'cassandra-4.0' into cassandra-4.1 2025-04-02 12:04:07 +02:00
Stefan Miklosovic 73f0e2e401
Suppress CVE-2025-25193
patch by Stefan Miklosovic; reviewed by Michael Semb Wever, Brandon Williams for CASSANDRA-20504
2025-04-02 11:52:11 +02:00
Mick Semb Wever 41b8fd0da4
Merge branch 'cassandra-5.0' into trunk
* cassandra-5.0:
  ninja-fix – python2 compat on .build/generate-snyk-file
2025-03-30 14:03:39 +02:00
Mick Semb Wever 11eb601352
Merge branch 'cassandra-4.1' into cassandra-5.0
* cassandra-4.1:
  ninja-fix – python2 compat on .build/generate-snyk-file
2025-03-30 14:03:01 +02:00
Mick Semb Wever 5baedef1d0
Merge branch 'cassandra-4.0' into cassandra-4.1
* cassandra-4.0:
  ninja-fix – python2 compat on .build/generate-snyk-file
2025-03-30 13:57:25 +02:00
Mick Semb Wever e2a881959b
ninja-fix – python2 compat on .build/generate-snyk-file
debian packaging still uses python2
redhat packaging clobbers the exec bit on git clones
2025-03-30 13:55:41 +02:00
Mick Semb Wever 68a4e6f690
Merge branch 'cassandra-5.0' into trunk
* cassandra-5.0:
  Autogenerate toplevel .snyk file from owasp suppressions
2025-03-30 09:34:30 +02:00
Mick Semb Wever 1311766ad1
Merge branch 'cassandra-4.1' into cassandra-5.0
* cassandra-4.1:
  Autogenerate toplevel .snyk file from owasp suppressions
2025-03-30 09:32:10 +02:00
Mick Semb Wever ef3dc6491e
Merge branch 'cassandra-4.0' into cassandra-4.1
* cassandra-4.0:
  Autogenerate toplevel .snyk file from owasp suppressions
2025-03-30 09:31:04 +02:00
Mick Semb Wever 9abed87ba4
Autogenerate toplevel .snyk file from owasp suppressions
patch by Mick Semb Wever; reviewed by Brandon Williams for CASSANDRA-20319
2025-03-30 09:27:39 +02:00
Stefan Miklosovic 9951225280
Merge branch 'cassandra-5.0' into trunk 2025-03-19 12:35:10 +01:00
Stefan Miklosovic 8a98305aee
Merge branch 'cassandra-4.1' into cassandra-5.0 2025-03-19 12:31:35 +01:00
Brandon Williams e640fbf384 Merge branch 'cassandra-5.0' into trunk 2025-03-11 15:12:37 -05:00
Brandon Williams d509d2fcbe Suppress CVE-2024-12801
Patch by brandonwilliams; reviewed by smiklosovic for CASSANDRA-20412
2025-03-11 15:12:11 -05:00
Brandon Williams d1a83e5f8a Merge branch 'cassandra-4.0' into cassandra-4.1 2025-03-11 15:10:50 -05:00
Brandon Williams 4a66f68cba Suppress CVE-2024-12801
Patch by brandonwilliams; reviewed by smiklosovic for CASSANDRA-20412
2025-03-11 15:10:06 -05:00
Brandon Williams f414a3ef3e Merge branch 'cassandra-5.0' into trunk 2025-03-11 15:09:00 -05:00
Brandon Williams 0e0ff79dd6 Suppress CVE-2024-12798
Patch by brandonwilliams; reviewed by smiklosovic for CASSANDRA-20408
2025-03-11 15:08:25 -05:00
Brandon Williams 25035e38f0 Merge branch 'cassandra-4.0' into cassandra-4.1 2025-03-11 15:07:53 -05:00
Brandon Williams 393901a858 Suppress CVE-2024-12798
Patch by brandonwilliams; reviewed by smiklosovic for CASSANDRA-20408
2025-03-11 15:05:53 -05:00
Stefan Miklosovic cc63d3cd83
Merge branch 'cassandra-5.0' into trunk 2025-03-06 14:31:05 +01:00
Stefan Miklosovic 4f382d93f5
Merge branch 'cassandra-4.1' into cassandra-5.0 2025-03-06 14:27:06 +01:00
mck a88ff20469
Merge branch 'cassandra-5.0' into trunk
* cassandra-5.0:
  Remove REPEATED_TESTS from repeated tests script
2024-12-23 07:28:40 +11:00
mck 0d05233bc8
Remove REPEATED_TESTS from repeated tests script
patch by Mick Semb Wever; reviewed by Štefan Miklošovič for CASSANDRA-20139
2024-12-23 07:23:56 +11:00
mck 8e355197f0
Merge branch 'cassandra-5.0' into trunk
* cassandra-5.0:
  Repeatable test runs, and named command line options, for test scripts
2024-12-09 15:55:36 +11:00
Bereng 70ec86c576
Repeatable test runs, and named command line options, for test scripts
Each test type has a -repeat suffixed companion, used with the `-e REPEATED_TESTS_COUNT` option.

 patch by Berenguer Blasi; reviewed by Mick Semb Wever, Brandon Williams for CASSANDRA-18942
2024-12-09 15:52:23 +11:00
Stefan Miklosovic 15ed18e9d4
Merge branch 'cassandra-5.0' into trunk 2024-10-31 16:30:47 +01:00
Stefan Miklosovic 194e632ab3
Ban the usage of "var" instead of full types in the production code
patch by Stefan Miklosovic; reviewed by Brandon Williams for CASSANDRA-20038
2024-10-31 16:19:54 +01:00
mck 916486b34e
Merge branch 'cassandra-5.0' into trunk
* cassandra-5.0:
  Suppress CVE-2024-45772 lucene-core-9.7.0.jar
2024-10-29 12:44:35 +01:00
mck 3550b88307
Suppress CVE-2024-45772 lucene-core-9.7.0.jar
CVE in Lucene Replicator which the project doesn't use.

 patch by Mick Semb Wever; reviewed by Brandon Williams, Caleb Rackliffe for CASSANDRA-20024
2024-10-29 12:40:55 +01:00
Ata İlhan Köktürk 46b36f23cd
Explicitly localize strings to Locale.US for internal implementation
There is inconsistent usage of toLowerCase/toUpperCase methods in the codebase.
Somewhere we already use Locale.US, somewhere not. That might cause various issues in runtime
as shown in CASSANDRA-19953 ticket when an environment Cassandra runs in has different locale from expected.
In this patch, all such method calls explicitly set their locale to Locale.US. This patch also contains
a checkstyle rule which fails the compilation if toLowerCase or toUpperCase is used.
We prefer calls to methods in LocalizeString class which use US locale.

patch by Ata İlhan Köktürk; reviewed by Stefan Miklosovic, Brandon Williams for CASSANDRA-19953

Co-authored-by: Maxwell Guo <cclive1601@gmail.com>
Co-authored-by: Stefan Miklosovic <smiklosovic@apacheorg>
2024-10-29 08:58:01 +01:00
Mick Semb Wever 6bbe85ef51
Merge branch 'cassandra-5.0' into trunk
* cassandra-5.0:
  increment to version 5.0.3
2024-10-20 00:57:05 +02:00