Commit Graph

25 Commits

Author SHA1 Message Date
Stefan Miklosovic ed04f46b27
Merge branch 'cassandra-4.1' into cassandra-5.0 2025-09-26 16:08:54 +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
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 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
Stefan Miklosovic abb3e8bdbb
Merge branch 'cassandra-4.1' into cassandra-5.0 2025-04-03 09:18:23 +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
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 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 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 e8d1d6e2d2
Merge branch 'cassandra-4.1' into cassandra-5.0 2024-09-04 15:39:28 +02:00
Stefan Miklosovic c738e0d455
Merge branch 'cassandra-3.0' into cassandra-3.11 2024-09-04 15:35:06 +02:00
Stefan Miklosovic faaffe867c
Upgrade OWASP dependency check to 10.0.4
patch by Stefan Miklosovic; reviewed by Brandon Williams for CASSANDRA-19895
2024-09-04 15:33:31 +02:00
Stefan Miklosovic 37f6a5de20
Merge branch 'cassandra-4.1' into cassandra-5.0 2024-07-02 00:18:54 +02:00
Stefan Miklosovic 42c2bd4bad
Merge branch 'cassandra-3.0' into cassandra-3.11 2024-07-02 00:11:47 +02:00
Stefan Miklosovic 64b1ccf881
Update ant dependency-check to version 10.0.0
patch by Stefan Miklosovic; reviewed by Brandon Williams for CASSANDRA-19738
2024-07-02 00:07:10 +02:00
Ariel Weisberg fdfc0019de Merge branch 'cassandra-4.1' into cassandra-5.0 2024-03-22 16:50:22 -04:00
Ariel Weisberg de2a965a18 Merge branch 'cassandra-3.0' into cassandra-3.11 2024-03-22 16:42:31 -04:00
Ariel Weisberg 38eb339557 Add support for providing nvdDatafeedUrl to OWASP
patch by Ariel Weisberg; reviewed by Berenguer Blasi for CASSANDRA-19484
2024-03-22 16:41:57 -04:00
Jacek Lewandowski 790798dea0 Merge branch 'cassandra-4.1' into cassandra-5.0
* cassandra-4.1:
  Updated the OWASP plugin to 9.0.5 and refactored dependency checks
2023-12-20 12:59:55 +01:00
Jacek Lewandowski 09c46750f6 Merge branch 'cassandra-3.0' into cassandra-3.11
* cassandra-3.0:
  Updated the OWASP plugin to 9.0.5 and refactored dependency checks
2023-12-20 12:59:52 +01:00
Jacek Lewandowski 4c3b96e4cd Updated the OWASP plugin to 9.0.5 and refactored dependency checks
Configured OWASP database to use caching and NVD key. Properties can be
configured in ~/.ant/build.properties and define both the key and
the storage location

Patch by Jacek Lewandowski; reviewed by Maxim Muzafarov, Stefan Miklosovic for CASSANDRA-19146
2023-12-20 12:59:51 +01:00
Mick Semb Wever f5df4b219e
Move build and test scripts in-tree, under .build/
See .build/README.md  .Build and test scripts cover all CI activities in an CI agnostic manner. Scripts are found in non-docker and dockerised variants.

The non-docker scripts are found first under .build/ .These interact directly with ant, providing additional checks and environment setup. It is intended that what can be pushed down into the base ant build layer should be. The
debian and redhat build scripts are hidden under .build/docker because they are generally not usuable outside of their corresponding linux dists, and we don't want to encourage anything to the contrary.  Bring the artifact/deb/rpm
build scripts (and associated docker images) from cassandra-builds repo to the .build directory.  These packaging script for debian and redhat are now separated from the artifacts scripts. An additional build script check-code.sh
has been added that is solely responsible for all linter and code checks (includes owasp dependency checker).  Only JDK11 and JDK17 are supported (as JDK8 is soon to be dropped).  Scripts do not clean (or realclean) so that
scripts can be better pipelined, but `ant jar` was required to be added to circleci and ci-cassandra.a.o cqlsh-tests.  Scripts can define a custom BUILD_DIR (build.dir) which can permit running parrallel builds off the same source
(though not all tests support this, or their support for it has atrophied).  All build and test artifacts, results, and logs are found under build/ (or the BUILD_DIR).  The build local venv and .ccm directories are now also
created under build (or BUILD_DIR).  The test venv, logs and results are wiped each run.  Use a separate mktemp directory each run, under /tmp (respect /tmp responsibility, and python fails when tmpdir is on a docker volume).
Don't set CASSANDRA_HOME when running python dtests (and fail-fast if `ant artifacts` was used to build instead of `ant jar`).

The docker scripts are found lower down under .build/docker/ .These scripts re-used the non-docker scripts inside containers. The docker images are versioned controlled in the same directory as dockerfiles, and tagged by their
md5sums.  When running the docker scripts these docker images will, if not in the local registry, will first be attempted to be pulled from dockerhub and only then fallback to be built locally.  This allows the dockerfiles to be
modified in existing patches and be run in existing CI as-is.  Docker scripts timeout after one hour.  virtualenv-clone is used, re-using the python versioned venvs in the image saves time over creating new ones each run.  The inner-spliting of docker containers has been removed.  It added a lot of complexity, for the most part duplicating the splitting concept, for little performance gain.

Ant target 'generate-unified-test-report' added, used for aggregating test reports and printing a summary.

 patch by Mick Semb Wever; reviewed by Brandon Williams, Josh McKenzie, Maxim Muzafarov, Stefan Miklosovic for CASSANDRA-18133
2023-07-12 12:59:37 +02:00
Brandon Williams 493d15fffa Upgrade to OWASP 8.3.1
Patch by brandonwilliams; reviewed by edimitrova for CASSANDRA-18650
2023-07-07 10:40:37 -05:00
Stefan Miklosovic fe40f626c1 OWASP follow-up - version-aware dependency check and removed useTimestamp flag upon zip downloading, update to 6.3.2
patch by Stefan Miklosovic; reviewed by Brandon Williams for CASSANDRA-14612
2021-10-05 16:25: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