Commit Graph

544 Commits

Author SHA1 Message Date
Mick Semb Wever 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
Mick Semb Wever 80fd439be1
Merge branch 'cassandra-4.0.0' into cassandra-4.0 2021-07-08 23:44:06 +02:00
Mick Semb Wever 09a387bd3d
Change version from 4.0-rc3 to 4.0.0 2021-07-08 23:28:37 +02:00
Mick Semb Wever 1de960b433
ninja-fix: return cassandra-4.0's version and debian/changelog to 4.0-rc3 (4.0.x version numbers are not yet supported: CASSANDRA-16781 and CASSANDRA-16649) 2021-07-02 15:46:10 +02:00
Mick Semb Wever c79124d5e6
Merge branch 'cassandra-4.0.0' into cassandra-4.0 2021-06-30 21:55:25 +02:00
Mick Semb Wever d13bef96fd
Increment version to 4.0-rc3 2021-06-30 21:53:31 +02:00
Mick Semb Wever 4c98576533
Prepare debian changelog for 4.0-rc2 2021-06-27 16:37:09 +02:00
Brandon Williams b96a48e63d Merge branch 'cassandra-3.0' into cassandra-3.11 2021-06-16 13:52:00 -05:00
Brandon Williams 2e2bcc5261 Add 'python2' to debian packaging for Ubuntu.
Patch by brandonwilliams, reviewed by mck for CASSANDRA-16605
2021-06-16 13:49:21 -05:00
Mick Semb Wever bd488e49f2
Increment version to 4.0-rc2 2021-04-25 13:56:07 +02:00
Mick Semb Wever 3282f5ecf1
Prepare debian changelog for 4.0-rc1 2021-04-21 19:32:21 +02:00
Mick Semb Wever 2ec96ae669
Merge branch 'cassandra-3.0' into cassandra-3.11 2021-04-19 17:34:05 +02:00
Mick Semb Wever 50a97a0d76
Merge branch 'cassandra-2.2' into cassandra-3.0 2021-04-19 17:29:00 +02:00
Mick Semb Wever 53b0661cbb
Fix rat checking for files with missing license headers
patch by Mick Semb Wever; reviewed by Brandon Williams, Ekaterina Dimitrova for CASSANDRA-16558
2021-04-19 17:18:26 +02:00
Vicente Jimenez Aguilar 99b6095ecc Fix init script for debian Buster
Patch by Vicente Jimenez Aguilar, reviewed by brandonwilliams for
CASSANDRA-15770
2021-04-16 08:14:38 -05:00
Mick Semb Wever cf39d03127
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-16391
2021-04-02 10:17:08 +02:00
Mick Semb Wever 2facbc97ea
Prepare debian changelog for 4.0-rc1 2021-03-26 20:56:21 +01:00
Mick Semb Wever 8f5b7fec71
Change version 4.0-beta5 to 4.0-rc1 2021-03-26 20:45:34 +01:00
Brandon Williams cf0be97894 Revert "Update debian packaging to python3"
This reverts commit 8c43f510a3.
2021-03-09 17:23:43 -06:00
Brandon Williams 6524903c22 Revert "Ninja update debian packaging to python3 from python for CASSANDRA-16478"
This reverts commit c775ea3fa7.
2021-03-09 17:23:43 -06:00
Brandon Williams c8d239436f Revert "Remove python3:Depends from Debian packaging"
This reverts commit 2022cfe073.
2021-03-09 17:23:43 -06:00
Brandon Williams ce075b3ee4 Merge branch 'cassandra-3.0' into cassandra-3.11 2021-03-09 17:21:02 -06:00
Brandon Williams 03d79c06d5 Revert "Update debian packaging to python3"
This reverts commit 8c43f510a3.
2021-03-09 17:20:50 -06:00
Brandon Williams 8441d88d6d Revert "Ninja update debian packaging to python3 from python for CASSANDRA-16478"
This reverts commit c775ea3fa7.
2021-03-09 17:20:01 -06:00
Brandon Williams a895724c2e Revert "Remove python3:Depends from Debian packaging"
This reverts commit 2022cfe073.
2021-03-09 17:19:49 -06:00
Brandon Williams 92b48a73be Merge branch 'cassandra-3.11' into trunk 2021-03-05 08:27:43 -06:00
Brandon Williams 034a9375e5 Merge branch 'cassandra-3.0' into cassandra-3.11 2021-03-05 08:26:38 -06:00
Brandon Williams 2022cfe073 Remove python3:Depends from Debian packaging
Patch by brandonwilliams, reviewed by Alexander Dejanovski for
CASSANDRA-16480
2021-03-05 08:25:34 -06:00
Brandon Williams d29dd643df Merge branch 'cassandra-3.11' into trunk 2021-03-03 07:39:03 -06:00
Brandon Williams 0f2c9da47a Merge branch 'cassandra-3.0' into cassandra-3.11 2021-03-03 07:38:45 -06:00
Brandon Williams c775ea3fa7 Ninja update debian packaging to python3 from python for CASSANDRA-16478 2021-03-03 07:38:33 -06:00
Mick Semb Wever e2b5c0f7ef
Merge branch 'cassandra-3.11' into trunk 2021-02-27 17:07:50 +01:00
Mick Semb Wever a311109e31
Merge branch 'cassandra-3.0' into cassandra-3.11 2021-02-27 17:01:28 +01:00
Brandon Williams 8c43f510a3
Update debian packaging to python3
patch by Brandon Williams; reviewed by Mick Semb Wever for CASSANDRA-16396
2021-02-27 17:00:09 +01:00
Mick Semb Wever b04429b57c
ninja-fix debian cassandra.yaml patch for CASSANDRA-14793 2021-02-04 16:38:33 +01:00
Alex Petrov ed51d02f7c Increment version to 3.11.11 2021-02-01 16:02:21 +01:00
Alex Petrov f35ab19dbe Increment version to 3.0.25 2021-02-01 15:59:15 +01:00
Alex Petrov 181a496929 Prepare debian changelog for 3.11.10 2021-01-29 13:27:54 +01:00
Alex Petrov 6748ecd63c Prepare debian changelog for 3.0.24 2021-01-29 12:21:13 +01:00
Mick Semb Wever 200615ded5
Increment version to 4.0-beta5 2020-12-30 12:47:53 +01:00
Mick Semb Wever b0c50c10db
Prepare debian changelog for 4.0-beta4 2020-12-18 18:33:39 +01:00
Mick Semb Wever 2346ed8241
Offline token allocation strategy generator tool
Provides the tools/bin/generate-tokens script that can be used to pregenerate allocation strategy tokens.
Refactors TokenAllocation for extensibility (and better re-use between strategies), and adds OfflineTokenAllocator.
TokenMetadata now has a configurable snitch (instead of hardcoded to DatabaseDescriptor.getEndpointSnitch()) for testability.
Adds logging of growth and stddev changes to allocate_tokens_for_local_replication_factor usages.

 patch by Mick Semb Wever; reviewed by Paul Motta, Ekaterina Dimitrova for CASSANDRA-16205
2020-12-03 19:20:59 +01:00
Mick Semb Wever f45b1edc91
Merge branch 'cassandra-3.11' into trunk 2020-11-04 13:03:42 +01:00
Mick Semb Wever 385434881f
Merge branch 'cassandra-3.0' into cassandra-3.11 2020-11-04 12:48:42 +01:00
Mick Semb Wever b6ef9b22f2
Merge branch 'cassandra-2.2' into cassandra-3.0 2020-11-04 12:42:20 +01:00
Mick Semb Wever 140048f5b7
Increment versions to 2.2.20, 3.0.24, 3.11.10, 4.0-beta4 2020-11-04 12:39:05 +01:00
Mick Semb Wever be716b46f2
Prepare debian changelog for 4.0-beta3 2020-10-29 13:00:34 +01:00
Mick Semb Wever 5ef75dd96c
Prepare debian changelog for 3.11.9 2020-10-29 12:33:00 +01:00
Mick Semb Wever 31530ff5ac
Prepare debian changelog for 3.0.23 2020-10-29 12:04:50 +01:00
Mick Semb Wever 0d9462efc2
Prepare debian changelog for 2.2.19 2020-10-29 11:36:14 +01:00
Marcus Eriksson 9a30167909 ninja fix build, add jmxtool to rpm and deb packaging 2020-09-16 12:55:44 +02:00
Mick Semb Wever fc87d3e0ab
Merge branch 'cassandra-3.11' into trunk 2020-08-31 21:02:14 +02:00
Mick Semb Wever ca37de06ef
Merge branch 'cassandra-3.0' into cassandra-3.11 2020-08-31 21:00:57 +02:00
Mick Semb Wever 0eaed71d1d
Merge branch 'cassandra-2.2' into cassandra-3.0 2020-08-31 20:59:29 +02:00
Mick Semb Wever 815de9982a
Merge branch 'cassandra-2.1' into cassandra-2.2 2020-08-31 20:57:58 +02:00
Mick Semb Wever 0271653f27
Increment versions after releases 2.1.22, 2.2.18, 3.0.22, 3.11.8, 4.0-beta2 2020-08-31 20:55:39 +02:00
Mick Semb Wever 56eadf2004
Prepare debian changelog for 4.0-beta2 2020-08-28 15:54:49 +02:00
Mick Semb Wever 8b29b69863
Prepare debian changelog for 3.11.8 2020-08-28 15:13:27 +02:00
Mick Semb Wever 45331bb612
Prepare debian changelog for 3.0.22 2020-08-28 14:49:52 +02:00
Mick Semb Wever d4938cf4e4
Prepare debian changelog for 2.2.18 2020-08-28 14:25:39 +02:00
Mick Semb Wever 94e9149c22
Prepare debian changelog for 2.1.22 2020-08-28 13:16:01 +02:00
Mick Semb Wever a8808153cf
fix debian changelog after 3.11.7
(`git cherry-pick -n 9fe62b3`)
2020-07-24 21:58:33 +02:00
Mick Semb Wever 972da6fcff
Prepare debian changelog for 4.0-beta1 2020-07-17 23:22:38 +02:00
Mick Semb Wever 5e76771136
Prepare debian changelog for 4.0-beta1 2020-07-14 23:42:00 +02:00
Mick Semb Wever e39d1da325
Prepare debian changelog for 3.0.21 2020-07-14 22:15:26 +02:00
Mick Semb Wever cd006d275a
Prepare debian changelog for 2.2.17 2020-07-14 21:31:28 +02:00
Stefan Miklosovic ecf2c9ccd4
Add fqltool and auditlogviewer to rpm and deb packages
patch by Stefan Miklosovic; reviewed by Mick Semb Wever for CASSANDRA-14712
2020-06-03 18:31:26 +02:00
Brandon Williams 712b43408a Merge branch 'cassandra-3.11' into trunk 2020-04-29 12:03:53 -05:00
Brandon Williams 5fe434c4ab Merge branch 'cassandra-3.0' into cassandra-3.11 2020-04-29 12:03:31 -05:00
Vicente Jimenez Aguilar 469c6496ae Fix init script for debian Buster
Patch by Vicente Jimenez Aguilar, reviewed by brandonwilliams for
CASSANDRA-15770
2020-04-29 12:01:34 -05:00
Mick Semb Wever d00c004cc1
Prepare debian changelog for 4.0-alpha4 2020-04-11 00:28:22 +02:00
Brandon Williams 324267b3c0 Merge branch 'cassandra-3.11' into trunk 2020-02-26 11:51:01 -06:00
Michael Shuler 8f958195cd Bump version to 3.11.7 2020-02-14 18:49:22 -06:00
Michael Shuler 899a4fd663 Bump version to 3.0.21 2020-02-14 18:44:09 -06:00
Michael Shuler 5f0cf80c0a Bump version to 2.2.17 2020-02-14 18:41:47 -06:00
Mick Semb Wever cb779ab9a6
Prepare debian changelog for 3.11.6 2020-02-10 23:54:06 +01:00
Mick Semb Wever 89edf5073b
Prepare debian changelog for 3.0.20 2020-02-10 22:53:37 +01:00
Mick Semb Wever c4d9e9ca4a Prepare debian changelog for 2.2.16 2020-02-10 10:55:15 +01:00
Mick Semb Wever 6aa68ef608 ninja-fix: correct debian/changelog version, author, timestamp (CASSANDRA-15541) 2020-02-10 09:34:03 +11:00
Mick Semb Wever a064bbd264
Increment version to 4.0-alpha4 2020-02-07 21:18:16 +01:00
Mick Semb Wever 729146a074
Merge branch 'cassandra-3.11' into trunk 2020-01-29 23:34:34 +01:00
Mick Semb Wever 37ce4618b5
Merge branch 'cassandra-3.0' into cassandra-3.11 2020-01-29 23:33:30 +01:00
Mick Semb Wever 7816301ef2
Merge branch 'cassandra-2.2' into cassandra-3.0 2020-01-29 23:19:17 +01:00
Michael Shuler 6d93f046c2 Increment version to 4.0-alpha3 2019-10-29 16:17:35 -05:00
Michael Shuler fb50d823b6 Increment version to 3.11.6 2019-10-29 16:15:49 -05:00
Michael Shuler ae366ba615 Increment version to 3.0.20 2019-10-29 16:11:57 -05:00
Michael Shuler a593d7b358 Increment version to 2.2.16 2019-10-29 16:09:30 -05:00
Michael Shuler 4ee4ceea28 Fix 2.2 deb Build-Depends JDK version to match build.xml source.version 2019-10-24 09:49:13 -05:00
Michael Shuler 53bdc64a0e Prepare for release, set version build date, fix whitespace 2019-10-24 09:14:05 -05:00
Michael Shuler 94577bc4dc Prepare for release, set version build date, fix whitespace/typo 2019-10-24 09:00:41 -05:00
Michael Shuler 98f56c1208 Prepare for release, set version build date, fix whitespace 2019-10-24 08:57:29 -05:00
Michael Shuler f00e01f0b2 Prepare for release, set version build date 2019-10-24 08:54:03 -05:00
Mick Semb Wever 21ebba85ac
Update version to 4.0-alpha2 2019-09-10 07:17:51 +02:00
Michael Shuler fa167135f8 Set debian/changelog version to 4.0~alpha1 2019-09-03 11:52:24 -05:00
Michael Shuler 75fde25a75 Merge branch 'cassandra-3.0' into cassandra-3.11 2019-06-27 09:52:42 -05:00
Michael Shuler dc23631ab1 Update log directory patch for deb package
Patch by Michael Shuler; Reviewed by Jon Haddad for CASSANDRA-15185
2019-06-27 09:49:43 -05:00
Michael Shuler 61b77ac2b0 Update log directory patch for 4.0 deb package
Patch by Michael Shuler; Reviewed by Jon Haddad for CASSANDRA-15185
2019-06-26 14:30:39 -05:00
Michael Shuler 3a87604e4c Use quilt to patch cassandra.in.sh in Debian packaging
Patch by Michael Shuler; Reviewed by Jan Karlsson for CASSANDRA-14710
2019-05-09 10:55:09 -05:00
Ariel Weisberg 2a7091616e Merge branch 'cassandra-3.11' into trunk 2019-02-13 13:01:39 -05:00
Ariel Weisberg 4013eacd9d Merge branch 'cassandra-3.0' into cassandra-3.11 2019-02-13 12:58:23 -05:00