This is an automated email from the ASF dual-hosted git repository.
edimitrova 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 c1bf002234 Fix building dtest jar patch by Jacek Lewandowski; reviewed
by Ekaterina Dimitrova and Brandon Williams for CASSANDRA-18690
c1bf002234 is described below
commit c1bf002234bd44bce120658e9b08b3d67901e5bb
Author: Ekaterina Dimitrova <[email protected]>
AuthorDate: Tue Jul 25 10:37:12 2023 -0400
Fix building dtest jar
patch by Jacek Lewandowski; reviewed by Ekaterina Dimitrova and Brandon
Williams for CASSANDRA-18690
---
build.xml | 23 +++++++++++++++++++----
1 file changed, 19 insertions(+), 4 deletions(-)
diff --git a/build.xml b/build.xml
index 33f5010fc2..f19bd054b0 100644
--- a/build.xml
+++ b/build.xml
@@ -1713,14 +1713,29 @@
</target>
<target name="dtest-jar" depends="build-test, build" description="Create
dtest-compatible jar, including all dependencies">
- <jar jarfile="${build.dir}/dtest-${base.version}.jar"
duplicate="preserve">
+ <delete dir="${build.dir}/dtest/**" quiet="true"/>
+
+ <copy todir="${build.dir}/dtest" quiet="true">
<fileset dir="${build.classes.main}"/>
<fileset dir="${test.classes}"/>
<fileset dir="${test.conf}" />
- <zipgroupfileset dir="${build.lib}" includes="*.jar"
excludes="META-INF/*.SF"/>
- <zipgroupfileset dir="${test.lib}/jars"
includes="jimfs-1.1.jar,dtest-api-*.jar,asm-*.jar,javassist-*.jar,reflections-*.jar,semver4j-*.jar"
excludes="META-INF/*.SF"/>
- <zipgroupfileset dir="${build.dir.lib}/jars" includes="asm-*.jar"
excludes="META-INF/*.SF"/>
+ </copy>
+ <unzip dest="${build.dir}/dtest">
+ <fileset dir="${test.lib}/jars"
includes="jimfs-1.1.jar,dtest-api-*.jar,asm-*.jar,javassist-*.jar,reflections-*.jar,semver4j-*.jar"/>
+ </unzip>
+ <unzip dest="${build.dir}/dtest">
+ <fileset dir="${build.dir.lib}/jars" includes="*.jar"/>
+ </unzip>
+
+ <jar jarfile="${build.dir}/dtest-${base.version}.jar"
duplicate="preserve">
+ <fileset dir="${build.dir}/dtest">
+ <exclude name="META-INF/*.SF"/>
+ <exclude name="META-INF/*.DSA"/>
+ <exclude name="META-INF/*.RSA"/>
+ </fileset>
</jar>
+
+ <delete dir="${build.dir}/dtest"/>
</target>
<target name="test-jvm-dtest" depends="maybe-build-test"
description="Execute in-jvm dtests">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
