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
The following commit(s) were added to refs/heads/trunk by this push:
new d7352209b2 ninja-fix: compile and use JdkProperties
d7352209b2 is described below
commit d7352209b214559cea944b5df564b653a3379e3a
Author: Mick Semb Wever <[email protected]>
AuthorDate: Thu Feb 16 11:06:31 2023 +0100
ninja-fix: compile and use JdkProperties
patch by Mick Semb Wever; reviewed by Ekaterina Dimitrova for
CASSANDRA-18179
---
build.xml | 16 +++++++++-------
.../org/apache/cassandra/anttasks/JdkProperties.java | 4 ++--
2 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/build.xml b/build.xml
index da7d3bf4cc..2df4c9b94d 100644
--- a/build.xml
+++ b/build.xml
@@ -162,17 +162,12 @@
Debug level output still needs to be retrieved from the log file. -->
<macrodef name="keepbrief">
<sequential>
- <javac srcdir="test/anttasks" destdir="${test.classes}"
includeantruntime="true"/>
+ <javac srcdir="test/anttasks" destdir="${test.classes}"
includeantruntime="true" excludes="**/JdkProperties.java" />
<taskdef name="KeepBriefBrief"
classname="org.apache.cassandra.anttasks.KeepBriefBrief"
classpath="${test.classes}"/>
<KeepBriefBrief property="cassandra.keepBriefBrief"/>
- <taskdef name="JdkProperties"
classname="org.apache.cassandra.anttasks.JdkProperties"
classpath="${test.classes}"/>
- <JdkProperties/>
</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>
@@ -325,6 +320,13 @@
<mkdir dir="${build.dir.lib}"/>
<mkdir dir="${jacoco.export.dir}"/>
<mkdir dir="${jacoco.partials.dir}"/>
+
+ <!-- Set up jdk specific properties -->
+ <javac includes="**/JdkProperties.java" srcdir="test/anttasks"
destdir="${test.classes}" includeantruntime="true" source="${java.default}"
target="${java.default}">
+ <compilerarg value="-Xlint:-options"/>
+ </javac>
+ <taskdef name="JdkProperties"
classname="org.apache.cassandra.anttasks.JdkProperties"
classpath="${test.classes}"/>
+ <JdkProperties/>
</target>
<target name="clean" description="Remove all locally created artifacts">
@@ -1735,7 +1737,7 @@
</java>
</target>
- <target name="_maybe_update_idea_to_java11" unless="java.version.8">
+ <target name="_maybe_update_idea_to_java11" depends="init"
if="java.version.11">
<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"/>
diff --git a/test/anttasks/org/apache/cassandra/anttasks/JdkProperties.java
b/test/anttasks/org/apache/cassandra/anttasks/JdkProperties.java
index 59aba5e464..2e5d202a20 100644
--- a/test/anttasks/org/apache/cassandra/anttasks/JdkProperties.java
+++ b/test/anttasks/org/apache/cassandra/anttasks/JdkProperties.java
@@ -27,7 +27,7 @@ public class JdkProperties extends Task
public void execute()
{
Project project = getProject();
- project.setNewProperty("java.version." +
project.getProperty("ant.java.version"), "true");
- project.setNewProperty("use-jdk" +
project.getProperty("ant.java.version"), "true");
+ project.setNewProperty("java.version." +
project.getProperty("ant.java.version").replace("1.", ""), "true");
+ project.setNewProperty("use-jdk" +
project.getProperty("ant.java.version").replace("1.", ""), "true");
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
