TouchInstinct
/
checkstyle
306
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix for bug 1630361. Make sure that commons-collections classes that are shipped with beanutils are not included in checkstyle-all.jar

This commit is contained in:
Lars Kühne 2007-02-01 21:24:40 +00:00
parent 3e72ff4dea
commit 03b0bc8f47
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build.xml
View File

@ -493,10 +493,11 @@ For users of JDK 1.5 at least version 1.6.2 of Ant is required.
manifest="${target.dir}/manifest.mf"
filesetmanifest="skip">
<zipfileset src="${dist.dir}/checkstyle-${version}/antlr.jar" excludes="META-INF/*"/>
<zipfileset src="${dist.dir}/checkstyle-${version}/commons-beanutils-core.jar" excludes="META-INF/*,overview.html"/>
<!-- beanutils packages parts of commons collections, exclude it here so we don't have it in checkstyle-all.jar twice -->
<zipfileset src="${dist.dir}/checkstyle-${version}/commons-beanutils-core.jar" excludes="META-INF/*,org/apache/commons/collections/*,**/*.html"/>
<zipfileset src="${dist.dir}/checkstyle-${version}/commons-collections.jar" excludes="META-INF/*"/>
<zipfileset src="${dist.dir}/checkstyle-${version}/commons-cli.jar" excludes="META-INF/*"/>
<zipfileset src="${dist.dir}/checkstyle-${version}/commons-logging.jar" excludes="META-INF/*"/>
<zipfileset src="${dist.dir}/checkstyle-${version}/commons-logging.jar" excludes="META-INF/*,**/package.html"/>
<zipfileset src="${dist.dir}/checkstyle-${version}/checkstyle-${version}.jar" excludes="META-INF/*"/>
</jar>
<!-- copy stuff without filtering -->

13
src/xdocs/releasenotes.xml
View File

@ -9,6 +9,19 @@
</properties>
<body>
<section name="Release 4.4">
<p>Fixed Bugs:</p>
<ul>
<li>
checkstyle-all.jar contained some classes from jakarta commons-collections twice. (bug 1630361)
</li>
</ul>
<p>New features:</p>
</section>
<section name="Release 4.3">
<p>Fixed Bugs:</p>