gentoo auto-resync : 23:01:2024 - 22:46:03

3 files changed, 7 insertions, 272 deletions

diff --git a/dev-java/ant/Manifest b/dev-java/ant/Manifest
index 12dd8d4c086e..ad3974b35e89 100644
--- a/dev-java/ant/Manifest
+++ b/dev-java/ant/Manifest
@@ -1,11 +1,11 @@
 AUX 1.10.9-launch.patch 11661 BLAKE2B 89a6e01e2c6ed217ab4efaaa58659a228bcf23446fe6002ca06978ef4d951d906fbb792f704ceb33e4ecd84d7edb1e59f0e3d669d1aafe84c43a1acd1f3bd701 SHA512 f1a55cce03603d149eb2610affee0e6884b192e4d6c1bcac9f537e3e67e2eda51e4f5c53a98dd9b9c2c9a8bd65acf0a0c511dcb8f02856439caf4f1e96f0b62a
 AUX ant-1.10.14-AntTest.patch 1067 BLAKE2B ee6ec236c6298089c71cdfc642a82bf9ac2c55e91f0e3fb8f27827782a9c5b78a5691842f76242e66b9ad6530dbf30f066cf5f69244bb7dfe85c6e4f24c83fa0 SHA512 b1f6bc7e6e7e0c0c0d088fc651d3c4e7b2b6df102c2e1dc6875a9126ae1aea4297cb386a9b7b01ee3947c3027e33d7ee3e21641bfd697fee7b3cb1376d67cb9a
 AUX ant-1.10.14-AntlibTest.patch 2067 BLAKE2B d385e3032664fc37eae14dae6580c688521047350383e3ed950513ace427494e9f8439ef86b090ef88ac280df3db4dcbfb5b99cc69c8d60c14e9db60823a99d7 SHA512 a8c6070ec0036ea63162e3581166c9bf0e055cbaa9e50e8d381c54b0ded4880235a4a6830ad8113295e97553230762860c0c816c8d9bb0925acfce154ab0dd48
-AUX ant-1.10.14-JavaTest.patch 22828 BLAKE2B 407a601ed5eb9acec63642444cf9b763234b55bd669037c2561b0aa4f0caf09ff7c79a73af078c8ef67d817ce727edf17c2a15fb8a1f0384333f875227fc12e3 SHA512 d060205e9c51c5cd25f984bff3f50b8a9a2568ad39bcf575b8ff44e200b1d1fe13b0872214b16c4fc073dd08142b6d45b3535cc4a14f5f3fc418c6dea93d6f88
+AUX ant-1.10.14-JavaTest.patch 3181 BLAKE2B 6f25a4ea6278cbda776c6dc9d92b16749d1e3b4895f6b318133292ac0f54e49d296927b4435e74a96f254842ad1180c92c5a3526413088bcb04d29ab4a6b29bd SHA512 8206e8438679e77fdabc58889343f8601d4d9ab42f9ab7b1713e34c067a9a36f8d04ce14834213fb1444086635f2ca2cbec6d7a0f0ff87f13fdd8447ac5106b5
 AUX ant-1.10.14-LinkTest.patch 4329 BLAKE2B d4165d378dd63cab2a9d813c9d26c1ef7404f01ba7798f41062d0df633675fa341ed925e278d5230c9cc170f1f950ea6a86fcfe616bc94e8e66148b2ed6e6cf3 SHA512 271d9eaffa3f3f17411062bda4d71519db72bc66856058086778c79d2cb1eab6021bdddbd1c92ddb0207786617914b83dc3394aa9fdb789c6f5211500e445a50
 AUX ant-1.10.14-PathTest.patch 1114 BLAKE2B 870f35f250b4cd31317972c09f4a90eb26b71a8f198d1e96a085f99e0d6e41fd06c0598bcdae35c400aa8ba9b65e52b7dc0d7119308c60c8573a185907f2b7ba SHA512 9847fb3f6f3c2a37ac1e483ca7ac5685cc3d296b92ae35816fc4c58bb4de57d89196c50fabfa546efbec2303ea360066658507be0b4bdaeae3d5ff00e023f498
 DIST apache-ant-1.10.14-src.tar.gz 4692736 BLAKE2B b07a2e61fecd4f10056ca2688615ccf02c551bba0f5749f50c2be710e90306e8044b7c557359300654d93971d94520e92f593da44b1c20626db4701d499cddff SHA512 435f97a276d88a86022c5f0680f3c2a16dc36be95adac3d797a2609d96921840a57393c8f5ef8313193146115bd6a87bd4790a4a272c44f7beec892fd6528c10
 DIST apache-ant-1.10.14-src.tar.gz.asc 833 BLAKE2B d9a4b4b3cb22762f25b34651dc81c2f13af38e73fdca27bc2de562539cd8f1692744ac5ccf535a2c61d3035a129f30bafac133872f9ba0ed7b259393b0f4cdf6 SHA512 ff2e79c991f68a5c38c0b47556ca5f5301c1a8be219a9eddf8d2e17b09eed7f0426770c2dc18114ea432f0200ac824d71da633ad7881025692ce5ad4baa899ee
-EBUILD ant-1.10.14.ebuild 12334 BLAKE2B 33f2a5b1825df1c58cecb89567520c5d6fcb01d1bd4dd85e4183616705baf77bb3c5c1a331a0eee66f839ef7eb792cd8818df7e430f70f45a6250c254f8bbc49 SHA512 9077501818a92b8ed1c85bbe37a01ab0e9c1107fa3e99ff35c1d1fb8ddf4ecbab29e5fb8cb3ac4e4533fcd9b75c43c64cc33f3e60542adfe18f9b530b72f71f6
+EBUILD ant-1.10.14-r1.ebuild 12366 BLAKE2B 0b3eb19cfdff4fa9c499fac4eea716d979ed9cbee370306a79ad1e85c21a678d2cca2348ad3fc4e342c746f9e347ae216a0748fe524a7fe6e49b3443f581ecb5 SHA512 aca0ae3e4f62d2855568163875ba8e29a5338e043311b5570218cbd5a26d6ff0b043fca26ed740d7f35aa1bf81ad557eda236af6c1c85418307d5329f6fc2941
 EBUILD ant-1.10.9.ebuild 1586 BLAKE2B d88da0b36e9dfb92586b1701f2535a96c1ec9857db67ed7c8d148f24f609c784dedec1820ee4dd3d69910d37455f82e1dd7eb5f95dc5535c96312d052b9bd77c SHA512 9df6451a03b308dac45fa8d11ea18c5ff842ec6da245f39a2804b9788877cac2af65088d833787bf51406841703bc5f0823bdf037358cdc6f0be21c89df2aec4
 MISC metadata.xml 1871 BLAKE2B 506545257db2a93e15fa3c36105453c6efa3c6505dff98d558bea9434637676df7fbf8a4db6e9a6fe04a54c913ad012226ce5e7eb682a8732f140fd6f676c194 SHA512 807240f5312ffa9c7ae789697c4f2ef481ec8819bd800eaa83639129f5bff16ab7c7e80cbe07a57c171faf5efa439c3d45d8e26514418c32ca1764e2c4163b36
diff --git a/dev-java/ant/ant-1.10.14.ebuild b/dev-java/ant/ant-1.10.14-r1.ebuild
index 57167d57a761..a18ee50e36b4 100644
--- a/dev-java/ant/ant-1.10.14.ebuild
+++ b/dev-java/ant/ant-1.10.14-r1.ebuild
@@ -69,7 +69,10 @@ DEPEND="
 	xz? ( dev-java/xz-java:0 )
 "
 PDEPEND="~dev-java/ant-core-${PV}:0"
-RDEPEND=">=virtual/jre-1.8:*"
+RDEPEND="
+	!<dev-java/ant-core-1.10.14
+	>=virtual/jre-1.8:*
+"
 
 DOCS=( CONTRIBUTORS INSTALL NOTICE README WHATSNEW )
 PATCHES=(
diff --git a/dev-java/ant/files/ant-1.10.14-JavaTest.patch b/dev-java/ant/files/ant-1.10.14-JavaTest.patch
index 1c291c71e5f3..9143cba43ca2 100644
--- a/dev-java/ant/files/ant-1.10.14-JavaTest.patch
+++ b/dev-java/ant/files/ant-1.10.14-JavaTest.patch
@@ -1,272 +1,4 @@
-There were 12 failures:
-1) testExcepting(org.apache.tools.ant.taskdefs.JavaTest)
-java.lang.AssertionError: 
-Expected: a string containing "Exception raised inside called program"
-     but: was "Could not find org.apache.tools.ant.taskdefs.JavaTest$ExceptingEntryPoint. Make sure you have it in your classpath
-	at org.apache.tools.ant.taskdefs.ExecuteJava.execute(ExecuteJava.java:141)
-	at org.apache.tools.ant.taskdefs.Java.run(Java.java:892)
-	at org.apache.tools.ant.taskdefs.Java.executeJava(Java.java:232)
-	at org.apache.tools.ant.taskdefs.Java.executeJava(Java.java:136)
-	at org.apache.tools.ant.taskdefs.Java.execute(Java.java:109)
-	at org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:299)
-	at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:580)
-	at org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:99)
-	at org.apache.tools.ant.Task.perform(Task.java:350)
-	at org.apache.tools.ant.Target.execute(Target.java:449)
-	at org.apache.tools.ant.Target.performTasks(Target.java:470)
-	at org.apache.tools.ant.Project.executeSortedTargets(Project.java:1401)
-	at org.apache.tools.ant.Project.executeTarget(Project.java:1374)
-	at org.apache.tools.ant.BuildFileRule.executeTarget(BuildFileRule.java:197)
-	at org.apache.tools.ant.taskdefs.JavaTest.testExcepting(JavaTest.java:246)
-	at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:580)
-	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:59)
-	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
-	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:61)
-	at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)
-	at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:26)
-	at org.junit.rules.ExternalResource$1.evaluate(ExternalResource.java:54)
-	at org.junit.rules.ExpectedException$ExpectedExceptionStatement.evaluate(ExpectedException.java:258)
-	at org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306)
-	at org.junit.runners.BlockJUnit4ClassRunner$1.evaluate(BlockJUnit4ClassRunner.java:100)
-	at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:366)
-	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:103)
-	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:63)
-	at org.junit.runners.ParentRunner$4.run(ParentRunner.java:331)
-	at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:79)
-	at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:329)
-	at org.junit.runners.ParentRunner.access$100(ParentRunner.java:66)
-	at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:293)
-	at org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306)
-	at org.junit.runners.ParentRunner.run(ParentRunner.java:413)
-	at org.junit.runners.Suite.runChild(Suite.java:128)
-	at org.junit.runners.Suite.runChild(Suite.java:27)
-	at org.junit.runners.ParentRunner$4.run(ParentRunner.java:331)
-	at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:79)
-	at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:329)
-	at org.junit.runners.ParentRunner.access$100(ParentRunner.java:66)
-	at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:293)
-	at org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306)
-	at org.junit.runners.ParentRunner.run(ParentRunner.java:413)
-	at org.junit.runner.JUnitCore.run(JUnitCore.java:137)
-	at org.junit.runner.JUnitCore.run(JUnitCore.java:115)
-	at org.junit.runner.JUnitCore.runMain(JUnitCore.java:77)
-	at org.junit.runner.JUnitCore.main(JUnitCore.java:36)Java Result: -1"
-	at org.hamcrest.MatcherAssert.assertThat(MatcherAssert.java:20)
-	at org.junit.Assert.assertThat(Assert.java:964)
-	at org.junit.Assert.assertThat(Assert.java:930)
-	at org.apache.tools.ant.taskdefs.JavaTest.testExcepting(JavaTest.java:247)
-2) testRedirect1(org.apache.tools.ant.taskdefs.JavaTest)
-/var/tmp/portage/dev-java/ant-core-1.10.14/work/apache-ant-1.10.14/src/etc/testcases/taskdefs/java.xml:244: /var/tmp/portage/dev-java/ant-core-1.10.14/temp/testoutput_24464_main/ant.tmp.java-test/redirect1046568457.out:
-"${redirect.out.contents}" expected "foo"
-	at org.apache.tools.ant.taskdefs.Exit.execute(Exit.java:162)
-	at org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:299)
-	at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:580)
-	at org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:99)
-	at org.apache.tools.ant.Task.perform(Task.java:350)
-	at org.apache.tools.ant.Target.execute(Target.java:449)
-	at org.apache.tools.ant.Target.performTasks(Target.java:470)
-	at org.apache.tools.ant.Project.executeSortedTargets(Project.java:1401)
-	at org.apache.tools.ant.Project.executeTarget(Project.java:1374)
-	at org.apache.tools.ant.BuildFileRule.executeTarget(BuildFileRule.java:197)
-	at org.apache.tools.ant.taskdefs.JavaTest.testRedirect1(JavaTest.java:331)
-3) testRedirect2(org.apache.tools.ant.taskdefs.JavaTest)
-/var/tmp/portage/dev-java/ant-core-1.10.14/work/apache-ant-1.10.14/src/etc/testcases/taskdefs/java.xml:244: /var/tmp/portage/dev-java/ant-core-1.10.14/temp/testoutput_24464_main/ant.tmp.java-test/redirect1723720155.out:
-"${redirect.out.contents}" expected "foo"
-	at org.apache.tools.ant.taskdefs.Exit.execute(Exit.java:162)
-	at org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:299)
-	at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:580)
-	at org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:99)
-	at org.apache.tools.ant.Task.perform(Task.java:350)
-	at org.apache.tools.ant.Target.execute(Target.java:449)
-	at org.apache.tools.ant.Target.performTasks(Target.java:470)
-	at org.apache.tools.ant.Project.executeSortedTargets(Project.java:1401)
-	at org.apache.tools.ant.Project.executeTarget(Project.java:1374)
-	at org.apache.tools.ant.BuildFileRule.executeTarget(BuildFileRule.java:197)
-	at org.apache.tools.ant.taskdefs.JavaTest.testRedirect2(JavaTest.java:336)
-4) testRedirect3(org.apache.tools.ant.taskdefs.JavaTest)
-/var/tmp/portage/dev-java/ant-core-1.10.14/work/apache-ant-1.10.14/src/etc/testcases/taskdefs/java.xml:324: /var/tmp/portage/dev-java/ant-core-1.10.14/temp/testoutput_24464_main/ant.tmp.java-test/redirect325879668.out:
-"${redirect.out.contents}" expected "foo"
-	at org.apache.tools.ant.taskdefs.Exit.execute(Exit.java:162)
-	at org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:299)
-	at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:580)
-	at org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:99)
-	at org.apache.tools.ant.Task.perform(Task.java:350)
-	at org.apache.tools.ant.Target.execute(Target.java:449)
-	at org.apache.tools.ant.Target.performTasks(Target.java:470)
-	at org.apache.tools.ant.Project.executeSortedTargets(Project.java:1401)
-	at org.apache.tools.ant.Project.executeTarget(Project.java:1374)
-	at org.apache.tools.ant.BuildFileRule.executeTarget(BuildFileRule.java:197)
-	at org.apache.tools.ant.taskdefs.JavaTest.testRedirect3(JavaTest.java:341)
-5) testResultPropertyZero(org.apache.tools.ant.taskdefs.JavaTest)
-org.junit.ComparisonFailure: expected:<[0]> but was:<[1]>
-	at org.junit.Assert.assertEquals(Assert.java:117)
-	at org.junit.Assert.assertEquals(Assert.java:146)
-	at org.apache.tools.ant.taskdefs.JavaTest.testResultPropertyZero(JavaTest.java:273)
-6) testResultPropertyNonZero(org.apache.tools.ant.taskdefs.JavaTest)
-org.junit.ComparisonFailure: expected:<[2]> but was:<[1]>
-	at org.junit.Assert.assertEquals(Assert.java:117)
-	at org.junit.Assert.assertEquals(Assert.java:146)
-	at org.apache.tools.ant.taskdefs.JavaTest.testResultPropertyNonZero(JavaTest.java:279)
-7) testRunSuccessWithFailOnError(org.apache.tools.ant.taskdefs.JavaTest)
-/var/tmp/portage/dev-java/ant-core-1.10.14/work/apache-ant-1.10.14/src/etc/testcases/taskdefs/java.xml:205: Could not find org.apache.tools.ant.taskdefs.JavaTest$EntryPoint. Make sure you have it in your classpath
-	at org.apache.tools.ant.taskdefs.ExecuteJava.execute(ExecuteJava.java:141)
-	at org.apache.tools.ant.taskdefs.Java.run(Java.java:892)
-	at org.apache.tools.ant.taskdefs.Java.executeJava(Java.java:232)
-	at org.apache.tools.ant.taskdefs.Java.executeJava(Java.java:136)
-	at org.apache.tools.ant.taskdefs.Java.execute(Java.java:109)
-	at org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:299)
-	at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:580)
-	at org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:99)
-	at org.apache.tools.ant.Task.perform(Task.java:350)
-	at org.apache.tools.ant.Target.execute(Target.java:449)
-	at org.apache.tools.ant.Target.performTasks(Target.java:470)
-	at org.apache.tools.ant.Project.executeSortedTargets(Project.java:1401)
-	at org.apache.tools.ant.Project.executeTarget(Project.java:1374)
-	at org.apache.tools.ant.BuildFileRule.executeTarget(BuildFileRule.java:197)
-	at org.apache.tools.ant.taskdefs.JavaTest.testRunSuccessWithFailOnError(JavaTest.java:306)
-8) testSpawn(org.apache.tools.ant.taskdefs.JavaTest)
-java.lang.AssertionError: log file exists
-	at org.junit.Assert.fail(Assert.java:89)
-	at org.junit.Assert.assertTrue(Assert.java:42)
-	at org.apache.tools.ant.taskdefs.JavaTest.testSpawn(JavaTest.java:326)
-9) testFlushedInput(org.apache.tools.ant.taskdefs.JavaTest)
-/var/tmp/portage/dev-java/ant-core-1.10.14/work/apache-ant-1.10.14/src/etc/testcases/taskdefs/java.xml:422: Java returned: 1
-	at org.apache.tools.ant.taskdefs.Java.execute(Java.java:114)
-	at org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:299)
-	at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:580)
-	at org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:99)
-	at org.apache.tools.ant.Task.perform(Task.java:350)
-	at org.apache.tools.ant.Target.execute(Target.java:449)
-	at org.apache.tools.ant.Target.performTasks(Target.java:470)
-	at org.apache.tools.ant.Project.executeSortedTargets(Project.java:1401)
-	at org.apache.tools.ant.Project.executeTarget(Project.java:1374)
-	at org.apache.tools.ant.BuildFileRule.executeTarget(BuildFileRule.java:197)
-	at org.apache.tools.ant.taskdefs.JavaTest.testFlushedInput(JavaTest.java:430)
-10) testExceptingFoe(org.apache.tools.ant.taskdefs.JavaTest)
-java.lang.AssertionError: 
-Expected: (an instance of org.apache.tools.ant.BuildException and exception with message a string containing "Exception raised inside called program")
-     but: exception with message a string containing "Exception raised inside called program" message was "Could not find org.apache.tools.ant.taskdefs.JavaTest$ExceptingEntryPoint. Make sure you have it in your classpath"
-Stacktrace was: /var/tmp/portage/dev-java/ant-core-1.10.14/work/apache-ant-1.10.14/src/etc/testcases/taskdefs/java.xml:135: Could not find org.apache.tools.ant.taskdefs.JavaTest$ExceptingEntryPoint. Make sure you have it in your classpath
-	at org.apache.tools.ant.taskdefs.ExecuteJava.execute(ExecuteJava.java:141)
-	at org.apache.tools.ant.taskdefs.Java.run(Java.java:892)
-	at org.apache.tools.ant.taskdefs.Java.executeJava(Java.java:232)
-	at org.apache.tools.ant.taskdefs.Java.executeJava(Java.java:136)
-	at org.apache.tools.ant.taskdefs.Java.execute(Java.java:109)
-	at org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:299)
-	at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:580)
-	at org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:99)
-	at org.apache.tools.ant.Task.perform(Task.java:350)
-	at org.apache.tools.ant.Target.execute(Target.java:449)
-	at org.apache.tools.ant.Target.performTasks(Target.java:470)
-	at org.apache.tools.ant.Project.executeSortedTargets(Project.java:1401)
-	at org.apache.tools.ant.Project.executeTarget(Project.java:1374)
-	at org.apache.tools.ant.BuildFileRule.executeTarget(BuildFileRule.java:197)
-	at org.apache.tools.ant.taskdefs.JavaTest.testExceptingFoe(JavaTest.java:260)
-	at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:580)
-	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:59)
-	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
-	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:61)
-	at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)
-	at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:26)
-	at org.junit.rules.ExternalResource$1.evaluate(ExternalResource.java:54)
-	at org.junit.rules.ExpectedException$ExpectedExceptionStatement.evaluate(ExpectedException.java:258)
-	at org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306)
-	at org.junit.runners.BlockJUnit4ClassRunner$1.evaluate(BlockJUnit4ClassRunner.java:100)
-	at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:366)
-	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:103)
-	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:63)
-	at org.junit.runners.ParentRunner$4.run(ParentRunner.java:331)
-	at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:79)
-	at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:329)
-	at org.junit.runners.ParentRunner.access$100(ParentRunner.java:66)
-	at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:293)
-	at org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306)
-	at org.junit.runners.ParentRunner.run(ParentRunner.java:413)
-	at org.junit.runners.Suite.runChild(Suite.java:128)
-	at org.junit.runners.Suite.runChild(Suite.java:27)
-	at org.junit.runners.ParentRunner$4.run(ParentRunner.java:331)
-	at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:79)
-	at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:329)
-	at org.junit.runners.ParentRunner.access$100(ParentRunner.java:66)
-	at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:293)
-	at org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306)
-	at org.junit.runners.ParentRunner.run(ParentRunner.java:413)
-	at org.junit.runner.JUnitCore.run(JUnitCore.java:137)
-	at org.junit.runner.JUnitCore.run(JUnitCore.java:115)
-	at org.junit.runner.JUnitCore.runMain(JUnitCore.java:77)
-	at org.junit.runner.JUnitCore.main(JUnitCore.java:36)
-
-	at org.hamcrest.MatcherAssert.assertThat(MatcherAssert.java:20)
-	at org.junit.Assert.assertThat(Assert.java:964)
-	at org.junit.Assert.assertThat(Assert.java:930)
-	at org.junit.rules.ExpectedException.handleException(ExpectedException.java:271)
-	at org.junit.rules.ExpectedException.access$000(ExpectedException.java:111)
-	at org.junit.rules.ExpectedException$ExpectedExceptionStatement.evaluate(ExpectedException.java:260)
-	at org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306)
-	at org.junit.runners.BlockJUnit4ClassRunner$1.evaluate(BlockJUnit4ClassRunner.java:100)
-	at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:366)
-	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:103)
-	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:63)
-	at org.junit.runners.ParentRunner$4.run(ParentRunner.java:331)
-	at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:79)
-	at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:329)
-	at org.junit.runners.ParentRunner.access$100(ParentRunner.java:66)
-	at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:293)
-	at org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306)
-	at org.junit.runners.ParentRunner.run(ParentRunner.java:413)
-	at org.junit.runners.Suite.runChild(Suite.java:128)
-	at org.junit.runners.Suite.runChild(Suite.java:27)
-	at org.junit.runners.ParentRunner$4.run(ParentRunner.java:331)
-	at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:79)
-	at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:329)
-	at org.junit.runners.ParentRunner.access$100(ParentRunner.java:66)
-	at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:293)
-	at org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306)
-	at org.junit.runners.ParentRunner.run(ParentRunner.java:413)
-	at org.junit.runner.JUnitCore.run(JUnitCore.java:137)
-	at org.junit.runner.JUnitCore.run(JUnitCore.java:115)
-	at org.junit.runner.JUnitCore.runMain(JUnitCore.java:77)
-	at org.junit.runner.JUnitCore.main(JUnitCore.java:36)
-11) testRedirector1(org.apache.tools.ant.taskdefs.JavaTest)
-/var/tmp/portage/dev-java/ant-core-1.10.14/work/apache-ant-1.10.14/src/etc/testcases/taskdefs/java.xml:353: /var/tmp/portage/dev-java/ant-core-1.10.14/temp/testoutput_24464_main/ant.tmp.java-test/redirect1692380328.out doesn't exist
-	at org.apache.tools.ant.taskdefs.LoadResource.execute(LoadResource.java:142)
-	at org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:299)
-	at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:580)
-	at org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:99)
-	at org.apache.tools.ant.Task.perform(Task.java:350)
-	at org.apache.tools.ant.Target.execute(Target.java:449)
-	at org.apache.tools.ant.Target.performTasks(Target.java:470)
-	at org.apache.tools.ant.Project.executeSortedTargets(Project.java:1401)
-	at org.apache.tools.ant.Project.executeTarget(Project.java:1374)
-	at org.apache.tools.ant.BuildFileRule.executeTarget(BuildFileRule.java:197)
-	at org.apache.tools.ant.taskdefs.JavaTest.testRedirector1(JavaTest.java:346)
-12) testRedirector2(org.apache.tools.ant.taskdefs.JavaTest)
-/var/tmp/portage/dev-java/ant-core-1.10.14/work/apache-ant-1.10.14/src/etc/testcases/taskdefs/java.xml:353: /var/tmp/portage/dev-java/ant-core-1.10.14/temp/testoutput_24464_main/ant.tmp.java-test/redirect1822175330.out doesn't exist
-	at org.apache.tools.ant.taskdefs.LoadResource.execute(LoadResource.java:142)
-	at org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:299)
-	at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:580)
-	at org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:99)
-	at org.apache.tools.ant.Task.perform(Task.java:350)
-	at org.apache.tools.ant.Target.execute(Target.java:449)
-	at org.apache.tools.ant.Target.performTasks(Target.java:470)
-	at org.apache.tools.ant.Project.executeSortedTargets(Project.java:1401)
-	at org.apache.tools.ant.Project.executeTarget(Project.java:1374)
-	at org.apache.tools.ant.BuildFileRule.executeTarget(BuildFileRule.java:197)
-	at org.apache.tools.ant.taskdefs.JavaTest.testRedirector2(JavaTest.java:351)
-
-FAILURES!!!
-Tests run: 38,  Failures: 12
+bug #922775
 --- a/src/tests/junit/org/apache/tools/ant/taskdefs/JavaTest.java
 +++ b/src/tests/junit/org/apache/tools/ant/taskdefs/JavaTest.java
 @@ -42,6 +42,7 @@ import org.junit.AssumptionViolatedException;