cedde3d991
Merge branch 'cassandra-4.0' into trunk
2021-11-10 11:13:52 +00:00
07b908c78c
Merge branch 'cassandra-3.11' into cassandra-4.0
2021-11-10 11:12:29 +00:00
bfe4a90852
Merge branch 'cassandra-3.0' into cassandra-3.11
2021-11-10 11:11:43 +00:00
e4d96721bf
Merge branch 'cassandra-2.2' into cassandra-3.0
2021-11-10 11:10:04 +00:00
5c7603c2ae
Upgrade to snakeyaml 1.26
...
Patch by brandonwilliams; reviewed by bereng for CASSANDRA-17028
2021-10-15 10:06:57 -05:00
5b82447098
[CASSANDRA-17013] CEP-10 Phase 1: in-jvm-dtest-api changes and version bump
2021-10-07 14:30:20 +01:00
be1f050bc8
[CASSANDRA-16925] CEP-10 Phase 1: Mockable Task Execution
...
Co-authored-by: Benedict Elliott Smith <benedict@apache.org>
Co-authored-by: Sam Tunnicliffe <samt@apache.org>
2021-10-07 14:27:52 +01:00
bcdb575fd3
Merge branch 'cassandra-4.0' into trunk
2021-10-01 15:20:32 +01:00
36266ce257
Merge branch 'cassandra-3.11' into cassandra-4.0
2021-10-01 15:19:35 +01:00
2614f7eeb4
Merge branch 'cassandra-3.0' into cassandra-3.11
2021-10-01 15:18:40 +01:00
0c4653110d
Make -Dtest.methods consistently optional in all Ant test targets
...
patch by Andrés de la Peña; reviewed by Berenguer Blasi for CASSANDRA-17014
2021-10-01 15:17:07 +01:00
3cc59017a4
Merge branch 'cassandra-4.0' into trunk
2021-09-30 21:37:08 +02:00
59f5e57faf
Merge branch 'cassandra-3.11' into cassandra-4.0
2021-09-30 21:34:16 +02:00
9bf14a6011
Merge branch 'cassandra-3.0' into cassandra-3.11
2021-09-30 21:32:45 +02:00
225a4c8faf
add OWASP dependency check to Ant build
...
patch by Stefan Miklosovic; reviewed by Brandon Williams for CASSANDRA-14612
2021-09-30 21:30:36 +02:00
15a2fe00fc
[CASSANDRA-16923] CEP-10 Phase 1: Mockable System Clock
...
Co-authored-by: Benedict Elliott Smith <benedict@apache.org>
Co-authored-by: Aleksey Yeschenko <aleksey@apache.org>
Co-authored-by: Sam Tunnicliffe <samt@apache.org>
2021-09-29 19:38:34 +01:00
e0777ff5ab
Merge branch 'cassandra-4.0' into trunk
2021-09-29 08:07:32 +02:00
e365908ee4
Merge branch 'cassandra-3.11' into cassandra-4.0
2021-09-29 07:57:05 +02:00
095475b9cc
Merge branch 'cassandra-3.0' into cassandra-3.11
2021-09-29 07:49:10 +02:00
6b16b67cd4
update jBCrypt dependency to version 0.4
...
patch by Stefan Miklosovic; reviewed by Dinesh Joshi for CASSANDRA-9384
2021-09-29 07:39:29 +02:00
c7526f943f
Add soft/hard limits to local reads to protect against reading too much data in a single query
...
patch by David Capwell; reviewed by Caleb Rackliffe and Marcus Eriksson for CASSANDRA-16896
2021-09-28 12:49:12 -05:00
7c3935ced3
Merge branch 'cassandra-4.0' into trunk
2021-09-17 17:29:45 -04:00
14af149ed5
Merge branch 'cassandra-3.11' into cassandra-4.0
2021-09-17 17:26:41 -04:00
e4d2802276
Update Jackson from 2.9.10 to 2.12.5
...
patch by Tatu Saloranta; reviewed by Ekaterina Dimitrova, Brandon Williams, Michael Semb Wever for CASSANDRA-16851
2021-09-17 17:25:25 -04:00
7faff38826
Upgrade Caffeiene to 2.9.2
...
Patch by Aleksei Zotov; reviewed by brandonwilliams and mck for
CASSANDRA-15153
2021-09-17 08:51:30 -05:00
dd3d83a819
Upgrade Caffeine to 2.5.6
...
Patch by Aleksei Zotov; reviewed by brandonwilliams and mck for
CASSANDRA-15153
2021-09-17 08:48:35 -05:00
18b2100bc4
Merge branch 'cassandra-4.0' into trunk
2021-09-11 00:38:50 +02:00
05e7cc1553
Merge branch 'cassandra-3.11' into cassandra-4.0
2021-09-11 00:31:25 +02:00
32194ec8d0
Merge branch 'cassandra-3.0' into cassandra-3.11
2021-09-11 00:20:42 +02:00
b6f0864982
Add semver4j to the default shared packages in the jvm dtests
...
(Upgrade to dtest-api-0.0.9)
patch by Mick Semb Wever; reviewed by Alex Petrov for CASSANDRA-16803
2021-09-10 23:55:30 +02:00
9a34ecd4ad
Increment version to 4.0.2
2021-09-07 16:50:51 +01:00
b92620c387
Merge branch 'cassandra-4.0' into trunk
2021-08-30 21:38:40 +02:00
a6ea52118c
Merge branch 'cassandra-3.11' into cassandra-4.0
2021-08-30 21:20:57 +02:00
b0cdaec5ae
Exclude Jackson 1.x transitive dependency of hadoop* provided dependencies
...
patch by Tatu Saloranta; reviewed by Mick Semb Wever for CASSANDRA-16854
2021-08-30 21:09:17 +02:00
1b5545beef
Merge branch 'cassandra-4.0' into trunk
2021-08-26 15:09:04 -07:00
42025fd73a
Bump zstd-jni version to 1.5.0-4
...
patch by Yifan Cai; reviewed by Dinesh Joshi for CASSANDRA-16884
2021-08-26 15:07:53 -07:00
ad24942481
Add TTL support to nodetool snapshots
...
Patch by Abi Palagashvili; Reviewed by Paulo Motta and Stefan Miklosovic for CASSANDRA-16789
Co-authored-by: Paulo Motta <pauloricardomg@gmail.com>
Co-authored-by: Stefan Miklosovic <smiklosovic@apache.org>
Closes #1046
2021-08-26 14:57:58 -03:00
4b3f07fc74
allow blocking IPs from updating metrics about traffic
...
patch by David Capwell; reviewed by Benjamin Lerer, Caleb Rackliffe, Jon Meredith for CASSANDRA-16859
2021-08-20 17:24:16 -07:00
ca6bb2af02
Resolve ant-junit dependency issue CASSANDRA-16827
...
patch by Ekaterina Dimitrova; reviewed by Michael Semb Wever for CASSANDRA-16827
2021-08-10 10:49:09 -04:00
760c7e88b8
Merge branch 'cassandra-3.0' into cassandra-3.11
2021-07-28 14:39:46 -05:00
8e9e4aed99
Incrememnt version
2021-07-28 14:39:11 -05:00
3e54ed76b2
Don't put apidocs (javadoc) into the binary artifact
...
patch by Mick Semb Wever; reviewed by Brandon Williams for CASSANDRA-15561
2021-07-25 11:37:33 -05:00
7fafda8e90
Don't fork jvms in the build
...
On build machines with less than 1GB ram, use ANT_OPTS="-Xmx512m"
patch by Mick Semb Wever; reviewed by Brandon Williams for CASSANDRA-16583
2021-07-25 11:37:33 -05:00
b2cfe2e5d7
Fix warning about multiple versions of ant detected when running ant test patch by Ekaterina Dimitrova; reviewed by Brandon Williams and Mick Semb Wever for CASSANDRA-16571
2021-07-25 11:37:33 -05:00
fd7732389a
Update IDE, Eclipse and NetBeans, classpaths for tests
...
patch by Mick Semb Wever, Berenguer Blasi; reviewd by Ekaterina Dimitrova, Benjamin Lerer for CASSANDRA-16560
2021-07-25 11:37:33 -05:00
c44dfab9b5
Add JStackJUnitTask to avoid downloading the jar
...
Patch by marcuse; reviewed by Brandon Williams, David Capwell, Michael Semb Wever for CASSANDRA-16570
2021-07-25 11:37:32 -05:00
e6950518d1
Offline build mode
...
When all dependencies are already in the local `~/.m2/repository/` we should not be needing an internet connection. ("Offline" mode should be automatic)
patch by Mick Semb Wever; reviewed by Brandon Williams for CASSANDRA-16559
2021-07-25 11:37:32 -05:00
2fdf1d2762
Migrate dependency handling from maven-ant-tasks to resolver-ant-tasks
...
- This removes lib/ from version control.
- The generated pom files are now the source of truth to the project's depdendencies, and the lib/ folder re-created during the build from compile scope dependencies excluding provided and system scopes. Project dependencies are first downloaded to the maven local repository at `~/.m2/repository`.
- Maven is now required to be installed to build, that is the `mvn` command needs to be found in the path.
- The new resolver-ant-tasks targets have been encapsulated into the `build/build-resolver.xml` ant file.
- Most classpaths in build.xml are replaced with resolver:resolve definitions.
- The build-deps-pom generated pom file is now only used for declaring test dependencies.
patch by Mick Semb Wever; reviewed by Brandon Williams for CASSANDRA-16557
2021-07-25 11:37:32 -05:00
e243026c85
Don't put apidocs (javadoc) into the binary artifact
...
patch by Mick Semb Wever; reviewed by Brandon Williams for CASSANDRA-15561
2021-07-25 11:35:45 -05:00
3259d6de37
Migrate dependency handling from maven-ant-tasks to resolver-ant-tasks
...
- This removes lib/ from version control.
- The generated pom files are now the source of truth to the project's depdendencies, and the lib/ folder re-created during the build from compile scope dependencies excluding provided and system scopes. Project dependencies are first downloaded to the maven local repository at `~/.m2/repository`.
- Maven is now required to be installed to build, that is the `mvn` command needs to be found in the path.
- The new resolver-ant-tasks targets have been encapsulated into the `build/build-resolver.xml` ant file.
- Most classpaths in build.xml are replaced with resolver:resolve definitions.
- The build-deps-pom generated pom file is now only used for declaring test dependencies.
patch by Mick Semb Wever; reviewed by Brandon Williams for CASSANDRA-16557
2021-07-25 11:35:45 -05:00
Benedict Elliott Smith