natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't put apidocs (javadoc) into the binary artifact 

patch by Mick Semb Wever; reviewed by Brandon Williams for CASSANDRA-15561
This commit is contained in:
Mick Semb Wever 2021-04-09 09:17:17 +02:00
parent 6cc730d689
commit b80dd92251
No known key found for this signature in database
GPG Key ID: E91335D77E3E87CB
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -1,4 +1,5 @@
4.0-rc1
* Binary releases no longer bundle the apidocs (javadoc) (CASSANDRA-15561)
* Fix Streaming Repair metrics (CASSANDRA-16190)
* Scheduled (delayed) schema pull tasks should not run after MIGRATION stage shutdown during decommission (CASSANDRA-16495)
* When behind a firewall trunk is not buildable, need to allow overriding URLs (CASSANDRA-16563)

9
build.xml
View File

@ -1055,7 +1055,7 @@
<!--
The javadoc-jar target makes cassandra-javadoc.jar output required for publishing to Maven central repository.
-->
<target name="javadoc-jar" depends="javadoc" description="Assemble Cassandra JavaDoc JAR file">
<target name="javadoc-jar" depends="javadoc" unless="no-javadoc" description="Assemble Cassandra JavaDoc JAR file">
<jar jarfile="${build.dir}/${final.name}-javadoc.jar" basedir="${javadoc.dir}"/>
<!-- javadoc task always rebuilds so might as well remove the generated docs to prevent
being pulled into the distribution by accident -->
@ -1076,7 +1076,7 @@
</jar>
</target>
<target name="_artifacts-init" depends="jar,javadoc">
<target name="_artifacts-init" depends="jar">
<mkdir dir="${dist.dir}"/>
<!-- fix the control linefeed so that builds on windows works on linux -->
<fixcrlf srcdir="bin" includes="**/*" eol="lf" eof="remove" />
@ -1088,9 +1088,6 @@
<include name="${final.name}.jar" />
</fileset>
</copy>
<copy todir="${dist.dir}/javadoc" failonerror="false">
<fileset dir="${javadoc.dir}"/>
</copy>
<copy todir="${dist.dir}/doc" failonerror="false">
<fileset dir="doc">
<include name="cql3/CQL.html" />
@ -1135,7 +1132,7 @@
</target>
<!-- creates release tarballs -->
<target name="artifacts" depends="_artifacts-init,gen-doc"
<target name="artifacts" depends="_artifacts-init,gen-doc,sources-jar,javadoc-jar"
description="Create Cassandra release artifacts">
<tar compression="gzip" longfile="gnu"
destfile="${build.dir}/${final.name}-bin.tar.gz">