This is an automated email from the ASF dual-hosted git repository.
jlewandowski 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 738dfde735 Fix building dtest.jar (part 2)
738dfde735 is described below
commit 738dfde73560d289218f3afa4103a37e9f401757
Author: Jacek Lewandowski <[email protected]>
AuthorDate: Wed Jul 26 11:54:32 2023 +0200
Fix building dtest.jar (part 2)
Excludes META-INF/license/** from the unpacked content which fixes building
dtest-jar on case-insensitive file systems
Patch by Jacek Lewandowski; reviewed by Brandon Williams and Ekaterina
Dimitrova for CASSANDRA-18690
---
build.xml | 47 +++++++++++++++++++++++++----------------------
1 file changed, 25 insertions(+), 22 deletions(-)
diff --git a/build.xml b/build.xml
index f19bd054b0..c990f3f8ea 100644
--- a/build.xml
+++ b/build.xml
@@ -1713,29 +1713,32 @@
</target>
<target name="dtest-jar" depends="build-test, build" description="Create
dtest-compatible jar, including all dependencies">
- <delete dir="${build.dir}/dtest/**" quiet="true"/>
+ <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}" />
- </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"/>
+ <copy todir="${build.dir}/dtest" quiet="true" overwrite="false">
+ <fileset dir="${build.classes.main}"/>
+ <fileset dir="${test.classes}"/>
+ <fileset dir="${test.conf}"/>
+ </copy>
+ <unzip dest="${build.dir}/dtest" overwrite="false">
+ <fileset dir="${test.lib}/jars"
includes="jimfs-1.1.jar,dtest-api-*.jar,asm-*.jar,javassist-*.jar,reflections-*.jar,semver4j-*.jar"/>
+ <patternset excludes="META-INF/license/**"/>
+ </unzip>
+ <unzip dest="${build.dir}/dtest" overwrite="false">
+ <fileset dir="${build.dir.lib}/jars" includes="*.jar"/>
+ <patternset excludes="META-INF/license/**"/>
+ </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"/>
+ <exclude name="META-INF/license/**"/>
+ </fileset>
+ </jar>
+
+ <delete dir="${build.dir}/dtest" quiet="true"/>
</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]
