This is an automated email from the ASF dual-hosted git repository. samt pushed a commit to branch cep-21-tcm in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 06fd61c8b4112402250d62f0bec6612c05bea007 Author: Sam Tunnicliffe <[email protected]> AuthorDate: Thu Mar 9 19:09:48 2023 +0000 TMP - use bundled version of harry --- .build/build-resolver.xml | 3 +++ .build/parent-pom-template.xml | 5 +++-- .gitignore | 1 + build.xml | 2 +- lib/harry-0.0.2-internal-20221121.14211-2.jar | Bin 0 -> 435204 bytes 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.build/build-resolver.xml b/.build/build-resolver.xml index e78bbf05e6..0bdaa0ec9f 100644 --- a/.build/build-resolver.xml +++ b/.build/build-resolver.xml @@ -265,5 +265,8 @@ <file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-x86-linux.so"/> <file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-x86-solaris.so"/> </copy> + <copy todir="${test.lib}/jars" quiet="false"> + <file file="${build.lib}/harry-0.0.2-internal-20221121.14211-2.jar"/> + </copy> </target> </project> diff --git a/.build/parent-pom-template.xml b/.build/parent-pom-template.xml index 2605dfef8f..21ed7851e9 100644 --- a/.build/parent-pom-template.xml +++ b/.build/parent-pom-template.xml @@ -487,8 +487,9 @@ <dependency> <groupId>org.apache.cassandra</groupId> <artifactId>harry-core</artifactId> - <version>0.0.1</version> - <scope>test</scope> + <version>0.0.2-internal-20221121.14211-2</version> + <scope>system</scope> + <systemPath>${test.lib}/harry-0.0.2-internal-20221121.14211-2.jar</systemPath> </dependency> <dependency> <groupId>org.reflections</groupId> diff --git a/.gitignore b/.gitignore index 916ab0de99..7e32b06b4e 100644 --- a/.gitignore +++ b/.gitignore @@ -16,6 +16,7 @@ pylib/src/ **/cqlshlib.xml !lib/cassandra-driver-internal-only-*.zip !lib/puresasl-*.zip +!lib/harry-0.0.2-internal-20221121.14211-2.jar # C* debs build-stamp diff --git a/build.xml b/build.xml index f75314e044..d5168de953 100644 --- a/build.xml +++ b/build.xml @@ -392,7 +392,7 @@ <target name="realclean" depends="clean" description="Remove the entire build directory and all downloaded artifacts"> <delete> - <fileset dir="${build.lib}" excludes="cassandra-driver-internal-only-*,puresasl-internal-only-*"/> + <fileset dir="${build.lib}" excludes="cassandra-driver-internal-only-*,puresasl-internal-only-*,harry-*"/> </delete> <delete dir="${build.dir}" /> <delete dir="${doc.dir}/build" /> diff --git a/lib/harry-0.0.2-internal-20221121.14211-2.jar b/lib/harry-0.0.2-internal-20221121.14211-2.jar new file mode 100644 index 0000000000..44bf1be4a3 Binary files /dev/null and b/lib/harry-0.0.2-internal-20221121.14211-2.jar differ --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
