This is an automated email from the ASF dual-hosted git repository. mck pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 5f9de8ca130595d418451ebfd78fea7e6d762fce Merge: a78504f541 a2e55684de Author: mck <[email protected]> AuthorDate: Mon Mar 16 22:05:16 2026 +0100 Merge branch 'cassandra-5.0' into trunk * cassandra-5.0: Rate limit password changes .build/check-code.sh | 4 ++-- .jenkins/Jenkinsfile | 6 ++++-- CHANGES.txt | 1 + 3 files changed, 7 insertions(+), 4 deletions(-) diff --cc .build/check-code.sh index 28bc5c576a,28bc5c576a..15ded7d374 --- a/.build/check-code.sh +++ b/.build/check-code.sh @@@ -23,6 -23,6 +23,6 @@@ command -v ant >/dev/null 2>&1 || { ech [ -d "${CASSANDRA_DIR}" ] || { echo >&2 "Directory ${CASSANDRA_DIR} must exist"; exit 1; } [ -f "${CASSANDRA_DIR}/build.xml" ] || { echo >&2 "${CASSANDRA_DIR}/build.xml must exist"; exit 1; } --# execute --ant -f "${CASSANDRA_DIR}/build.xml" check # dependency-check # FIXME dependency-check now requires NVD key downloaded first ++# execute. memory needs to fit within the specified container size, see .jenkins/Jenkinsfile ++ANT_OPTS="-Xmx1g" ant -f "${CASSANDRA_DIR}/build.xml" check # dependency-check # FIXME dependency-check now requires NVD key downloaded first exit $? diff --cc .jenkins/Jenkinsfile index 163968934e,faf3f410cf..25cac0c3f8 --- a/.jenkins/Jenkinsfile +++ b/.jenkins/Jenkinsfile @@@ -166,13 -166,13 +166,15 @@@ def tasks() def buildSteps = [ 'jar': [script: 'build-jars.sh', toCopy: null], 'artifacts': [script: 'build-artifacts.sh', toCopy: 'apache-cassandra-*.tar.gz,apache-cassandra-*.jar,apache-cassandra-*.pom'], -- 'lint': [script: 'check-code.sh', toCopy: null], ++ 'lint': [script: 'check-code.sh', size: 'medium', toCopy: null], 'debian': [script: 'build-debian.sh', toCopy: 'cassandra_*,cassandra-tools_*'], 'redhat': [script: 'build-redhat.sh rpm', toCopy: '*.rpm'], ] buildSteps.each() { it.value.put('type', 'build') -- it.value.put('size', 'small') ++ if (!it.value['size']) { ++ it.value.put('size', 'small') ++ } it.value.put('splits', 1) } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
