From a61edad15fb1e80cdad4d613b9e3d7d5a27ff747 Mon Sep 17 00:00:00 2001 From: Stefan Miklosovic Date: Fri, 2 Sep 2022 00:21:54 +0200 Subject: [PATCH] remove pure_sasl from the repository This is follow-up for CASSANDRA-16456. The dependency should be downloaded and put into the lib/ folder. patch by Stefan Miklosovic; reviewed by Mick Semb Wever for CASSANDRA-16456 --- .build/build-resolver.xml | 2 ++ bin/cqlsh.py | 2 +- build.xml | 3 +-- lib/puresasl-internal-only-0.6.2.zip | Bin 9085 -> 0 bytes 4 files changed, 4 insertions(+), 3 deletions(-) delete mode 100644 lib/puresasl-internal-only-0.6.2.zip diff --git a/.build/build-resolver.xml b/.build/build-resolver.xml index f17ad23396..c38a272fe1 100644 --- a/.build/build-resolver.xml +++ b/.build/build-resolver.xml @@ -201,6 +201,7 @@ + @@ -231,6 +232,7 @@ + diff --git a/bin/cqlsh.py b/bin/cqlsh.py index 637c95e70a..6c1e7bd4fc 100755 --- a/bin/cqlsh.py +++ b/bin/cqlsh.py @@ -113,7 +113,7 @@ if cql_zip: sys.path.insert(0, os.path.join(cql_zip, 'cassandra-driver-' + ver)) # the driver needs dependencies -third_parties = ('six-', 'puresasl-') +third_parties = ('six-', 'pure_sasl-') for lib in third_parties: lib_zip = find_zip(lib) diff --git a/build.xml b/build.xml index a620f32a13..62048192d3 100644 --- a/build.xml +++ b/build.xml @@ -1335,10 +1335,9 @@ - + - diff --git a/lib/puresasl-internal-only-0.6.2.zip b/lib/puresasl-internal-only-0.6.2.zip deleted file mode 100644 index 8314a045f68eed93f0dabe994c160dd84a2f3fb9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9085 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 J`qclr{TJ6hy$JvS