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
This commit is contained in:
Stefan Miklosovic 2022-09-02 00:21:54 +02:00
parent 1ee5df02b1
commit a61edad15f
4 changed files with 4 additions and 3 deletions

View File

@ -201,6 +201,7 @@
<!-- files.pythonhosted.org -->
<get src="${artifact.python.pypi}/59/a0/cf4cd997e1750f0c2d91c6ea5abea218251c43c3581bcc2f118b00baf5cf/futures-2.1.6-py2.py3-none-any.whl" dest="${local.repository}/org/apache/cassandra/deps/futures-2.1.6-py2.py3-none-any.zip" usetimestamp="true" quiet="true" skipexisting="true"/>
<get src="${artifact.python.pypi}/73/fb/00a976f728d0d1fecfe898238ce23f502a721c0ac0ecfedb80e0d88c64e9/six-1.12.0-py2.py3-none-any.whl" dest="${local.repository}/org/apache/cassandra/deps/six-1.12.0-py2.py3-none-any.zip" usetimestamp="true" quiet="true" skipexisting="true"/>
<get src="${artifact.python.pypi}/37/b2/ef1124540ee2c0b417be8d0f74667957e6aa084a3f26621aa67e2e77f3fb/pure_sasl-0.6.2-py2-none-any.whl" dest="${local.repository}/org/apache/cassandra/deps/pure_sasl-0.6.2-py2-none-any.zip" usetimestamp="true" quiet="true" skipexisting="true"/>
<!-- apache/cassandra/lib -->
<get src="${lib.download.base.url}/lib/geomet-0.1.0.zip" dest="${local.repository}/org/apache/cassandra/deps/geomet-0.1.0.zip" usetimestamp="true" quiet="true" skipexisting="true"/>
@ -231,6 +232,7 @@
<file file="${local.repository}/org/apache/cassandra/deps/futures-2.1.6-py2.py3-none-any.zip"/>
<file file="${local.repository}/org/apache/cassandra/deps/six-1.12.0-py2.py3-none-any.zip"/>
<file file="${local.repository}/org/apache/cassandra/deps/geomet-0.1.0.zip"/>
<file file="${local.repository}/org/apache/cassandra/deps/pure_sasl-0.6.2-py2-none-any.zip"/>
</copy>
<copy todir="${build.lib}/sigar-bin/" quiet="true">
<file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-amd64-freebsd-6.so"/>

View File

@ -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)

View File

@ -1335,10 +1335,9 @@
<exclude name="ide/nbproject/private/**" />
</tarfileset>
<!-- python driver, puresasl for SASL / GSSAPI -->
<!-- python driver -->
<tarfileset dir="${basedir}" prefix="${final.name}-src">
<include name="lib/cassandra-driver-internal-only-**" />
<include name="lib/puresasl-internal-only-**" />
</tarfileset>
<!-- Shell includes in bin/ and tools/bin/ -->

Binary file not shown.