Commit Graph

535 Commits

Author SHA1 Message Date
Stefan Miklosovic 59f5e57faf Merge branch 'cassandra-3.11' into cassandra-4.0 2021-09-30 21:34:16 +02:00
Stefan Miklosovic 9bf14a6011 Merge branch 'cassandra-3.0' into cassandra-3.11 2021-09-30 21:32:45 +02:00
Stefan Miklosovic 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
Mick Semb Wever 1038f4489a
Remove duplicate 'lib.download.sha' entries in build-resolver.xml
patch by Mick Semb Wever; reviewed by Zhao Yang for CASSANDRA-16897
2021-08-30 21:44:50 +02:00
David Capwell 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
Marcus Eriksson 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
Mick Semb Wever 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
Mick Semb Wever 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
Mick Semb Wever 3d7c824c1b 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:35:45 -05:00
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
Sam Tunnicliffe 36a0f11221 Merge branch 'cassandra-3.11' into trunk 2021-04-27 12:01:30 +01:00
Sam Tunnicliffe 9449cd3d6e Merge branch 'cassandra-3.0' into cassandra-3.11 2021-04-27 11:57:00 +01:00
Sam Tunnicliffe 4763d5625a Merge branch 'cassandra-2.2' into cassandra-3.0 2021-04-27 11:56:07 +01:00
Sam Tunnicliffe 26163bb12a Follow up fixes to CASSANDRA-16633
* Don't run rat check if git fails or not available
* Check for presence of rat.txt before running eclipse-warnings task
  (to ensure that the report is always generated by CI runs)

Patch by Sam Tunnicliffe; reviewed by Mick Semb Wever for CASSANDRA-16633
2021-04-27 11:12:07 +01:00
Sam Tunnicliffe 9cda055faa Merge branch 'cassandra-3.11' into trunk 2021-04-27 09:31:45 +01:00
Sam Tunnicliffe 87a46c36f0 Merge branch 'cassandra-3.0' into cassandra-3.11 2021-04-27 09:20:25 +01:00
Sam Tunnicliffe ad2f41ef88 Merge branch 'cassandra-2.2' into cassandra-3.0 2021-04-27 09:18:50 +01:00
Sam Tunnicliffe bd270260c8 Only include versioned files in rat-report
Patch by Sam Tunnicliffe; reviewed by Benedict Elliott Smith
and Mick Semb Wever for CASSANDRA-16633
2021-04-27 09:17:56 +01:00
Sam Tunnicliffe 5be6d7e6b1 Only include versioned files in rat-report
Patch by Sam Tunnicliffe; reviewed by Benedict Elliott Smith
and Mick Semb Wever for CASSANDRA-16633
2021-04-27 08:57:50 +01:00
Mick Semb Wever 1ca245f5c8
Merge branch 'cassandra-3.11' into trunk 2021-04-23 15:23:57 +02:00
Mick Semb Wever 618b48db41
Merge branch 'cassandra-3.0' into cassandra-3.11 2021-04-23 15:19:14 +02:00
Mick Semb Wever ad16aa1763
Provide a better failure message when the rat check fails
patch by Mick Semb Wever; reviewed by David Capwell, Ekaterina Dimitrova for CASSANDRA-16620
2021-04-23 14:56:00 +02:00
Ekaterina Dimitrova 8b977d0da9 Ninja fix, add header to the Circle LOWRES and HIGHRES config files 2021-04-19 14:13:49 -04:00
Ekaterina Dimitrova 0adf7baebb Merge branch 'cassandra-3.11' into trunk 2021-04-19 13:54:10 -04:00
Ekaterina Dimitrova eb0f13af8d Merge branch 'cassandra-3.0' into cassandra-3.11 2021-04-19 13:51:18 -04:00
Ekaterina Dimitrova 5c6ae40404 Ninja fix, add header to the Circle LOWRES and HIGHRES config files 2021-04-19 13:34:22 -04:00
Mick Semb Wever 7337fc0ab4
Merge branch 'cassandra-3.11' into trunk 2021-04-19 17:39:10 +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 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
David Capwell 038271cc6f Use source release of python driver from pip rather than GitHub
patch by David Capwell; reviewed by Adam Holmberg, Michael Semb Wever for CASSANDRA-16599
2021-04-15 18:03:51 -07:00
Mick Semb Wever e848d47ed1
Upgrade jflex to 1.8.2
patch by Mick Semb Wever; reviewed by Brandon Williams for CASSANDRA-16576
2021-04-11 21:22:12 +02:00
Marcus Eriksson 6a45728b08 Add JStackJUnitTask to avoid downloading the jar
Patch by marcuse; reviewed by Brandon Williams, David Capwell, Michael Semb Wever for CASSANDRA-16570
2021-04-08 09:47:50 +02:00
David Capwell 51e762c5db When behind a firewall trunk is not buildable, need to allow overriding URLs
patch by David Capwell; reviewed by Brandon Williams, Jon Meredith, Michael Semb Wever for CASSANDRA-16563
2021-04-07 11:14:45 -07:00
Mick Semb Wever 17d379ca1b
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-04-06 19:09:08 +02: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