natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-4.1' into trunk

This commit is contained in:
Jon Meredith 2023-02-16 15:09:42 -07:00
parent 6ed6b520fd b728a0011b
commit 2ea47b1b74
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
build.xml
View File

@ -170,6 +170,9 @@
</sequential>
</macrodef>
<condition property="java.version.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>
@ -1732,13 +1735,13 @@
</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"/>
<replaceregexp file=".idea/workspace.xml"
match="name=&quot;VM_PARAMETERS&quot; value=&quot;(.*)&quot;"
replace="name=&quot;VM_PARAMETERS&quot; value=&quot;\1 ${java11-jvmargs}&quot;"
match="name=&quot;VM_PARAMETERS&quot; value=&quot;(.*)"
replace="name=&quot;VM_PARAMETERS&quot; value=&quot;\1 ${java11-jvmargs}"
byline="true"/>
<echo file=".idea/compiler.xml"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>