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-builds.git
The following commit(s) were added to refs/heads/trunk by this push:
new 4e67b75 ninja-fix all occurrences of "java.version.11" got remove in
trunk with ac25943. use CASSANDRA_USE_JDK11 instead.
4e67b75 is described below
commit 4e67b753d5d37dd18316d1a4b4144a8f75f80274
Author: Mick Semb Wever <m...@apache.org>
AuthorDate: Wed Jul 12 19:46:04 2023 +0200
ninja-fix all occurrences of "java.version.11" got remove in trunk with
ac25943. use CASSANDRA_USE_JDK11 instead.
---
build-scripts/cassandra-artifacts.sh | 2 +-
build-scripts/cassandra-dtest-pytest-docker.sh | 2 +-
build-scripts/cassandra-dtest-pytest.sh | 2 +-
build-scripts/cassandra-test-docker.sh | 2 +-
build-scripts/cassandra-test.sh | 4 ++--
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/build-scripts/cassandra-artifacts.sh
b/build-scripts/cassandra-artifacts.sh
index 7a8e6b8..e1a71f2 100755
--- a/build-scripts/cassandra-artifacts.sh
+++ b/build-scripts/cassandra-artifacts.sh
@@ -51,7 +51,7 @@ if [ "$java_version" -ge 17 ]; then
elif [ "$java_version" -ge 11 ]; then
java_version="11"
export CASSANDRA_USE_JDK11=true
- if ! grep -q "java.version.11" build.xml ; then
+ if ! grep -q "CASSANDRA_USE_JDK11" build.xml ; then
echo "Skipping build. JDK11 not supported against ${cassandra_version}"
exit 0
fi
diff --git a/build-scripts/cassandra-dtest-pytest-docker.sh
b/build-scripts/cassandra-dtest-pytest-docker.sh
index e321556..78360c8 100755
--- a/build-scripts/cassandra-dtest-pytest-docker.sh
+++ b/build-scripts/cassandra-dtest-pytest-docker.sh
@@ -58,7 +58,7 @@ else
java_version="17"
elif [ "$java_version" -ge 11 ]; then
java_version="11"
- if ! grep -q "java.version.11" build.xml ; then
+ if ! grep -q "CASSANDRA_USE_JDK11" build.xml ; then
echo "Skipping build. JDK11 not supported against $(grep
'property\s*name=\"base.version\"' build.xml |sed -ne
's/.*value=\"\([^"]*\)\".*/\1/p')"
exit 0
fi
diff --git a/build-scripts/cassandra-dtest-pytest.sh
b/build-scripts/cassandra-dtest-pytest.sh
index 194b0a5..6dd60f1 100755
--- a/build-scripts/cassandra-dtest-pytest.sh
+++ b/build-scripts/cassandra-dtest-pytest.sh
@@ -40,7 +40,7 @@ if [ "$java_version" -ge 17 ]; then
elif [ "$java_version" -ge 11 ]; then
export CASSANDRA_USE_JDK11=true
regx_version="(2.2|3.0|3.11|4.0|4.1)(.([0-9]+))?$"
- if ! grep -q "java.version.11" build.xml ; then
+ if ! grep -q "CASSANDRA_USE_JDK11" build.xml ; then
echo "Skipping ${target}. JDK11 not supported against ${version}"
exit 0
elif [[ "${target}" == "dtest-upgrade" ]] && [[ $version =~ $regx_version
]] ; then
diff --git a/build-scripts/cassandra-test-docker.sh
b/build-scripts/cassandra-test-docker.sh
index d60ebfb..5f53c4a 100755
--- a/build-scripts/cassandra-test-docker.sh
+++ b/build-scripts/cassandra-test-docker.sh
@@ -63,7 +63,7 @@ else
java_version="17"
elif [ "$java_version" -ge 11 ]; then
java_version="11"
- if ! grep -q "java.version.11" build.xml ; then
+ if ! grep -q "CASSANDRA_USE_JDK11" build.xml ; then
echo "Skipping build. JDK11 not supported against $(grep
'property\s*name=\"base.version\"' build.xml |sed -ne
's/.*value=\"\([^"]*\)\".*/\1/p')"
exit 0
fi
diff --git a/build-scripts/cassandra-test.sh b/build-scripts/cassandra-test.sh
index 0ee1caf..46b372a 100755
--- a/build-scripts/cassandra-test.sh
+++ b/build-scripts/cassandra-test.sh
@@ -41,7 +41,7 @@ _build_all_dtest_jars() {
cd cassandra-dtest-jars
for branch in cassandra-2.2 cassandra-3.0 cassandra-3.11 cassandra-4.0
cassandra-4.1 trunk; do
git checkout $branch
- if [ "$java_version" -eq 11 ] && ! grep -q "java.version.11" build.xml
; then
+ if [ "$java_version" -eq 11 ] && ! grep -q "CASSANDRA_USE_JDK11"
build.xml ; then
echo "Skipping dtest-jar jdk11 build of ${branch}."
else
ant realclean
@@ -86,7 +86,7 @@ _main() {
fi
elif [ "$java_version" -ge 11 ]; then
export CASSANDRA_USE_JDK11=true
- if ! grep -q "java.version.11" build.xml ; then
+ if ! grep -q "CASSANDRA_USE_JDK11" build.xml ; then
echo "Skipping ${target}. JDK11 not supported against ${version}"
exit 0
elif [[ "${target}" == "jvm-dtest-upgrade" ]] && [[ $version =~
$regx_version ]] ; then
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
