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:45 UTC
(cassandra) 01/01: Merge branch 'cassandra-4.0' into cassandra-4.1
This is an automated email from the ASF dual-hosted git repository.
dcapwell pushed a commit to branch cassandra-4.1
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 304386a2d2f47e651c5a06ac4f871e8a99725d31
Merge: 5e26f2527d de20468edd
Author: David Capwell <dc...@apache.org>
AuthorDate: Fri Apr 17 04:52:07 2026 -0700
Merge branch 'cassandra-4.0' into cassandra-4.1
build.xml | 2 ++
1 file changed, 2 insertions(+)
diff --cc build.xml
index d8a2743f36,076bb75ad0..5822b7777c
--- a/build.xml
+++ b/build.xml
@@@ -2263,8 -2083,6 +2263,9 @@@
<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" path="tools/stress/src"/>
<classpathentry kind="src" path="tools/fqltool/src"/>
@@@ -2272,13 -2090,24 +2273,14 @@@
<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>
]]>
</echo>
- <path id="eclipse-project-libs-path">
- <fileset dir="lib">
- <include name="**/*.jar" />
- </fileset>
- <fileset dir="build/lib/jars">
- <include name="**/*.jar" />
- </fileset>
- <fileset dir="build/test/lib/jars">
- <include name="**/*.jar" />
- </fileset>
- </path>
- <property name="eclipse-project-libs" refid="eclipse-project-libs-path"/>
- <script language="javascript">
+ <taskdef name="echoeclipseprojectslibs" classname="org.apache.cassandra.anttasks.EchoEclipseProjectLibs" classpath="${test.classes}">
<classpath>
<path refid="cassandra.classpath"/>
<path refid="cassandra.classpath.test"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org