Merge branch 'cassandra-5.0' into trunk

This commit is contained in:
Stefan Miklosovic 2023-10-19 15:26:53 +02:00
commit 088f3ea3e9
No known key found for this signature in database
GPG Key ID: 32F35CB2F546D93E
1 changed files with 1 additions and 2 deletions

View File

@ -97,7 +97,6 @@ _build_all_dtest_jars() {
rm -fR ${TMP_DIR}/cassandra-dtest-jars
pushd $TMP_DIR >/dev/null
until git clone --quiet --depth 1 --no-single-branch https://github.com/apache/cassandra.git cassandra-dtest-jars ; do echo "git clone failed… trying again… " ; done
chmod -R ag+rwx cassandra-dtest-jars
popd >/dev/null
fi
@ -106,7 +105,7 @@ _build_all_dtest_jars() {
pushd ${TMP_DIR}/cassandra-dtest-jars >/dev/null
for branch in cassandra-4.0 cassandra-4.1 cassandra-5.0 trunk ; do
git reset --hard HEAD && git clean -qxdff || echo "failed to reset/clean ${TMP_DIR}/cassandra-dtest-jars… continuing…"
git clean -qxdff && git reset --hard HEAD || echo "failed to reset/clean ${TMP_DIR}/cassandra-dtest-jars… continuing…"
git checkout --quiet $branch
dtest_jar_version=$(grep 'property\s*name=\"base.version\"' build.xml |sed -ne 's/.*value=\"\([^"]*\)\".*/\1/p')
if [ -f "${DIST_DIR}/dtest-${dtest_jar_version}.jar" ] ; then