diff --git a/WHATSNEW b/WHATSNEW index a6c217b1b..4555b1dd3 100644 --- a/WHATSNEW +++ b/WHATSNEW @@ -6,6 +6,11 @@ Changes that could break older environments: Fixed bugs: ----------- + +* In Ant 1.7.0, in does not by default include only + **/*.java as the documentation claims and earlier revisions did. + Bugzilla report 41264. + * SPI support in jar was broken. Bugzilla report 41201. diff --git a/src/etc/testcases/taskdefs/javadoc/javadoc.xml b/src/etc/testcases/taskdefs/javadoc/javadoc.xml index 74f43f7b1..e59133197 100755 --- a/src/etc/testcases/taskdefs/javadoc/javadoc.xml +++ b/src/etc/testcases/taskdefs/javadoc/javadoc.xml @@ -139,4 +139,16 @@ + + + + + public class stuff1 {} + public class stuff2 {} + x=4 + + + + + diff --git a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java index b9247c99d..6e2d61cf8 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java +++ b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java @@ -2199,11 +2199,12 @@ public class Javadoc extends Task { if (rc instanceof FileSet) { FileSet fs = (FileSet) rc; if (!fs.hasPatterns() && !fs.hasSelectors()) { - fs = (FileSet) fs.clone(); - fs.createInclude().setName("**/*.java"); + FileSet fs2 = (FileSet) fs.clone(); + fs2.createInclude().setName("**/*.java"); if (includeNoSourcePackages) { - fs.createInclude().setName("**/package.html"); + fs2.createInclude().setName("**/package.html"); } + rc = fs2; } } Iterator iter = rc.iterator(); diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/JavadocTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/JavadocTest.java index f27f80b5e..e23386035 100755 --- a/src/tests/junit/org/apache/tools/ant/taskdefs/JavadocTest.java +++ b/src/tests/junit/org/apache/tools/ant/taskdefs/JavadocTest.java @@ -131,4 +131,9 @@ public class JavadocTest extends BuildFileTest { public void testDoublyNestedFilesetNoPatterns() throws Exception { executeTarget("doublyNestedFilesetNoPatterns"); } + + public void testNonJavaIncludes() throws Exception { // #41264 + executeTarget("nonJavaIncludes"); + } + }