This is an automated email from the ASF dual-hosted git repository.
jonmeredith pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 2ea47b1b740916a627b30d2e8e2f910026c9e3bd
Merge: 6ed6b520fd b728a0011b
Author: Jon Meredith <jonmered...@apache.org>
AuthorDate: Thu Feb 16 15:09:42 2023 -0700
Merge branch 'cassandra-4.1' into trunk
build.xml | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --cc build.xml
index d9206e98e0,0d71d8f71f..da7d3bf4cc
--- a/build.xml
+++ b/build.xml
@@@ -170,20 -182,16 +170,23 @@@
</sequential>
</macrodef>
+ <condition property="java.version.8">
- <equals arg1="${ant.java.version}" arg2="1.8"/>
++ <equals arg1="${ant.java.version}" arg2="1.8"/>
++ </condition>
+ <fail message="Unsupported JDK version used: ${ant.java.version}">
+ <condition><not><contains string="${java.supported}"
substring="${ant.java.version}"/></not></condition>
+ </fail>
+ <condition property="is.java.default"><equals arg1="${ant.java.version}"
arg2="${java.default}"/></condition>
+ <echo unless:true="${is.java.default}" message="Non default JDK version
used: ${ant.java.version}"/>
+
+ <condition property="arch_x86">
+ <equals arg1="${os.arch}" arg2="x86" />
</condition>
- <condition property="java.version.11">
- <not><isset property="java.version.8"/></not>
+ <!-- On non-X86 JDK 8 (such as M1 Mac) the smallest allowed Xss is 384k;
so need a larger value
+ when on these platforms. -->
+ <condition property="jvm_xss" value="-Xss256k" else="-Xss384k">
+ <isset property="arch_x86" />
</condition>
- <fail><condition><not><or>
- <isset property="java.version.8"/>
- <isset property="java.version.11"/>
- </or></not></condition></fail>
<resources id="_jvm11_arg_items">
<string>-Djdk.attach.allowAttachSelf=true</string>
@@@ -1732,7 -2149,7 +1735,7 @@@
</java>
</target>
-- <target name="_maybe_update_idea_to_java11" if="java.version.11">
++ <target name="_maybe_update_idea_to_java11" unless="java.version.8">
<replace file="${eclipse.project.name}.iml" token="JDK_1_8"
value="JDK_11"/>
<replace file=".idea/misc.xml" token="JDK_1_8" value="JDK_11"/>
<replace file=".idea/misc.xml" token="1.8" value="11"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
