Build failed in Jenkins: Ant-Master SonarQube #280

2018-04-14 Thread Apache Jenkins Server 
See 


Changes:

[bodewig] bring back root system property

--
Started by upstream project "Ant-Build-Matrix-master-Linux" build number 1211
originally caused by:
 Started by an SCM change
[EnvInject] - Loading node environment variables.
Building remotely on H24 (ubuntu xenial) in workspace 

 > git rev-parse --is-inside-work-tree # timeout=10
Fetching changes from the remote Git repository
 > git config remote.origin.url https://git-wip-us.apache.org/repos/asf/ant.git 
 > # timeout=10
Fetching upstream changes from https://git-wip-us.apache.org/repos/asf/ant.git
 > git --version # timeout=10
 > git fetch --tags --progress https://git-wip-us.apache.org/repos/asf/ant.git 
 > +refs/heads/*:refs/remotes/origin/*
 > git rev-parse refs/remotes/origin/master^{commit} # timeout=10
 > git rev-parse refs/remotes/origin/origin/master^{commit} # timeout=10
Checking out Revision 46328b6bbfa550a5eaa36d68c3d8d26c0960bcf6 
(refs/remotes/origin/master)
 > git config core.sparsecheckout # timeout=10
 > git checkout -f 46328b6bbfa550a5eaa36d68c3d8d26c0960bcf6
Commit message: "bring back root system property"
 > git rev-list --no-walk 97ac9bc7c0b183d81ddd966edaa02896216f2b3b # timeout=10
Injecting SonarQube environment variables using the configuration: ASF Sonar 
Analysis
[Ant-Master SonarQube] $ /home/jenkins/tools/ant/latest/bin/ant -file 
sonarqube.xml -Dsonar.host.url=https://builds.apache.org/analysis
Buildfile: 


download:
  [get] Getting: 
https://sonarsource.bintray.com/Distribution/sonarqube-ant-task/sonarqube-ant-task-2.5.jar
  [get] To: 

  [get] 
https://sonarsource.bintray.com/Distribution/sonarqube-ant-task/sonarqube-ant-task-2.5.jar
 moved to 
https://akamai.bintray.com/43/43e7a8e0a5f8d44cd602de4a7ccf2e819e23429370d1b97425d38562651331cf?__gda__=exp=1523734299~hmac=2b1f8e3da9c3f880b62564b6cec985ebe2f0c83ae3fc8f5bced23e7f80a544bb&response-content-disposition=attachment%3Bfilename%3D%22sonarqube-ant-task-2.5.jar%22&response-content-type=application%2Fjava-archive&requestInfo=U2FsdGVkX1-5xibBngnjLkBkWh72p0AEy3ESsPyZt30gw55SAkmuYDgRsDmtbAqdKrjjViSTC4M0od0H3ElS2jxIZHR8ai4kpRGJ8kMd4shG3qcW7m_OOQkoxqCyXETR3llp3Hi6UrkN7iwy80tW4w&response-X-Checksum-Sha1=c33184c4cf5b2ec375ae9838887149c2f0dda132&response-X-Checksum-Sha2=43e7a8e0a5f8d44cd602de4a7ccf2e819e23429370d1b97425d38562651331cf

sonar:
[sonar:sonar] Apache Ant(TM) version 1.10.1 compiled on February 2 2017
[sonar:sonar] SonarQube Ant Task version: 2.5
[sonar:sonar] Loaded from: 

[sonar:sonar] User cache: /home/jenkins/.sonar/cache
[sonar:sonar] Load global repositories

BUILD FAILED
:24: 
java.lang.IllegalStateException: Batch is not started. Unable to execute task.
at org.sonar.batch.bootstrapper.Batch.checkStarted(Batch.java:142)
at org.sonar.batch.bootstrapper.Batch.doStop(Batch.java:178)
at org.sonar.batch.bootstrapper.Batch.stop(Batch.java:174)
at 
org.sonarsource.scanner.api.internal.batch.BatchIsolatedLauncher.stop(BatchIsolatedLauncher.java:57)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at 
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
at 
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:498)
at 
org.sonarsource.scanner.api.internal.IsolatedLauncherProxy.invoke(IsolatedLauncherProxy.java:60)
at com.sun.proxy.$Proxy0.stop(Unknown Source)
at 
org.sonarsource.scanner.api.EmbeddedScanner.doStop(EmbeddedScanner.java:226)
at 
org.sonarsource.scanner.api.EmbeddedScanner.stop(EmbeddedScanner.java:165)
at 
org.sonarsource.scanner.ant.SonarQubeTask.launchAnalysis(SonarQubeTask.java:101)
at 
org.sonarsource.scanner.ant.SonarQubeTask.execute(SonarQubeTask.java:81)
at org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:293)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at 
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
at 
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:498)
at 
org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:106)
at org.apache.tools.ant.Task.perform(Task.java:348)
at org.apache.tools.ant.Target.execute(Target.java:435)
at org.apache.tools.ant.Targe

Jenkins build is back to stable : Ant-Build-Matrix-master-Windows » JDK 1.8.0_121 (unlimited security) 64-bit Windows only,Windows #317

2018-04-14 Thread Apache Jenkins Server 
See

ant git commit: bring back root system property

2018-04-14 Thread bodewig 
Repository: ant
Updated Branches:
  refs/heads/master 97ac9bc7c -> 46328b6bb


bring back root system property


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/46328b6b
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/46328b6b
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/46328b6b

Branch: refs/heads/master
Commit: 46328b6bbfa550a5eaa36d68c3d8d26c0960bcf6
Parents: 97ac9bc
Author: Stefan Bodewig 
Authored: Sat Apr 14 20:35:31 2018 +0200
Committer: Stefan Bodewig 
Committed: Sat Apr 14 20:35:31 2018 +0200

--
 src/tests/junit/org/apache/tools/ant/taskdefs/ImportTest.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/46328b6b/src/tests/junit/org/apache/tools/ant/taskdefs/ImportTest.java
--
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/ImportTest.java 
b/src/tests/junit/org/apache/tools/ant/taskdefs/ImportTest.java
index 29680f0..c6e2acc 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/ImportTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/ImportTest.java
@@ -125,15 +125,15 @@ public class ImportTest {
 }
 assumeTrue("Current system does not support Symlinks", new 
File(ln).exists());
 String symlink = "src/etc/testcases/taskdefs/import/symlinks/d3b";
-File symlinkFile = new File(symlink);
+File symlinkFile = new File(System.getProperty("root"), symlink);
 assertEquals("'" + ln + " -s d3a " + symlink + "' failed",
 Runtime.getRuntime().exec(new String[] {ln, "-s", "d3a", 
symlinkFile.getAbsolutePath()}).waitFor(), 0);
 try {
 
buildRule.configureProject("src/etc/testcases/taskdefs/import/symlinks/d1/p1.xml");
 assertEquals(buildRule.getProject().getProperty("ant.file.p2"),
-new 
File("src/etc/testcases/taskdefs/import/symlinks/d2/p2.xml").getAbsolutePath());
+new File(System.getProperty("root"), 
"src/etc/testcases/taskdefs/import/symlinks/d2/p2.xml").getAbsolutePath());
 assertEquals(buildRule.getProject().getProperty("ant.file.p3"),
-new 
File("src/etc/testcases/taskdefs/import/symlinks/d3b/p3.xml").getAbsolutePath());
+new File(System.getProperty("root"), 
"src/etc/testcases/taskdefs/import/symlinks/d3b/p3.xml").getAbsolutePath());
 } finally {
 symlinkFile.delete();
 }

Build failed in Jenkins: Ant-Master SonarQube #279

2018-04-14 Thread Apache Jenkins Server 
See 


Changes:

[bodewig] the assertion used to be conditional

--
Started by upstream project "Ant-Build-Matrix-master-Linux" build number 1210
originally caused by:
 Started by an SCM change
[EnvInject] - Loading node environment variables.
Building remotely on H34 (ubuntu xenial) in workspace 

 > git rev-parse --is-inside-work-tree # timeout=10
Fetching changes from the remote Git repository
 > git config remote.origin.url https://git-wip-us.apache.org/repos/asf/ant.git 
 > # timeout=10
Fetching upstream changes from https://git-wip-us.apache.org/repos/asf/ant.git
 > git --version # timeout=10
 > git fetch --tags --progress https://git-wip-us.apache.org/repos/asf/ant.git 
 > +refs/heads/*:refs/remotes/origin/*
 > git rev-parse refs/remotes/origin/master^{commit} # timeout=10
 > git rev-parse refs/remotes/origin/origin/master^{commit} # timeout=10
Checking out Revision 97ac9bc7c0b183d81ddd966edaa02896216f2b3b 
(refs/remotes/origin/master)
 > git config core.sparsecheckout # timeout=10
 > git checkout -f 97ac9bc7c0b183d81ddd966edaa02896216f2b3b
Commit message: "the assertion used to be conditional"
 > git rev-list --no-walk 6c032e687dc5db46e199bb17856dfb7a91ad48a3 # timeout=10
Injecting SonarQube environment variables using the configuration: ASF Sonar 
Analysis
[Ant-Master SonarQube] $ /home/jenkins/tools/ant/latest/bin/ant -file 
sonarqube.xml -Dsonar.host.url=https://builds.apache.org/analysis
Buildfile: 


download:
  [get] Getting: 
https://sonarsource.bintray.com/Distribution/sonarqube-ant-task/sonarqube-ant-task-2.5.jar
  [get] To: 

  [get] 
https://sonarsource.bintray.com/Distribution/sonarqube-ant-task/sonarqube-ant-task-2.5.jar
 moved to 
https://akamai.bintray.com/43/43e7a8e0a5f8d44cd602de4a7ccf2e819e23429370d1b97425d38562651331cf?__gda__=exp=1523730559~hmac=a5c795a08e9576f84d57ab16bb5718cdeca50b03323323085ed508d90aeaba2c&response-content-disposition=attachment%3Bfilename%3D%22sonarqube-ant-task-2.5.jar%22&response-content-type=application%2Fjava-archive&requestInfo=U2FsdGVkX18pVoihA_MIArj13U21VO3wDw1S9GzRrrCGnsVEaww1UvBA0CSrETUGL7l_TegBQLsMmFy33z2ibChd8XteLkLmV1eDyzx8bItZxLbjlUGS2uHmhgK7fdbQpxG4RzRtkHfbJOSJrzrl2Q&response-X-Checksum-Sha1=c33184c4cf5b2ec375ae9838887149c2f0dda132&response-X-Checksum-Sha2=43e7a8e0a5f8d44cd602de4a7ccf2e819e23429370d1b97425d38562651331cf

sonar:
[sonar:sonar] Apache Ant(TM) version 1.10.1 compiled on February 2 2017
[sonar:sonar] SonarQube Ant Task version: 2.5
[sonar:sonar] Loaded from: 

[sonar:sonar] User cache: /home/jenkins/.sonar/cache
[sonar:sonar] Load global repositories
[sonar:sonar] Load global repositories (done) | time=1250ms
[sonar:sonar] Server id: 17cad23492ff68b
[sonar:sonar] User cache: /home/jenkins/.sonar/cache
[sonar:sonar] Load plugins index
[sonar:sonar] Load plugins index (done) | time=707ms
[sonar:sonar] Default locale: "en_US", source code encoding: "ISO-8859-1" 
(analysis is platform dependent)
[sonar:sonar] Process project properties
[sonar:sonar] Load project repositories
[sonar:sonar] Load project repositories (done) | time=1384ms
[sonar:sonar] Load quality profiles
[sonar:sonar] Load quality profiles (done) | time=372ms
[sonar:sonar] Load active rules

BUILD FAILED
:24: 
java.lang.IllegalStateException: Unable to load component class 
org.sonar.batch.report.ActiveRulesPublisher
at 
org.sonar.core.platform.ComponentContainer$ExtendedDefaultPicoContainer.getComponent(ComponentContainer.java:69)
at 
org.picocontainer.DefaultPicoContainer.getComponent(DefaultPicoContainer.java:621)
at 
org.picocontainer.parameters.CollectionComponentParameter.getArrayInstance(CollectionComponentParameter.java:334)
at 
org.picocontainer.parameters.CollectionComponentParameter.access$100(CollectionComponentParameter.java:49)
at 
org.picocontainer.parameters.CollectionComponentParameter$1.resolveInstance(CollectionComponentParameter.java:139)
at 
org.picocontainer.parameters.ComponentParameter$1.resolveInstance(ComponentParameter.java:141)
at 
org.picocontainer.injectors.SingleMemberInjector.getParameter(SingleMemberInjector.java:78)
at 
org.picocontainer.injectors.ConstructorInjector$CtorAndAdapters.getParameterArguments(ConstructorInjector.java:309)
at 
org.picocontainer.injectors.ConstructorInjector$1.run(ConstructorInjector.java:335)
at 
org.picocontainer.injectors.AbstractInjector$ThreadLocalCyclicDependencyGuard.observe(AbstractInjector.java:270)

ant git commit: the assertion used to be conditional

2018-04-14 Thread bodewig 
Repository: ant
Updated Branches:
  refs/heads/master 6c032e687 -> 97ac9bc7c


the assertion used to be conditional


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/97ac9bc7
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/97ac9bc7
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/97ac9bc7

Branch: refs/heads/master
Commit: 97ac9bc7c0b183d81ddd966edaa02896216f2b3b
Parents: 6c032e6
Author: Stefan Bodewig 
Authored: Sat Apr 14 19:54:05 2018 +0200
Committer: Stefan Bodewig 
Committed: Sat Apr 14 19:56:46 2018 +0200

--
 .../junit/org/apache/tools/ant/types/RedirectorElementTest.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/97ac9bc7/src/tests/junit/org/apache/tools/ant/types/RedirectorElementTest.java
--
diff --git 
a/src/tests/junit/org/apache/tools/ant/types/RedirectorElementTest.java 
b/src/tests/junit/org/apache/tools/ant/types/RedirectorElementTest.java
index db1c4f8..ee97275 100644
--- a/src/tests/junit/org/apache/tools/ant/types/RedirectorElementTest.java
+++ b/src/tests/junit/org/apache/tools/ant/types/RedirectorElementTest.java
@@ -75,8 +75,9 @@ public class RedirectorElementTest {
 @Test
 public void testLogInputString() {
 buildRule.executeTarget("testLogInputString");
-assertThat(buildRule.getFullLog(), 
both(containsString("testLogInputString can-cat"))
-.and(containsString("Using input string")));
+if (buildRule.getLog().contains("testLogInputString can-cat")) {
+assertThat(buildRule.getFullLog(), containsString("Using input 
string"));
+}
 }
 
 @Test

Build failed in Jenkins: Ant-Build-Matrix-1.9.x-Linux » xenial,JDK 1.6 (latest) #210

2018-04-14 Thread Apache Jenkins Server 
See 


Changes:

[bodewig] it's enough to have one antunit dir inside of ./build

--
[...truncated 125.02 KB...]
 [exec] 7ff65400-7ff654021000 rwxp  00:00 0 
 [exec] 7ff654021000-7ff65800 ---p  00:00 0 
 [exec] 7ff65800-7ff65ab7d000 rwxp  00:00 0 
 [exec] 7ff65ab7d000-7ff65c00 ---p  00:00 0 
 [exec] 7ff65c00-7ff65c021000 rwxp  00:00 0 
 [exec] 7ff65c021000-7ff66000 ---p  00:00 0 
 [exec] 7ff66000-7ff660021000 rwxp  00:00 0 
 [exec] 7ff660021000-7ff66400 ---p  00:00 0 
 [exec] 7ff66400-7ff664031000 rwxp  00:00 0 
 [exec] 7ff664031000-7ff66800 ---p  00:00 0 
 [exec] 7ff66800-7ff668021000 rwxp  00:00 0 
 [exec] 7ff668021000-7ff66c00 ---p  00:00 0 
 [exec] 7ff66e2a7000-7ff66e2bd000 r-xp  08:01 19791937  
 /lib/x86_64-linux-gnu/libgcc_s.so.1
 [exec] 7ff66e2bd000-7ff66e4bc000 ---p 00016000 08:01 19791937  
 /lib/x86_64-linux-gnu/libgcc_s.so.1
 [exec] 7ff66e4bc000-7ff66e4bd000 rwxp 00015000 08:01 19791937  
 /lib/x86_64-linux-gnu/libgcc_s.so.1
 [exec] 7ff66e4cf000-7ff66e4d2000 ---p  00:00 0 
 [exec] 7ff66e4d2000-7ff66e5d rwxp  00:00 0 
 [exec] 7ff66e5d-7ff66e5d3000 ---p  00:00 0 
 [exec] 7ff66e5d3000-7ff66e6d1000 rwxp  00:00 0 
 [exec] 7ff66e6d1000-7ff66e6d4000 ---p  00:00 0 
 [exec] 7ff66e6d4000-7ff66e7d2000 rwxp  00:00 0 
 [exec] 7ff66e7d2000-7ff66e7d5000 ---p  00:00 0 
 [exec] 7ff66e7d5000-7ff66e8d3000 rwxp  00:00 0 
 [exec] 7ff66e8d3000-7ff66e8d6000 ---p  00:00 0 
 [exec] 7ff66e8d6000-7ff66e9d4000 rwxp  00:00 0 
 [exec] 7ff66e9d4000-7ff66e9d7000 ---p  00:00 0 
 [exec] 7ff66e9d7000-7ff66ead5000 rwxp  00:00 0 
 [exec] 7ff66ead5000-7ff66eaec000 r-xp  08:01 19792500  
 /lib/x86_64-linux-gnu/libresolv-2.23.so
 [exec] 7ff66eaec000-7ff66ecec000 ---p 00017000 08:01 19792500  
 /lib/x86_64-linux-gnu/libresolv-2.23.so
 [exec] 7ff66ecec000-7ff66eced000 r-xp 00017000 08:01 19792500  
 /lib/x86_64-linux-gnu/libresolv-2.23.so
 [exec] 7ff66eced000-7ff66ecee000 rwxp 00018000 08:01 19792500  
 /lib/x86_64-linux-gnu/libresolv-2.23.so
 [exec] 7ff66ecee000-7ff66ecf rwxp  00:00 0 
 [exec] 7ff66ecf-7ff66ecf5000 r-xp  08:01 19804458  
 /lib/x86_64-linux-gnu/libnss_dns-2.23.so
 [exec] 7ff66ecf5000-7ff66eef5000 ---p 5000 08:01 19804458  
 /lib/x86_64-linux-gnu/libnss_dns-2.23.so
 [exec] 7ff66eef5000-7ff66eef6000 r-xp 5000 08:01 19804458  
 /lib/x86_64-linux-gnu/libnss_dns-2.23.so
 [exec] 7ff66eef6000-7ff66eef7000 rwxp 6000 08:01 19804458  
 /lib/x86_64-linux-gnu/libnss_dns-2.23.so
 [exec] 7ff66eef7000-7ff66eefe000 r-xp  08:01 11013056  
 /usr/local/asfpackages/java/jdk1.6.0_45-64/jre/lib/amd64/libnio.so
 [exec] 7ff66eefe000-7ff66effd000 ---p 7000 08:01 11013056  
 /usr/local/asfpackages/java/jdk1.6.0_45-64/jre/lib/amd64/libnio.so
 [exec] 7ff66effd000-7ff66efff000 rwxp 6000 08:01 11013056  
 /usr/local/asfpackages/java/jdk1.6.0_45-64/jre/lib/amd64/libnio.so
 [exec] 7ff66efff000-7ff66f2bf000 rwxp  00:00 0 
 [exec] 7ff66f2bf000-7ff66f2d2000 r-xp  08:01 11013080  
 /usr/local/asfpackages/java/jdk1.6.0_45-64/jre/lib/amd64/libnet.so
 [exec] 7ff66f2d2000-7ff66f3d3000 ---p 00013000 08:01 11013080  
 /usr/local/asfpackages/java/jdk1.6.0_45-64/jre/lib/amd64/libnet.so
 [exec] 7ff66f3d3000-7ff66f3d6000 rwxp 00014000 08:01 11013080  
 /usr/local/asfpackages/java/jdk1.6.0_45-64/jre/lib/amd64/libnet.so
 [exec] 7ff66f3d6000-7ff66f3d7000 ---p  00:00 0 
 [exec] 7ff66f3d7000-7ff66f4d7000 rwxp  00:00 0 
 [exec] 7ff66f4d7000-7ff66f4da000 ---p  00:00 0 
 [exec] 7ff66f4da000-7ff66f5d8000 rwxp  00:00 0 
 [exec] 7ff66f5d8000-7ff66f5db000 ---p  00:00 0 
 [exec] 7ff66f5db000-7ff66f6d9000 rwxp  00:00 0 
 [exec] 7ff66f6d9000-7ff66f6dc000 ---p  00:00 0 
 [exec] 7ff66f6dc000-7ff66f7da000 rwxp  00:00 0 
 [exec] 7ff66f7da000-7ff66f7dd000 ---p  00:00 0 
 [exec] 7ff66f7dd000-7ff66f8db000 rwxp  00:00 0 
 [exec] 7ff66f8db000-7ff66fbfc000 r-xp  08:01 6314940   
 /usr/lib/locale/locale-archive
 [exec] 7ff66fbfc000-7ff66fbff000 ---p  00:00 0 
 [exec] 7ff66fbff000-7ff66fcfd000 rwxp

[Bug 62286] Illegalargument exception occurrs while parsing properties from a file that contains \u in its property key,value

2018-04-14 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=62286

Stefan Bodewig  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |INVALID

-- 
You are receiving this mail because:
You are the assignee for the bug.

[1/3] ant git commit: fix incorrect warning in the junit task when includeAntRuntime="no"

2018-04-14 Thread bodewig 
Repository: ant
Updated Branches:
  refs/heads/master 81c3e6e3d -> 6c032e687


fix incorrect warning in the junit task when includeAntRuntime="no"

fixed by making the classloader used by checkForkedPath behave like a real 
forked classpath, thus completely isolated from the launching jvm


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/b38bf68f
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/b38bf68f
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/b38bf68f

Branch: refs/heads/master
Commit: b38bf68f5c8a29ba7befa0760251f5f61d25ae32
Parents: 50a1d4a
Author: Nicolas Lalevée 
Authored: Fri Apr 13 21:54:19 2018 +0200
Committer: Stefan Bodewig 
Committed: Sat Apr 14 18:31:08 2018 +0200

--
 WHATSNEW|  3 ++
 src/etc/testcases/taskdefs/optional/junit.xml   | 15 ++
 .../ant/taskdefs/optional/junit/JUnitTask.java  |  3 +-
 .../taskdefs/optional/junit/JUnitTaskTest.java  | 30 
 4 files changed, 50 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/b38bf68f/WHATSNEW
--
diff --git a/WHATSNEW b/WHATSNEW
index 157c201..4a75837 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -10,6 +10,9 @@ Fixed bugs:
is 'true'.
Bugzilla Report 60062
 
+ * The junit task when used with includeantruntime="no" was incorrectly
+   printing a warning about multiple versions of ant detected in path
+
 Changes from Ant 1.9.10 TO Ant 1.9.11
 =
 

http://git-wip-us.apache.org/repos/asf/ant/blob/b38bf68f/src/etc/testcases/taskdefs/optional/junit.xml
--
diff --git a/src/etc/testcases/taskdefs/optional/junit.xml 
b/src/etc/testcases/taskdefs/optional/junit.xml
index cc66e20..34d8cb2 100644
--- a/src/etc/testcases/taskdefs/optional/junit.xml
+++ b/src/etc/testcases/taskdefs/optional/junit.xml
@@ -358,4 +358,19 @@
 
   
 
+  
+
+
+
+
+  
+  
+
+
+
+  
+
+  
+
 

http://git-wip-us.apache.org/repos/asf/ant/blob/b38bf68f/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
--
diff --git 
a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java 
b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
index dcf66c1..e587474 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
@@ -1395,7 +1395,8 @@ public class JUnitTask extends Task {
 loader =
 AntClassLoader.newAntClassLoader(null, getProject(),
  
cmd.createClasspath(getProject()),
- true);
+ false);
+loader.setIsolated(true);
 final String projectResourceName =
 LoaderUtils.classNameToResource(Project.class.getName());
 URL previous = null;

http://git-wip-us.apache.org/repos/asf/ant/blob/b38bf68f/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskTest.java
--
diff --git 
a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskTest.java
 
b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskTest.java
index 28d7f9c..6c0d4b4 100644
--- 
a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskTest.java
+++ 
b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskTest.java
@@ -577,6 +577,36 @@ public class JUnitTaskTest {
 }
 }
 
+private void setupCheckDuplicateTest() {
+final String projectResourceName =
+LoaderUtils.classNameToResource(Project.class.getName());
+final File antclasses = LoaderUtils.getResourceSource(
+Project.class.getClassLoader(), projectResourceName);
+final String testResourceName =
+
LoaderUtils.classNameToResource(junit.framework.Test.class.getName());
+final File junitJar = LoaderUtils.getResourceSource(
+Project.class.getClassLoader(), testResourceName);
+buildRule.getProject().setProperty("antclasses", 
antclasses.getAbsolutePath());
+buildRule.getProject().setProperty("junitjar", 
junitJar.getAbsolutePath());
+}
+
+@Test
+public void testCheckDuplicateAntJar() throws Exception {
+setupCheckDuplicateTest();
+buildRule.executeTarget("testCheckForkedPath");
+assertTrue("Expecting the warning about

[2/3] ant git commit: it's enough to have one antunit dir inside of ./build

2018-04-14 Thread bodewig 
it's enough to have one antunit dir inside of ./build


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/38a22b0c
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/38a22b0c
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/38a22b0c

Branch: refs/heads/master
Commit: 38a22b0cfd2356bdfc0d58835d5ccec24b394715
Parents: b38bf68
Author: Stefan Bodewig 
Authored: Sat Apr 14 18:54:48 2018 +0200
Committer: Stefan Bodewig 
Committed: Sat Apr 14 18:54:48 2018 +0200

--
 src/tests/antunit/core/location/location.xml   | 2 +-
 .../taskdefs/optional/junit/junit-outputtoformatters-test.xml  | 2 +-
 src/tests/antunit/taskdefs/taskdef-antlib-test.xml | 2 +-
 src/tests/antunit/taskdefs/taskdef-test.xml| 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/38a22b0c/src/tests/antunit/core/location/location.xml
--
diff --git a/src/tests/antunit/core/location/location.xml 
b/src/tests/antunit/core/location/location.xml
index 091d6f3..bf37d9f 100644
--- a/src/tests/antunit/core/location/location.xml
+++ b/src/tests/antunit/core/location/location.xml
@@ -20,7 +20,7 @@

   
   
+location="${ant.build.dir}/antunit/location-dir"/>
   
   
   

http://git-wip-us.apache.org/repos/asf/ant/blob/38a22b0c/src/tests/antunit/taskdefs/optional/junit/junit-outputtoformatters-test.xml
--
diff --git 
a/src/tests/antunit/taskdefs/optional/junit/junit-outputtoformatters-test.xml 
b/src/tests/antunit/taskdefs/optional/junit/junit-outputtoformatters-test.xml
index 29068e4..c84ae49 100644
--- 
a/src/tests/antunit/taskdefs/optional/junit/junit-outputtoformatters-test.xml
+++ 
b/src/tests/antunit/taskdefs/optional/junit/junit-outputtoformatters-test.xml
@@ -18,7 +18,7 @@
 
   
   
-  
+  
   
 
   

http://git-wip-us.apache.org/repos/asf/ant/blob/38a22b0c/src/tests/antunit/taskdefs/taskdef-antlib-test.xml
--
diff --git a/src/tests/antunit/taskdefs/taskdef-antlib-test.xml 
b/src/tests/antunit/taskdefs/taskdef-antlib-test.xml
index 58d01f0..b03911e 100644
--- a/src/tests/antunit/taskdefs/taskdef-antlib-test.xml
+++ b/src/tests/antunit/taskdefs/taskdef-antlib-test.xml
@@ -22,7 +22,7 @@
 
 
 
-
+

[3/3] ant git commit: Merge branch '1.9.x'

2018-04-14 Thread bodewig 
Merge branch '1.9.x'


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/6c032e68
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/6c032e68
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/6c032e68

Branch: refs/heads/master
Commit: 6c032e687dc5db46e199bb17856dfb7a91ad48a3
Parents: 81c3e6e 38a22b0
Author: Stefan Bodewig 
Authored: Sat Apr 14 18:56:07 2018 +0200
Committer: Stefan Bodewig 
Committed: Sat Apr 14 18:56:07 2018 +0200

--
 src/tests/antunit/core/location/location.xml   | 2 +-
 .../taskdefs/optional/junit/junit-outputtoformatters-test.xml  | 2 +-
 src/tests/antunit/taskdefs/taskdef-antlib-test.xml | 2 +-
 src/tests/antunit/taskdefs/taskdef-test.xml| 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/6c032e68/src/tests/antunit/taskdefs/taskdef-antlib-test.xml
--
diff --cc src/tests/antunit/taskdefs/taskdef-antlib-test.xml
index 72f21ae,b03911e..a201603
--- a/src/tests/antunit/taskdefs/taskdef-antlib-test.xml
+++ b/src/tests/antunit/taskdefs/taskdef-antlib-test.xml
@@@ -18,9 -18,11 +18,9 @@@
  
  
  
 -
 -
 -
 +
  
- 
+

ant git commit: it's enough to have one antunit dir inside of ./build

2018-04-14 Thread bodewig 
Repository: ant
Updated Branches:
  refs/heads/1.9.x b38bf68f5 -> 38a22b0cf


it's enough to have one antunit dir inside of ./build


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/38a22b0c
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/38a22b0c
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/38a22b0c

Branch: refs/heads/1.9.x
Commit: 38a22b0cfd2356bdfc0d58835d5ccec24b394715
Parents: b38bf68
Author: Stefan Bodewig 
Authored: Sat Apr 14 18:54:48 2018 +0200
Committer: Stefan Bodewig 
Committed: Sat Apr 14 18:54:48 2018 +0200

--
 src/tests/antunit/core/location/location.xml   | 2 +-
 .../taskdefs/optional/junit/junit-outputtoformatters-test.xml  | 2 +-
 src/tests/antunit/taskdefs/taskdef-antlib-test.xml | 2 +-
 src/tests/antunit/taskdefs/taskdef-test.xml| 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/38a22b0c/src/tests/antunit/core/location/location.xml
--
diff --git a/src/tests/antunit/core/location/location.xml 
b/src/tests/antunit/core/location/location.xml
index 091d6f3..bf37d9f 100644
--- a/src/tests/antunit/core/location/location.xml
+++ b/src/tests/antunit/core/location/location.xml
@@ -20,7 +20,7 @@

   
   
+location="${ant.build.dir}/antunit/location-dir"/>
   
   
   

http://git-wip-us.apache.org/repos/asf/ant/blob/38a22b0c/src/tests/antunit/taskdefs/optional/junit/junit-outputtoformatters-test.xml
--
diff --git 
a/src/tests/antunit/taskdefs/optional/junit/junit-outputtoformatters-test.xml 
b/src/tests/antunit/taskdefs/optional/junit/junit-outputtoformatters-test.xml
index 29068e4..c84ae49 100644
--- 
a/src/tests/antunit/taskdefs/optional/junit/junit-outputtoformatters-test.xml
+++ 
b/src/tests/antunit/taskdefs/optional/junit/junit-outputtoformatters-test.xml
@@ -18,7 +18,7 @@
 
   
   
-  
+  
   
 
   

http://git-wip-us.apache.org/repos/asf/ant/blob/38a22b0c/src/tests/antunit/taskdefs/taskdef-antlib-test.xml
--
diff --git a/src/tests/antunit/taskdefs/taskdef-antlib-test.xml 
b/src/tests/antunit/taskdefs/taskdef-antlib-test.xml
index 58d01f0..b03911e 100644
--- a/src/tests/antunit/taskdefs/taskdef-antlib-test.xml
+++ b/src/tests/antunit/taskdefs/taskdef-antlib-test.xml
@@ -22,7 +22,7 @@
 
 
 
-
+

Build failed in Jenkins: Ant-Build-Matrix-1.9.x-Linux » xenial,JDK 1.6 (latest) #209

2018-04-14 Thread Apache Jenkins Server 
See 


Changes:

[bodewig] fix incorrect warning in the junit task when includeAntRuntime="no"

--
[...truncated 125.45 KB...]
 [exec] 7fa8dc021000-7fa8e000 ---p  00:00 0 
 [exec] 7fa8e000-7fa8e0021000 rwxp  00:00 0 
 [exec] 7fa8e0021000-7fa8e400 ---p  00:00 0 
 [exec] 7fa8e400-7fa8e783e000 rwxp  00:00 0 
 [exec] 7fa8e783e000-7fa8e800 ---p  00:00 0 
 [exec] 7fa8e800-7fa8e8021000 rwxp  00:00 0 
 [exec] 7fa8e8021000-7fa8ec00 ---p  00:00 0 
 [exec] 7fa8ec00-7fa8ec021000 rwxp  00:00 0 
 [exec] 7fa8ec021000-7fa8f000 ---p  00:00 0 
 [exec] 7fa8f000-7fa8f0021000 rwxp  00:00 0 
 [exec] 7fa8f0021000-7fa8f400 ---p  00:00 0 
 [exec] 7fa8f400-7fa8f4021000 rwxp  00:00 0 
 [exec] 7fa8f4021000-7fa8f800 ---p  00:00 0 
 [exec] 7fa8f800-7fa8f8021000 rwxp  00:00 0 
 [exec] 7fa8f8021000-7fa8fc00 ---p  00:00 0 
 [exec] 7fa8fc00-7fa8fc021000 rwxp  00:00 0 
 [exec] 7fa8fc021000-7fa9 ---p  00:00 0 
 [exec] 7fa9-7fa900021000 rwxp  00:00 0 
 [exec] 7fa900021000-7fa90400 ---p  00:00 0 
 [exec] 7fa90400-7fa904021000 rwxp  00:00 0 
 [exec] 7fa904021000-7fa90800 ---p  00:00 0 
 [exec] 7fa90800-7fa908021000 rwxp  00:00 0 
 [exec] 7fa908021000-7fa90c00 ---p  00:00 0 
 [exec] 7fa90c00-7fa90c021000 rwxp  00:00 0 
 [exec] 7fa90c021000-7fa91000 ---p  00:00 0 
 [exec] 7fa91000-7fa910021000 rwxp  00:00 0 
 [exec] 7fa910021000-7fa91400 ---p  00:00 0 
 [exec] 7fa91400-7fa914021000 rwxp  00:00 0 
 [exec] 7fa914021000-7fa91800 ---p  00:00 0 
 [exec] 7fa91800-7fa918021000 rwxp  00:00 0 
 [exec] 7fa918021000-7fa91c00 ---p  00:00 0 
 [exec] 7fa91c00-7fa91c021000 rwxp  00:00 0 
 [exec] 7fa91c021000-7fa92000 ---p  00:00 0 
 [exec] 7fa92000-7fa920021000 rwxp  00:00 0 
 [exec] 7fa920021000-7fa92400 ---p  00:00 0 
 [exec] 7fa92400-7fa924021000 rwxp  00:00 0 
 [exec] 7fa924021000-7fa92800 ---p  00:00 0 
 [exec] 7fa92800-7fa928021000 rwxp  00:00 0 
 [exec] 7fa928021000-7fa92c00 ---p  00:00 0 
 [exec] 7fa92c00-7fa92c021000 rwxp  00:00 0 
 [exec] 7fa92c021000-7fa93000 ---p  00:00 0 
 [exec] 7fa93006d000-7fa930083000 r-xp  08:01 19791937  
 /lib/x86_64-linux-gnu/libgcc_s.so.1
 [exec] 7fa930083000-7fa930282000 ---p 00016000 08:01 19791937  
 /lib/x86_64-linux-gnu/libgcc_s.so.1
 [exec] 7fa930282000-7fa930283000 rwxp 00015000 08:01 19791937  
 /lib/x86_64-linux-gnu/libgcc_s.so.1
 [exec] 7fa930283000-7fa930286000 ---p  00:00 0 
 [exec] 7fa930286000-7fa930384000 rwxp  00:00 0 
 [exec] 7fa930384000-7fa930387000 ---p  00:00 0 
 [exec] 7fa930387000-7fa930485000 rwxp  00:00 0 
 [exec] 7fa930485000-7fa930488000 ---p  00:00 0 
 [exec] 7fa930488000-7fa930586000 rwxp  00:00 0 
 [exec] 7fa930586000-7fa930589000 ---p  00:00 0 
 [exec] 7fa930589000-7fa930687000 rwxp  00:00 0 
 [exec] 7fa930687000-7fa93068a000 ---p  00:00 0 
 [exec] 7fa93068a000-7fa930788000 rwxp  00:00 0 
 [exec] 7fa930788000-7fa93078b000 ---p  00:00 0 
 [exec] 7fa93078b000-7fa930889000 rwxp  00:00 0 
 [exec] 7fa930889000-7fa9308a r-xp  08:01 19792500  
 /lib/x86_64-linux-gnu/libresolv-2.23.so
 [exec] 7fa9308a-7fa930aa ---p 00017000 08:01 19792500  
 /lib/x86_64-linux-gnu/libresolv-2.23.so
 [exec] 7fa930aa-7fa930aa1000 r-xp 00017000 08:01 19792500  
 /lib/x86_64-linux-gnu/libresolv-2.23.so
 [exec] 7fa930aa1000-7fa930aa2000 rwxp 00018000 08:01 19792500  
 /lib/x86_64-linux-gnu/libresolv-2.23.so
 [exec] 7fa930aa2000-7fa930aa4000 rwxp  00:00 0 
 [exec] 7fa930aa4000-7fa930aa9000 r-xp  08:01 19804458  
 /lib/x86_64-linux-gnu/libnss_dns-2.23.so
 [exec] 7fa930aa9000-7fa930ca9000 ---p 5000 08:01 19804458  
 /lib/x86_64-linux-gnu/libnss_dns-2.23.so
 [exec] 7fa930ca9000-7fa930caa000 r-xp 5000 08:01 19804458  
 /lib/x86_64-linux-gnu/libnss_dns-2.23.so
 [exec] 7fa930caa000-7fa930cab000 rwxp 6000 08:01 19804458  
 /lib/x86_64-linux-gnu/libnss_dns-2.23.so
 [exec] 7fa930cab000-7fa930

svn commit: r26339 - in /release/ant: ./ binaries/ manual/ source/

2018-04-14 Thread bodewig 
Author: bodewig
Date: Sat Apr 14 16:41:03 2018
New Revision: 26339

Log:
spring cleaning

Removed:
release/ant/RELEASE-NOTES-1.10.2.html
release/ant/RELEASE-NOTES-1.9.10.html
release/ant/binaries/apache-ant-1.10.2-bin.tar.bz2
release/ant/binaries/apache-ant-1.10.2-bin.tar.bz2.asc
release/ant/binaries/apache-ant-1.10.2-bin.tar.bz2.md5
release/ant/binaries/apache-ant-1.10.2-bin.tar.bz2.sha1
release/ant/binaries/apache-ant-1.10.2-bin.tar.bz2.sha512
release/ant/binaries/apache-ant-1.10.2-bin.tar.gz
release/ant/binaries/apache-ant-1.10.2-bin.tar.gz.asc
release/ant/binaries/apache-ant-1.10.2-bin.tar.gz.md5
release/ant/binaries/apache-ant-1.10.2-bin.tar.gz.sha1
release/ant/binaries/apache-ant-1.10.2-bin.tar.gz.sha512
release/ant/binaries/apache-ant-1.10.2-bin.tar.xz
release/ant/binaries/apache-ant-1.10.2-bin.tar.xz.md5
release/ant/binaries/apache-ant-1.10.2-bin.tar.xz.sha1
release/ant/binaries/apache-ant-1.10.2-bin.tar.xz.sha512
release/ant/binaries/apache-ant-1.10.2-bin.zip
release/ant/binaries/apache-ant-1.10.2-bin.zip.asc
release/ant/binaries/apache-ant-1.10.2-bin.zip.md5
release/ant/binaries/apache-ant-1.10.2-bin.zip.sha1
release/ant/binaries/apache-ant-1.10.2-bin.zip.sha512
release/ant/binaries/apache-ant-1.9.10-bin.tar.bz2
release/ant/binaries/apache-ant-1.9.10-bin.tar.bz2.asc
release/ant/binaries/apache-ant-1.9.10-bin.tar.bz2.md5
release/ant/binaries/apache-ant-1.9.10-bin.tar.bz2.sha1
release/ant/binaries/apache-ant-1.9.10-bin.tar.bz2.sha512
release/ant/binaries/apache-ant-1.9.10-bin.tar.gz
release/ant/binaries/apache-ant-1.9.10-bin.tar.gz.asc
release/ant/binaries/apache-ant-1.9.10-bin.tar.gz.md5
release/ant/binaries/apache-ant-1.9.10-bin.tar.gz.sha1
release/ant/binaries/apache-ant-1.9.10-bin.tar.gz.sha512
release/ant/binaries/apache-ant-1.9.10-bin.zip
release/ant/binaries/apache-ant-1.9.10-bin.zip.asc
release/ant/binaries/apache-ant-1.9.10-bin.zip.md5
release/ant/binaries/apache-ant-1.9.10-bin.zip.sha1
release/ant/binaries/apache-ant-1.9.10-bin.zip.sha512
release/ant/manual/apache-ant-1.10.2-manual.tar.bz2
release/ant/manual/apache-ant-1.10.2-manual.tar.bz2.asc
release/ant/manual/apache-ant-1.10.2-manual.tar.bz2.md5
release/ant/manual/apache-ant-1.10.2-manual.tar.bz2.sha1
release/ant/manual/apache-ant-1.10.2-manual.tar.bz2.sha512
release/ant/manual/apache-ant-1.10.2-manual.tar.gz
release/ant/manual/apache-ant-1.10.2-manual.tar.gz.asc
release/ant/manual/apache-ant-1.10.2-manual.tar.gz.md5
release/ant/manual/apache-ant-1.10.2-manual.tar.gz.sha1
release/ant/manual/apache-ant-1.10.2-manual.tar.gz.sha512
release/ant/manual/apache-ant-1.10.2-manual.tar.xz
release/ant/manual/apache-ant-1.10.2-manual.tar.xz.md5
release/ant/manual/apache-ant-1.10.2-manual.tar.xz.sha1
release/ant/manual/apache-ant-1.10.2-manual.tar.xz.sha512
release/ant/manual/apache-ant-1.10.2-manual.zip
release/ant/manual/apache-ant-1.10.2-manual.zip.asc
release/ant/manual/apache-ant-1.10.2-manual.zip.md5
release/ant/manual/apache-ant-1.10.2-manual.zip.sha1
release/ant/manual/apache-ant-1.10.2-manual.zip.sha512
release/ant/manual/apache-ant-1.9.10-manual.tar.bz2
release/ant/manual/apache-ant-1.9.10-manual.tar.bz2.asc
release/ant/manual/apache-ant-1.9.10-manual.tar.bz2.md5
release/ant/manual/apache-ant-1.9.10-manual.tar.bz2.sha1
release/ant/manual/apache-ant-1.9.10-manual.tar.bz2.sha512
release/ant/manual/apache-ant-1.9.10-manual.tar.gz
release/ant/manual/apache-ant-1.9.10-manual.tar.gz.asc
release/ant/manual/apache-ant-1.9.10-manual.tar.gz.md5
release/ant/manual/apache-ant-1.9.10-manual.tar.gz.sha1
release/ant/manual/apache-ant-1.9.10-manual.tar.gz.sha512
release/ant/manual/apache-ant-1.9.10-manual.zip
release/ant/manual/apache-ant-1.9.10-manual.zip.asc
release/ant/manual/apache-ant-1.9.10-manual.zip.md5
release/ant/manual/apache-ant-1.9.10-manual.zip.sha1
release/ant/manual/apache-ant-1.9.10-manual.zip.sha512
release/ant/source/apache-ant-1.10.2-src.tar.bz2
release/ant/source/apache-ant-1.10.2-src.tar.bz2.asc
release/ant/source/apache-ant-1.10.2-src.tar.bz2.md5
release/ant/source/apache-ant-1.10.2-src.tar.bz2.sha1
release/ant/source/apache-ant-1.10.2-src.tar.bz2.sha512
release/ant/source/apache-ant-1.10.2-src.tar.gz
release/ant/source/apache-ant-1.10.2-src.tar.gz.asc
release/ant/source/apache-ant-1.10.2-src.tar.gz.md5
release/ant/source/apache-ant-1.10.2-src.tar.gz.sha1
release/ant/source/apache-ant-1.10.2-src.tar.gz.sha512
release/ant/source/apache-ant-1.10.2-src.tar.xz
release/ant/source/apache-ant-1.10.2-src.tar.xz.md5
release/ant/source/apache-ant-1.10.2-src.tar.xz.sha1
release/ant/source/apache-ant-1.10.2-src.tar.xz.sha512
release/ant/source/apache-ant-1.10.2-src.zip
release/ant/source/apache-ant-1.10.2

ant git commit: fix incorrect warning in the junit task when includeAntRuntime="no"

2018-04-14 Thread bodewig 
Repository: ant
Updated Branches:
  refs/heads/1.9.x 50a1d4aea -> b38bf68f5


fix incorrect warning in the junit task when includeAntRuntime="no"

fixed by making the classloader used by checkForkedPath behave like a real 
forked classpath, thus completely isolated from the launching jvm


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/b38bf68f
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/b38bf68f
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/b38bf68f

Branch: refs/heads/1.9.x
Commit: b38bf68f5c8a29ba7befa0760251f5f61d25ae32
Parents: 50a1d4a
Author: Nicolas Lalevée 
Authored: Fri Apr 13 21:54:19 2018 +0200
Committer: Stefan Bodewig 
Committed: Sat Apr 14 18:31:08 2018 +0200

--
 WHATSNEW|  3 ++
 src/etc/testcases/taskdefs/optional/junit.xml   | 15 ++
 .../ant/taskdefs/optional/junit/JUnitTask.java  |  3 +-
 .../taskdefs/optional/junit/JUnitTaskTest.java  | 30 
 4 files changed, 50 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ant/blob/b38bf68f/WHATSNEW
--
diff --git a/WHATSNEW b/WHATSNEW
index 157c201..4a75837 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -10,6 +10,9 @@ Fixed bugs:
is 'true'.
Bugzilla Report 60062
 
+ * The junit task when used with includeantruntime="no" was incorrectly
+   printing a warning about multiple versions of ant detected in path
+
 Changes from Ant 1.9.10 TO Ant 1.9.11
 =
 

http://git-wip-us.apache.org/repos/asf/ant/blob/b38bf68f/src/etc/testcases/taskdefs/optional/junit.xml
--
diff --git a/src/etc/testcases/taskdefs/optional/junit.xml 
b/src/etc/testcases/taskdefs/optional/junit.xml
index cc66e20..34d8cb2 100644
--- a/src/etc/testcases/taskdefs/optional/junit.xml
+++ b/src/etc/testcases/taskdefs/optional/junit.xml
@@ -358,4 +358,19 @@
 
   
 
+  
+
+
+
+
+  
+  
+
+
+
+  
+
+  
+
 

http://git-wip-us.apache.org/repos/asf/ant/blob/b38bf68f/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
--
diff --git 
a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java 
b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
index dcf66c1..e587474 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
@@ -1395,7 +1395,8 @@ public class JUnitTask extends Task {
 loader =
 AntClassLoader.newAntClassLoader(null, getProject(),
  
cmd.createClasspath(getProject()),
- true);
+ false);
+loader.setIsolated(true);
 final String projectResourceName =
 LoaderUtils.classNameToResource(Project.class.getName());
 URL previous = null;

http://git-wip-us.apache.org/repos/asf/ant/blob/b38bf68f/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskTest.java
--
diff --git 
a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskTest.java
 
b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskTest.java
index 28d7f9c..6c0d4b4 100644
--- 
a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskTest.java
+++ 
b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskTest.java
@@ -577,6 +577,36 @@ public class JUnitTaskTest {
 }
 }
 
+private void setupCheckDuplicateTest() {
+final String projectResourceName =
+LoaderUtils.classNameToResource(Project.class.getName());
+final File antclasses = LoaderUtils.getResourceSource(
+Project.class.getClassLoader(), projectResourceName);
+final String testResourceName =
+
LoaderUtils.classNameToResource(junit.framework.Test.class.getName());
+final File junitJar = LoaderUtils.getResourceSource(
+Project.class.getClassLoader(), testResourceName);
+buildRule.getProject().setProperty("antclasses", 
antclasses.getAbsolutePath());
+buildRule.getProject().setProperty("junitjar", 
junitJar.getAbsolutePath());
+}
+
+@Test
+public void testCheckDuplicateAntJar() throws Exception {
+setupCheckDuplicateTest();
+buildRule.executeTarget("testCheckForkedPath");
+assertTrue("Expecting the warning about t

Jenkins build became unstable: Ant-Build-Matrix-master-Windows » JDK 1.8.0_121 (unlimited security) 64-bit Windows only,Windows #314

2018-04-14 Thread Apache Jenkins Server 
See

[2/4] ant git commit: Deprecate AntAssert

2018-04-14 Thread gintas 
http://git-wip-us.apache.org/repos/asf/ant/blob/81c3e6e3/src/tests/junit/org/apache/tools/ant/taskdefs/TypeAdapterTest.java
--
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/TypeAdapterTest.java 
b/src/tests/junit/org/apache/tools/ant/taskdefs/TypeAdapterTest.java
index 2751ea5..94b163e 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/TypeAdapterTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/TypeAdapterTest.java
@@ -28,11 +28,11 @@ import org.apache.tools.ant.TypeAdapter;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.ExpectedException;
 
-import static org.apache.tools.ant.AntAssert.assertContains;
+import static org.hamcrest.Matchers.containsString;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
+import static org.junit.Assert.assertThat;
 
 /**
  */
@@ -41,6 +41,8 @@ public class TypeAdapterTest {
 @Rule
 public final BuildFileRule buildRule = new BuildFileRule();
 
+@Rule
+public ExpectedException thrown = ExpectedException.none();
 
 @Before
 public void setUp() {
@@ -50,35 +52,32 @@ public class TypeAdapterTest {
 @Test
 public void testTaskAdapter() {
 buildRule.executeTarget("taskadapter");
-assertContains("MyExec called", buildRule.getLog());
+assertThat(buildRule.getLog(), containsString("MyExec called"));
 }
 
 @Test
 public void testRunAdapter() {
 buildRule.executeTarget("runadapter");
-assertContains("MyRunnable called", buildRule.getLog());
+assertThat(buildRule.getLog(), containsString("MyRunnable called"));
 }
 
 @Test
 public void testRunAdapterError() {
-try {
-buildRule.executeTarget("runadaptererror");
-fail("BuildException expected: no public run method");
-} catch (BuildException ex) {
-assertContains("No public run() method in", ex.getMessage());
-}
+thrown.expect(BuildException.class);
+thrown.expectMessage("No public run() method in");
+buildRule.executeTarget("runadaptererror");
 }
 
 @Test
 public void testDelay() {
 buildRule.executeTarget("delay");
-assertContains("MyTask called", buildRule.getLog());
+assertThat(buildRule.getLog(), containsString("MyTask called"));
 }
 
 @Test
 public void testOnErrorReport() {
 buildRule.executeTarget("onerror.report");
-assertContains("MyTaskNotPresent cannot be found", buildRule.getLog());
+assertThat(buildRule.getLog(), containsString("MyTaskNotPresent cannot 
be found"));
 }
 
 @Test

http://git-wip-us.apache.org/repos/asf/ant/blob/81c3e6e3/src/tests/junit/org/apache/tools/ant/taskdefs/TypedefTest.java
--
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/TypedefTest.java 
b/src/tests/junit/org/apache/tools/ant/taskdefs/TypedefTest.java
index 0b93826..d8e5821 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/TypedefTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/TypedefTest.java
@@ -23,11 +23,12 @@ import org.apache.tools.ant.BuildFileRule;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.ExpectedException;
 
-import static org.apache.tools.ant.AntAssert.assertContains;
+import static org.hamcrest.Matchers.containsString;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.assertThat;
 
 /**
  */
@@ -36,50 +37,36 @@ public class TypedefTest {
 @Rule
 public final BuildFileRule buildRule = new BuildFileRule();
 
+@Rule
+public ExpectedException thrown = ExpectedException.none();
 
 @Before
 public void setUp() {
 buildRule.configureProject("src/etc/testcases/taskdefs/typedef.xml");
 }
 
-@Test
+@Test(expected = BuildException.class)
 public void testEmpty() {
-try {
-buildRule.executeTarget("empty");
-fail("BuildException expected: required argument not specified");
-} catch (BuildException ex) {
-//TODO assert value
-}
+buildRule.executeTarget("empty");
+// TODO assert value
 }
 
-@Test
+@Test(expected = BuildException.class)
 public void testNoName() {
-try {
-buildRule.executeTarget("noName");
-fail("BuildException expected: required argument not specified");
-} catch (BuildException ex) {
-//TODO assert value
-}
+buildRule.executeTarget("noName");
+// TODO assert value
 }
 
-@Test
+@Test(expected = BuildException.class)
 public void testNoClassname() {
-try {
-buildRule.executeTa

[4/4] ant git commit: Deprecate AntAssert

2018-04-14 Thread gintas 
Deprecate AntAssert

Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/81c3e6e3
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/81c3e6e3
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/81c3e6e3

Branch: refs/heads/master
Commit: 81c3e6e3ddf5b1ef4e66018f1047e1b2ae8b3173
Parents: 1026236
Author: Gintas Grigelionis 
Authored: Sat Apr 14 14:36:57 2018 +0200
Committer: Gintas Grigelionis 
Committed: Sat Apr 14 14:41:24 2018 +0200

--
 WHATSNEW|   6 +
 .../junit/org/apache/tools/ant/AntAssert.java   |   4 +
 .../org/apache/tools/ant/BuildFileRule.java |  14 +-
 .../junit/org/apache/tools/ant/CaseTest.java|  18 +-
 .../apache/tools/ant/ExtendedTaskdefTest.java   |  32 ++--
 .../junit/org/apache/tools/ant/IncludeTest.java |  68 +++-
 .../org/apache/tools/ant/LoaderRefTest.java |  16 +-
 .../org/apache/tools/ant/LocationTest.java  |  11 +-
 .../tools/ant/ProjectHelperRepositoryTest.java  |  31 +---
 .../junit/org/apache/tools/ant/ProjectTest.java |   5 +-
 .../apache/tools/ant/PropertyFileCLITest.java   |   5 +-
 .../org/apache/tools/ant/TaskContainerTest.java |  31 ++--
 .../tools/ant/filters/DynamicFilterTest.java|   5 +-
 .../tools/ant/filters/TokenFilterTest.java  | 104 ++--
 .../apache/tools/ant/launch/LocatorTest.java|  25 ++-
 .../tools/ant/taskdefs/AbstractCvsTaskTest.java |   7 +-
 .../tools/ant/taskdefs/AntStructureTest.java|   5 +-
 .../org/apache/tools/ant/taskdefs/AntTest.java  |  17 +-
 .../tools/ant/taskdefs/CallTargetTest.java  |   7 +-
 .../apache/tools/ant/taskdefs/ConcatTest.java   |  28 ++--
 .../org/apache/tools/ant/taskdefs/CopyTest.java |  65 
 .../apache/tools/ant/taskdefs/EchoXMLTest.java  |   7 +-
 .../apache/tools/ant/taskdefs/FixCrLfTest.java  |  23 ++-
 .../org/apache/tools/ant/taskdefs/GetTest.java  |  99 +--
 .../apache/tools/ant/taskdefs/ImportTest.java   |  86 --
 .../org/apache/tools/ant/taskdefs/JarTest.java  | 108 +---
 .../org/apache/tools/ant/taskdefs/JavaTest.java | 114 +
 .../apache/tools/ant/taskdefs/JavacTest.java|   9 +-
 .../apache/tools/ant/taskdefs/LoadFileTest.java |  56 +++
 .../apache/tools/ant/taskdefs/MacroDefTest.java |  99 +--
 .../apache/tools/ant/taskdefs/MakeUrlTest.java  |  50 +++---
 .../ant/taskdefs/ManifestClassPathTest.java |  82 +
 .../apache/tools/ant/taskdefs/ManifestTest.java | 165 +++
 .../org/apache/tools/ant/taskdefs/NiceTest.java |  25 ++-
 .../tools/ant/taskdefs/PreSetDefTest.java   |  24 ++-
 .../apache/tools/ant/taskdefs/PropertyTest.java |  58 ---
 .../tools/ant/taskdefs/RmicAdvancedTest.java|  63 +++
 .../apache/tools/ant/taskdefs/SQLExecTest.java  |  44 ++---
 .../apache/tools/ant/taskdefs/StyleTest.java|   9 +-
 .../apache/tools/ant/taskdefs/SubAntTest.java   |  41 +++--
 .../org/apache/tools/ant/taskdefs/SyncTest.java |  33 ++--
 .../apache/tools/ant/taskdefs/TaskdefTest.java  |  15 +-
 .../apache/tools/ant/taskdefs/TouchTest.java|  17 +-
 .../tools/ant/taskdefs/TypeAdapterTest.java |  25 ++-
 .../apache/tools/ant/taskdefs/TypedefTest.java  |  70 +++-
 .../org/apache/tools/ant/taskdefs/ZipTest.java  |  67 
 .../compilers/DefaultCompilerAdapterTest.java   |  14 +-
 .../taskdefs/condition/IsFileSelectedTest.java  |  17 +-
 .../ant/taskdefs/condition/IsReachableTest.java |  56 +++
 .../ant/taskdefs/condition/TypeFoundTest.java   |  15 +-
 .../tools/ant/taskdefs/optional/ANTLRTest.java  |  17 +-
 .../taskdefs/optional/EchoPropertiesTest.java   |  65 +++-
 .../tools/ant/taskdefs/optional/RpmTest.java|  18 +-
 .../taskdefs/optional/SchemaValidateTest.java   |  56 +++
 .../ant/taskdefs/optional/XmlValidateTest.java  |  69 +++-
 .../tools/ant/taskdefs/optional/XsltTest.java   |  19 +--
 .../taskdefs/optional/depend/DependTest.java|  37 ++---
 .../ant/taskdefs/optional/image/ImageTest.java  |  32 ++--
 .../taskdefs/optional/jdepend/JDependTest.java  |  16 +-
 .../optional/junit/JUnitReportTest.java |  15 +-
 .../taskdefs/optional/junit/JUnitTaskTest.java  |  73 
 .../optional/junit/JUnitTestListenerTest.java   |  37 +++--
 .../optional/junit/JUnitTestRunnerTest.java |   5 +-
 .../optional/junit/TearDownOnVmCrashTest.java   |   9 +-
 .../junit/XMLFormatterWithCDATAOnSystemOut.java |   7 +-
 .../ant/taskdefs/optional/net/FTPTest.java  |   5 +-
 .../taskdefs/optional/script/ScriptDefTest.java |  84 --
 .../org/apache/tools/ant/types/AddTypeTest.java |  46 +++---
 .../apache/tools/ant/types/AssertionsTest.java  |  42 +++--
 .../tools/ant/types/CommandlineJavaTest.java|  12 +-
 .../org/apache/tools/ant/types/PathTest.java|   4 +-
 .../org/apache/tools/ant/types/PolyTest.java|  11 +-
 .../tools/ant/types/RedirectorElementTest.java  |

[1/4] ant git commit: Deprecate AntAssert

2018-04-14 Thread gintas 
Repository: ant
Updated Branches:
  refs/heads/master 102623615 -> 81c3e6e3d


http://git-wip-us.apache.org/repos/asf/ant/blob/81c3e6e3/src/tests/junit/org/apache/tools/ant/types/AddTypeTest.java
--
diff --git a/src/tests/junit/org/apache/tools/ant/types/AddTypeTest.java 
b/src/tests/junit/org/apache/tools/ant/types/AddTypeTest.java
index bebf627..88a5572 100644
--- a/src/tests/junit/org/apache/tools/ant/types/AddTypeTest.java
+++ b/src/tests/junit/org/apache/tools/ant/types/AddTypeTest.java
@@ -26,15 +26,19 @@ import org.apache.tools.ant.taskdefs.condition.Condition;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.ExpectedException;
 
-import static org.apache.tools.ant.AntAssert.assertContains;
-import static org.junit.Assert.fail;
+import static org.hamcrest.Matchers.containsString;
+import static org.junit.Assert.assertThat;
 
 public class AddTypeTest {
 
 @Rule
 public BuildFileRule buildRule = new BuildFileRule();
 
+@Rule
+public ExpectedException thrown = ExpectedException.none();
+
 @Before
 public void setUp() {
 buildRule.configureProject("src/etc/testcases/types/addtype.xml");
@@ -63,71 +67,65 @@ public class AddTypeTest {
 @Test
 public void testNestedA() {
 buildRule.executeTarget("nested.a");
-assertContains("add A called", buildRule.getLog());
+assertThat(buildRule.getLog(), containsString("add A called"));
 }
 
 @Test
 public void testNestedB() {
 buildRule.executeTarget("nested.b");
- assertContains("add B called", buildRule.getLog());
+ assertThat(buildRule.getLog(), containsString("add B called"));
 }
 
 @Test
 public void testNestedC() {
 buildRule.executeTarget("nested.c");
-assertContains("add C called", buildRule.getLog());
+assertThat(buildRule.getLog(), containsString("add C called"));
 }
 
 @Test
 public void testNestedAB() {
-try {
-buildRule.executeTarget("nested.ab");
-fail("Build exception expected: Should have got ambiguous");
-} catch (BuildException ex) {
-assertContains("ambiguous", ex.getMessage());
-}
+thrown.expect(BuildException.class);
+thrown.expectMessage("ambiguous");
+buildRule.executeTarget("nested.ab");
 }
 
 @Test
 public void testConditionType() {
 buildRule.executeTarget("condition.type");
-assertContains("beforeafter", buildRule.getLog());
+assertThat(buildRule.getLog(), containsString("beforeafter"));
 }
 
 @Test
 public void testConditionTask() {
 buildRule.executeTarget("condition.task");
-assertContains("My Condition execution", buildRule.getLog());
+assertThat(buildRule.getLog(), containsString("My Condition 
execution"));
 }
 
 @Test
 public void testConditionConditionType() {
 buildRule.executeTarget("condition.condition.type");
-assertContains("My Condition eval", buildRule.getLog());
+assertThat(buildRule.getLog(), containsString("My Condition eval"));
 }
 
 @Test
 public void testConditionConditionTask() {
-try {
-buildRule.executeTarget("condition.condition.task");
-fail("Build exception expected: Task masking condition");
-} catch (BuildException ex) {
- assertContains("doesn't support the nested", ex.getMessage());
-}
+thrown.expect(BuildException.class);
+thrown.expectMessage("doesn't support the nested");
+buildRule.executeTarget("condition.condition.task");
 }
 
 @Test
 public void testAddConfigured() {
 buildRule.executeTarget("myaddconfigured");
-assertContains("value is Value Setexecute: value is Value Set",
-buildRule.getLog());
+assertThat(buildRule.getLog(),
+containsString("value is Value Setexecute: value is Value 
Set"));
 }
 
 @Test
 public void testAddConfiguredValue() {
 buildRule.executeTarget("myaddconfiguredvalue");
-assertContains("value is Value Setexecute: value is Value Set",
-buildRule.getLog());
+assertThat(buildRule.getLog(),
+containsString("value is Value Setexecute: value is Value 
Set"));
 }
 
 @Test

http://git-wip-us.apache.org/repos/asf/ant/blob/81c3e6e3/src/tests/junit/org/apache/tools/ant/types/AssertionsTest.java
--
diff --git a/src/tests/junit/org/apache/tools/ant/types/AssertionsTest.java 
b/src/tests/junit/org/apache/tools/ant/types/AssertionsTest.java
index f96228f..c3768bf 100644
--- a/src/tests/junit/org/apache/tools/ant/types/AssertionsTest.java
+++ b/src/tests/junit/org/apache/tools/ant/types/AssertionsTest.java
@@ -22,9 +22,10 @@ import org.apache.t

[3/4] ant git commit: Deprecate AntAssert

2018-04-14 Thread gintas 
http://git-wip-us.apache.org/repos/asf/ant/blob/81c3e6e3/src/tests/junit/org/apache/tools/ant/taskdefs/JarTest.java
--
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/JarTest.java 
b/src/tests/junit/org/apache/tools/ant/taskdefs/JarTest.java
index 3ef9b3f..53f63dd 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/JarTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/JarTest.java
@@ -24,7 +24,6 @@ import java.io.FileReader;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.IOException;
-import java.io.Reader;
 import java.util.Enumeration;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
@@ -33,16 +32,17 @@ import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.BuildFileRule;
 import org.apache.tools.ant.FileUtilities;
 import org.apache.tools.ant.util.FileUtils;
-import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.ExpectedException;
 
-import static org.apache.tools.ant.AntAssert.assertContains;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.not;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 import static org.junit.Assume.assumeTrue;
 
 /**
@@ -52,11 +52,11 @@ public class JarTest {
 @Rule
 public final BuildFileRule buildRule = new BuildFileRule();
 
+@Rule
+public ExpectedException thrown = ExpectedException.none();
+
 private static String tempJar = "tmp.jar";
 private static String tempDir = "jartmp/";
-private Reader r1;
-private Reader r2;
-
 
 @Before
 public void setUp() {
@@ -64,28 +64,13 @@ public class JarTest {
 buildRule.executeTarget("setUp");
 }
 
-@After
-public void tearDown() {
-if (r1 != null) {
-try {
-r1.close();
-} catch (IOException e) {
-}
-}
-if (r2 != null) {
-try {
-r2.close();
-} catch (IOException e) {
-}
-}
-}
-
 /**
  * Expected failure due to required argument not specified
  */
 @Test(expected = BuildException.class)
 public void test1() {
 buildRule.executeTarget("test1");
+// TODO assert exception message
 }
 
 /**
@@ -114,7 +99,6 @@ public class JarTest {
 public void test4() {
 buildRule.executeTarget("test4");
 File jarFile = new File(getOutputDir(), tempJar);
-
 assertTrue(jarFile.exists());
 }
 
@@ -154,14 +138,12 @@ public class JarTest {
 
 @Test
 public void testRecreateWithoutUpdateNewerFile() {
-testRecreate("testRecreateNewerFileSetup",
- "testRecreateWithoutUpdateNewerFile");
+testRecreate("testRecreateNewerFileSetup", 
"testRecreateWithoutUpdateNewerFile");
 }
 
 @Test
 public void testRecreateWithUpdateNewerFile() {
-testRecreate("testRecreateNewerFileSetup",
- "testRecreateWithUpdateNewerFile");
+testRecreate("testRecreateNewerFileSetup", 
"testRecreateWithUpdateNewerFile");
 }
 
 private void testRecreate(String firstTarget, String secondTarget) {
@@ -177,22 +159,24 @@ public class JarTest {
 long jarModifiedDate = jarFile.lastModified();
 buildRule.executeTarget(secondTarget);
 jarFile = new File(getOutputDir(), tempJar);
-assertTrue("jar has been recreated in " + secondTarget,
-   jarModifiedDate < jarFile.lastModified());
+assertTrue("jar has been recreated in " + secondTarget, 
jarModifiedDate < jarFile.lastModified());
 }
 
 @Test
-public void testManifestStaysIntact()
-throws IOException, ManifestException {
+public void testManifestStaysIntact() throws IOException, 
ManifestException {
 buildRule.executeTarget("testManifestStaysIntact");
 
-r1 = new FileReader(new File(getOutputDir(),
-tempDir + "manifest"));
-r2 = new FileReader(new File(getOutputDir(),
-tempDir + "META-INF/MANIFEST.MF"));
+Manifest mf1;
+try (FileReader r1 = new FileReader(new File(getOutputDir(), tempDir + 
"manifest"))) {
+mf1 = new Manifest(r1);
+}
+
+Manifest mf2;
+try (FileReader r2 = new FileReader(new File(getOutputDir(), tempDir
++ "META-INF/MANIFEST.MF"))) {
+mf2 = new Manifest(r2);
+}
 
-Manifest mf1 = new Manifest(r1);
-Manifest mf2 = new Manifest(r2);
 assertEquals(mf1, mf2);
 }
 
@@ -218,26 +202,22 @@ public class JarTest {
 
 @Test
 public void testRecreateZipfilesetWithoutUpdateAdditionalFiles