Commit Graph

1615 Commits

Author SHA1 Message Date
David Capwell 304386a2d2 Merge branch 'cassandra-4.0' into cassandra-4.1 2026-04-17 04:54:08 -07:00
David Capwell de20468edd generate-eclipse-files missing simulator/harry and missing src class path
patch by David Capwell; reviewed by Aleksey Yeschenko for CASSANDRA-21312
2026-04-17 04:51:54 -07:00
mck e418109303
Merge branch 'cassandra-4.0' into cassandra-4.1
* cassandra-4.0:
  Increment versions to 4.0.21, 4.1.12, 5.0.8
2026-03-23 09:54:33 +01:00
mck 636409baac
Increment versions to 4.0.21, 4.1.12, 5.0.8 2026-03-23 09:51:45 +01:00
Aleksey Yeschenko 65ddddf6fb Fix ant generate-eclipse-files
patch by Aleksey Yeschenko; reviewed by Alex Petrov for CASSANDRA-21215
2026-03-13 14:53:26 +00:00
Abe Ratnofsky 2d0fda4511 Merge branch 'cassandra-4.0' into cassandra-4.1
* cassandra-4.0:
  Switch lz4-java to at.yawk.lz4 version due to CVE
2025-12-18 10:54:14 -08:00
Abe Ratnofsky ec3b425c38 Switch lz4-java to at.yawk.lz4 version due to CVE
Patch by Abe Ratnofsky; reviewed by Jyothsna Konisa, Dmitry Konstantinov for CASSANDRA-21052
2025-12-18 10:51:26 -08:00
Doug Rohrer c988b609b0 Merge branch 'cassandra-4.0' into cassandra-4.1
* cassandra-4.0:
  CASSANDRA-20884 - Move JMX classes to the in-jvm-dtest API project
2025-10-24 14:23:42 -04:00
Doug Rohrer aa0e2f1631 CASSANDRA-20884 - Move JMX classes to the in-jvm-dtest API project
patch by Doug Rohrer; reviewed by Francisco Guerrero and Bernardo Botella Corbi for CASSANDRA-20884
2025-10-24 13:37:08 -04:00
Mick Semb Wever 5d30dc17b8
increment version to 4.0.20 2025-10-20 13:45:57 +02:00
Stefan Miklosovic 02ef8f8a0d
Merge branch 'cassandra-4.0' into cassandra-4.1 2025-09-19 14:18:29 +02:00
Stefan Miklosovic d966547d01
update shaded cassandra-driver-core to 3.11.5
patch by Stefan Miklosovic; reviewed by Brandon Williams for CASSANDRA-20904
2025-09-19 14:12:00 +02:00
Stefan Miklosovic b907c1e973
bump version in build.xml to 4.1.11 2025-09-03 13:36:06 +02:00
Stefan Miklosovic c632e66e85
Merge branch 'cassandra-4.0' into cassandra-4.1 2025-08-28 11:46:58 +02:00
Stefan Miklosovic 29e45b5d82
Increase memory available for javadoc generation
javadoc target is behaving unpredictably, sometimes fails, sometimes does not.
I strongly suspect that it just does not have enough memory available and it fails.
This is currently a blocker for releases. My empirical testing shows that more memory
we assign to javadoc generation, less probable it is it will fail to finish successfuly.

patch by Stefan Miklosovic for CASSANDRA-20868
2025-08-28 11:43:13 +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 aeae910d08
Merge branch 'cassandra-4.0' into cassandra-4.1 2025-08-25 17:24:10 +02:00
Stefan Miklosovic a64a64b915
Update commons-lang3 to 3.18.0
patch by Stefan Miklosovic; reviewed by Brandon Williams for CASSANDRA-20849
2025-08-25 17:21:19 +02:00
Brandon Williams 00f2b3e9f6 increment version 2025-05-28 17:28:46 -05:00
Brandon Williams 56b7e90f1f bump build.xml version 2025-05-19 18:51:44 -05: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
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 8c4e21eeca
Merge branch 'cassandra-4.0' into cassandra-4.1 2025-03-19 12:26:29 +01:00
Stefan Miklosovic a16333387c
Update zstd-jni to 1.5.7-2
patch by Stefan Miklosovic; reviewed by Dmitry Konstantinov for CASSANDRA-20453
2025-03-19 12:24:33 +01:00
Stefan Miklosovic 16bca9d343
Merge branch 'cassandra-4.0' into cassandra-4.1 2025-03-06 14:23:11 +01:00
Stefan Miklosovic ef354d0d5e
Update Zstd library to 1.5.7-1
patch by Stefan Miklosovic; reviewed by Yifan Cai for CASSANDRA-20367
2025-03-06 14:19:01 +01:00
Stefan Miklosovic 8ca0af32f3
Merge branch 'cassandra-3.11' into cassandra-4.0 2025-02-07 12:45:03 +01:00
Stefan Miklosovic ed3f1af723
Merge branch 'cassandra-3.0' into cassandra-3.11 2025-02-07 12:43:10 +01:00
Stefan Miklosovic f340514bbe
Increment version 2025-02-07 12:40:54 +01:00
Stefan Miklosovic 9f5fc9d892
Merge branch 'cassandra-4.0' into cassandra-4.1 2025-02-04 09:59:23 +01:00
Stefan Miklosovic 8e28dd0c17
Merge branch 'cassandra-3.11' into cassandra-4.0 2025-02-04 09:54:09 +01:00
Stefan Miklosovic 82e2c7d991
Merge branch 'cassandra-3.0' into cassandra-3.11 2025-02-04 09:50:02 +01:00
Stefan Miklosovic 7c147ef80e
Increment version 2025-02-04 09:46:26 +01:00
Brandon Williams bdfb3fb9d6 increment version to 4.0.16 2024-11-18 09:01:15 -06:00
Mick Semb Wever ea801625f6
Merge branch 'cassandra-4.0' into cassandra-4.1
* cassandra-4.0:
  increment version to 4.0.15 and 4.1.8
2024-09-26 22:58:35 +02:00
Mick Semb Wever bf8870f763
increment version to 4.0.15 and 4.1.8 2024-09-26 22:55:52 +02:00
Mick Semb Wever 50b2a29e60
Merge branch 'cassandra-4.0' into cassandra-4.1
* cassandra-4.0:
  ninja-fix build.xml version to 4.0.14
2024-09-18 10:31:16 +02:00
Mick Semb Wever 2699bc8dae
ninja-fix build.xml version to 4.0.14 2024-09-18 10:29:51 +02:00
Brandon Williams 5c3efdd35d Increment version 2024-05-20 09:39:22 -05:00
Jacek Lewandowski 445ae1a4b1 Merge branch 'cassandra-4.0' into cassandra-4.1
* cassandra-4.0:
  Fix few types issues and implement types compatibility tests
2024-04-18 12:33:54 +02:00
Jacek Lewandowski f92998190c Fix few types issues and implement types compatibility tests
Patch by Jacek Lewandowski; reviewed by Stefan Miklosovic for CASSANDRA-19479
2024-04-18 12:33:52 +02:00
Brandon Williams 2856a34636 Increment version 2024-04-16 13:26:59 -05:00
Brandon Williams 44f472d742 Increment version 2024-04-15 11:24:55 -05:00
Stefan Miklosovic 95fcefede2
Merge branch 'cassandra-4.0' into cassandra-4.1 2024-02-23 14:51:06 +01:00
Stefan Miklosovic 5430e69e77
Merge branch 'cassandra-3.11' into cassandra-4.0 2024-02-23 14:49:06 +01:00
Stefan Miklosovic af5733124d
Merge branch 'cassandra-3.0' into cassandra-3.11 2024-02-23 14:48:02 +01:00
Jack Green 98eea87aa5
Fix SCM URL links
patch by Jack Green; reviewed by Stefan Miklosovic and Brandon Williams for CASSANDRA-19422
2024-02-23 14:43:41 +01:00