You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by dc...@apache.org on 2026/04/17 11:59:47 UTC
(cassandra) 01/01: Merge branch 'cassandra-4.1' into cassandra-5.0
This is an automated email from the ASF dual-hosted git repository.
dcapwell pushed a commit to branch cassandra-5.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 39977ce0663085274e83752b7597b5d29ae890ec
Merge: edf6034113 304386a2d2
Author: David Capwell <dc...@apache.org>
AuthorDate: Fri Apr 17 04:54:39 2026 -0700
Merge branch 'cassandra-4.1' into cassandra-5.0
build.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --cc build.xml
index 2f8cb0c9f0,5822b7777c..d65b4aa090
--- a/build.xml
+++ b/build.xml
@@@ -1991,20 -2260,22 +1991,21 @@@
<classpathentry kind="src" path="src/resources"/>
<classpathentry kind="src" path="src/gen-java"/>
<classpathentry kind="src" path="conf" including="hotspot_compiler"/>
- <classpathentry kind="src" output="build/test/classes" path="test/unit"/>
- <classpathentry kind="src" output="build/test/classes" path="test/long"/>
- <classpathentry kind="src" output="build/test/classes" path="test/distributed"/>
- <classpathentry kind="src" output="build/test/classes" path="test/simulator/asm"/>
- <classpathentry kind="src" output="build/test/classes" path="test/simulator/main"/>
- <classpathentry kind="src" output="build/test/classes" path="test/simulator/test"/>
- <classpathentry kind="src" output="build/test/classes" path="test/resources" />
+ <classpathentry kind="src" output="${test.classes}" path="test/unit"/>
+ <classpathentry kind="src" output="${test.classes}" path="test/long"/>
+ <classpathentry kind="src" output="${test.classes}" path="test/distributed"/>
+ <classpathentry kind="src" output="${test.classes}" path="test/simulator/asm"/>
+ <classpathentry kind="src" output="${test.classes}" path="test/simulator/main"/>
++ <classpathentry kind="src" output="${test.classes}" path="test/simulator/test"/>
+ <classpathentry kind="src" output="${test.classes}" path="test/resources" />
<classpathentry kind="src" path="tools/stress/src"/>
<classpathentry kind="src" path="tools/fqltool/src"/>
<classpathentry kind="src" output="build/test/stress-classes" path="tools/stress/test/unit" />
<classpathentry kind="src" output="build/test/fqltool-classes" path="tools/fqltool/test/unit" />
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="build/classes/eclipse"/>
+ <classpathentry kind="lib" path="${build.classes.main}"/>
<classpathentry kind="lib" path="test/conf"/>
-- <classpathentry kind="lib" path="${java.home}/../lib/tools.jar"/>
${eclipse-libs-list}
</classpath>
]]>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org