Merge branch '1.9.x'

This commit is contained in:
Stefan Bodewig 2018-03-05 12:59:12 +01:00
commit aa4f45e25c

View File

@ -948,9 +948,9 @@
<macrodef name="checksums"> <macrodef name="checksums">
<element name="resources" implicit="true"/> <element name="resources" implicit="true"/>
<sequential> <sequential>
<checksums-mvn> <checksum algorithm="sha1">
<resources/> <resources/>
</checksums-mvn> </checksum>
<checksum fileext=".sha512" algorithm="sha-512"> <checksum fileext=".sha512" algorithm="sha-512">
<resources/> <resources/>
</checksum> </checksum>
@ -1314,13 +1314,11 @@
<checksums> <checksums>
<fileset dir="${dist.base.binaries}/"> <fileset dir="${dist.base.binaries}/">
<exclude name="**/*.asc"/> <exclude name="**/*.asc"/>
<exclude name="**/*.md5"/>
<exclude name="**/*.sha1"/> <exclude name="**/*.sha1"/>
<exclude name="**/*.sha512"/> <exclude name="**/*.sha512"/>
</fileset> </fileset>
<fileset dir="${dist.base.manual}/"> <fileset dir="${dist.base.manual}/">
<exclude name="**/*.asc"/> <exclude name="**/*.asc"/>
<exclude name="**/*.md5"/>
<exclude name="**/*.sha1"/> <exclude name="**/*.sha1"/>
<exclude name="**/*.sha512"/> <exclude name="**/*.sha512"/>
</fileset> </fileset>
@ -1366,7 +1364,6 @@
<checksums> <checksums>
<fileset dir="${dist.base.source}/"> <fileset dir="${dist.base.source}/">
<exclude name="**/*.asc"/> <exclude name="**/*.asc"/>
<exclude name="**/*.md5"/>
<exclude name="**/*.sha1"/> <exclude name="**/*.sha1"/>
<exclude name="**/*.sha512"/> <exclude name="**/*.sha512"/>
</fileset> </fileset>