This is an automated email from the ASF dual-hosted git repository.
bereng pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 9026f962345e62bdaffd750f2684e120dd7c7ea8
Merge: 7998e22127 f7b952387a
Author: Bereng <berenguerbl...@gmail.com>
AuthorDate: Mon Jun 26 10:09:40 2023 +0200
Merge branch 'cassandra-4.1' into trunk
* cassandra-4.1:
Move checkstyle files into .build
checkstyle.xml => .build/checkstyle.xml | 0
.../checkstyle_suppressions.xml | 0
checkstyle_test.xml => .build/checkstyle_test.xml | 0
build.xml | 17 +++++++++--------
4 files changed, 9 insertions(+), 8 deletions(-)
diff --cc build.xml
index c58839e52a,2756baecd1..818761a30e
--- a/build.xml
+++ b/build.xml
@@@ -37,17 -38,9 +37,18 @@@
<property name="scm.developerConnection"
value="scm:https://gitbox.apache.org/repos/asf/cassandra.git"/>
<property name="scm.url"
value="https://gitbox.apache.org/repos/asf?p=cassandra.git;a=tree"/>
+ <!-- JDKs supported.
+ All releases are built with the default JDK.
+ Builds with non-default JDKs are considered experimental and for
development and testing purposes.
+ When building, javac's source and target flags are set to the jdk
used, so lower JDKs are not supported at runtime.
+ The use of both CASSANDRA_USE_JDK11 and use-jdk11 is deprecated.
+ -->
+ <property name="java.default" value="1.8" />
+ <property name="java.supported" value="1.8,11,17" />
+
<!-- directory details -->
<property name="basedir" value="."/>
+ <property name="build.helpers.dir" value="${basedir}/.build"/>
<property name="build.src" value="${basedir}/src"/>
<property name="build.src.java" value="${basedir}/src/java"/>
<property name="build.src.antlr" value="${basedir}/src/antlr"/>
@@@ -2101,8 -2400,7 +2102,8 @@@
</target>
- <import file="${basedir}/.build/build-resolver.xml"/>
- <import file="${basedir}/.build/build-rat.xml"/>
- <import file="${basedir}/.build/build-owasp.xml"/>
- <import file="${basedir}/.build/build-git.xml"/>
+ <import file="${build.helpers.dir}/build-resolver.xml"/>
+ <import file="${build.helpers.dir}/build-rat.xml"/>
+ <import file="${build.helpers.dir}/build-owasp.xml"/>
++ <import file="${build.helpers.dir}/build-git.xml"/>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
