This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 3e54ed76b29b752f2c17baa98901adf47e5897d1 Author: Mick Semb Wever <[email protected]> AuthorDate: Fri Apr 9 09:17:17 2021 +0200 Don't put apidocs (javadoc) into the binary artifact patch by Mick Semb Wever; reviewed by Brandon Williams for CASSANDRA-15561 --- CHANGES.txt | 1 + build.xml | 14 +++++--------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index e9159ee..8a9a1c4 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 3.11.11 + * Binary releases no longer bundle the apidocs (javadoc) (CASSANDRA-16557) * Migrate dependency handling from maven-ant-tasks to resolver-ant-tasks, removing lib/ directory from version control (CASSANDRA-16557) * Make cqlsh use the same set of reserved keywords than the server uses (CASSANDRA-15663) * Optimize bytes skipping when reading SSTable files (CASSANDRA-14415) diff --git a/build.xml b/build.xml index 9f4f982..7f811e5 100644 --- a/build.xml +++ b/build.xml @@ -847,7 +847,7 @@ <!-- The javadoc-jar target makes cassandra-javadoc.jar output required for publishing to Maven central repository. --> - <target name="javadoc-jar" description="Assemble Cassandra JavaDoc JAR file"> + <target name="javadoc-jar" depends="javadoc" unless="no-javadoc" description="Assemble Cassandra JavaDoc JAR file"> <mkdir dir="${javadoc.jars.dir}"/> <create-javadoc destdir="${javadoc.jars.dir}/thrift"> <filesets> @@ -869,9 +869,7 @@ </fileset> </filesets> </create-javadoc> - <jar jarfile="${build.dir}/${final.name}-javadoc.jar" - basedir="${javadoc.jars.dir}/main"/> - + <jar jarfile="${build.dir}/${final.name}-javadoc.jar" basedir="${javadoc.jars.dir}/main"/> <!-- javadoc task always rebuilds so might as well remove the generated docs to prevent being pulled into the distribution by accident --> <delete quiet="true" dir="${javadoc.jars.dir}"/> @@ -897,7 +895,7 @@ </target> <!-- creates release tarballs --> - <target name="artifacts" depends="jar,javadoc,gen-doc,build-test,stress-build-test" + <target name="artifacts" depends="jar,gen-doc,build-test,stress-build-test,sources-jar,javadoc-jar" description="Create Cassandra release artifacts"> <mkdir dir="${dist.dir}"/> <!-- fix the control linefeed so that builds on windows works on linux --> @@ -911,10 +909,8 @@ <include name="${ant.project.name}-thrift-${version}.jar" /> </fileset> </copy> - <copy todir="${dist.dir}/javadoc"> - <fileset dir="${javadoc.dir}"/> - </copy> - <copy todir="${dist.dir}/doc"> + + <copy todir="${dist.dir}/doc" failonerror="false"> <fileset dir="doc"> <include name="cql3/CQL.html" /> <include name="cql3/CQL.css" /> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
