Re: JunitTestRunner commit

[Stefan Bodewig]

On 2018-04-05, Maarten Coene wrote:

> I think I finally got it merged into the 1.9.x branch...

yes, looks good.

> (Where are the days where everything was so easy with SVN ;-))

I've maintained svn branches long enough to recall merging is a pain
regardless of which SCM you use :-)

> I did a little test, and I didn't see a difference compared to 1.10.3
> in the error output when a test has a failing static initializer.

Great, thanks

   Stefan

-
To unsubscribe, e-mail: dev-unsubscr...@ant.apache.org
For additional commands, e-mail: dev-h...@ant.apache.org

Re: JunitTestRunner commit

[Maarten Coene]

Thanks Stefan for your time and patience :-)I think I finally got it merged 
into the 1.9.x branch...(Where are the days where everything was so easy with 
SVN ;-))
I did a little test, and I didn't see a difference compared to 1.10.3 in the 
error output when a test has a failing static initializer.
thanks,Maarten


  Van: Stefan Bodewig 
 Aan: dev@ant.apache.org 
 Verzonden: donderdag 5 april 8:25 2018
 Onderwerp: Re: JunitTestRunner commit
   
On 2018-04-04, Maarten Coene wrote:

> Since this is more or less my first commit to the Ant codebase, could
> someone please review my change to JunitTestRunner ?

Typo in WHATSNEW (until rather than untill).

I think the change is good, although I'm not sure whether there is a
difference in how a failure in the static initializer of a real test
class gets reported now. I.e. do I get the exact same error/failure
output from your testStaticInitializerErrorTestCase that would be
created in 1.10.3?

> And if all is ok, what is the correct way to merge this into the 1.9.x
> branch?

Personally I prefer to do it the other way around - commit to 1.9.x and
merge to master - but that's too late now. In either case, as the master
branch is evolving merge conflicts will become more prevalent over
time. Most likely you will get by with just a single conflict in
WHATSNEW that you'll need to resolve manually. Something like

git checkout 1.9.x
git cherry-pick 30c9dee9bad90e56703554d21819cec6033276dc
# most likely resolve conflict and commit
git cherry-pick 20b6163989fdf4e98d7739fca3cdf9f18a5bdc7a

should probably work. If you need any help, please ask.

Stefan

-
To unsubscribe, e-mail: dev-unsubscr...@ant.apache.org
For additional commands, e-mail: dev-h...@ant.apache.org



   

Re: ant git commit: Tidy up the code

[Matt Benson]

By and large I approve of these changes, but I felt compelled to express
the opinion that I do not believe adding else after if/continue does
anything to simplify the code. IMO it does the opposite.

Matt

On Thu, Apr 5, 2018, 1:15 AM  wrote:

> Repository: ant
> Updated Branches:
>   refs/heads/master 845c2c5b3 -> 66d7986c3
>
>
> Tidy up the code
>
> Project: http://git-wip-us.apache.org/repos/asf/ant/repo
> Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/66d7986c
> Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/66d7986c
> Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/66d7986c
>
> Branch: refs/heads/master
> Commit: 66d7986c3ad41040528a118052c4ef5b2e65ef89
> Parents: 845c2c5
> Author: Gintas Grigelionis 
> Authored: Thu Apr 5 08:15:07 2018 +0200
> Committer: Gintas Grigelionis 
> Committed: Thu Apr 5 08:15:07 2018 +0200
>
> --
>  src/main/org/apache/tools/ant/DirectoryScanner.java   |  1 +
>  src/main/org/apache/tools/ant/filters/ConcatFilter.java   |  8 +++-
>  src/main/org/apache/tools/ant/filters/HeadFilter.java |  8 +++-
>  src/main/org/apache/tools/ant/filters/SortFilter.java |  5 +
>  src/main/org/apache/tools/ant/filters/TailFilter.java |  8 +++-
>  .../apache/tools/ant/filters/util/JavaClassHelper.java|  1 -
>  src/main/org/apache/tools/ant/launch/Locator.java |  9 ++---
>  src/main/org/apache/tools/ant/taskdefs/Expand.java|  1 -
>  src/main/org/apache/tools/ant/taskdefs/Get.java   | 10 +++---
>  src/main/org/apache/tools/ant/taskdefs/UpToDate.java  |  1 -
>  .../tools/ant/taskdefs/optional/RenameExtensions.java |  1 +
>  .../tools/ant/taskdefs/optional/jdepend/JDependTask.java  |  2 ++
>  .../junitlauncher/AbstractJUnitResultFormatter.java   |  2 --
>  .../optional/junitlauncher/JUnitLauncherTask.java |  2 --
>  .../junitlauncher/LegacyPlainResultFormatter.java |  1 -
>  .../optional/junitlauncher/LegacyXmlResultFormatter.java  |  1 -
>  src/main/org/apache/tools/ant/types/Commandline.java  |  1 -
>  src/main/org/apache/tools/ant/types/CommandlineJava.java  |  1 -
>  src/main/org/apache/tools/ant/util/JavaEnvUtils.java  |  1 +
>  .../junit/org/apache/tools/ant/util/JavaEnvUtilsTest.java |  2 ++
>  20 files changed, 26 insertions(+), 40 deletions(-)
> --
>
>
>
> http://git-wip-us.apache.org/repos/asf/ant/blob/66d7986c/src/main/org/apache/tools/ant/DirectoryScanner.java
> --
> diff --git a/src/main/org/apache/tools/ant/DirectoryScanner.java
> b/src/main/org/apache/tools/ant/DirectoryScanner.java
> index 1a7a7e0..967c9ca 100644
> --- a/src/main/org/apache/tools/ant/DirectoryScanner.java
> +++ b/src/main/org/apache/tools/ant/DirectoryScanner.java
> @@ -613,6 +613,7 @@ public class DirectoryScanner
>   *
>   * @since Ant 1.6
>   */
> +@SuppressWarnings("deprecated")
>  public static void resetDefaultExcludes() {
>  synchronized (defaultExcludes) {
>  defaultExcludes.clear();
>
>
> http://git-wip-us.apache.org/repos/asf/ant/blob/66d7986c/src/main/org/apache/tools/ant/filters/ConcatFilter.java
> --
> diff --git a/src/main/org/apache/tools/ant/filters/ConcatFilter.java
> b/src/main/org/apache/tools/ant/filters/ConcatFilter.java
> index 817572f..72b68f8 100644
> --- a/src/main/org/apache/tools/ant/filters/ConcatFilter.java
> +++ b/src/main/org/apache/tools/ant/filters/ConcatFilter.java
> @@ -192,13 +192,11 @@ public final class ConcatFilter extends
> BaseParamFilterReader
>  final Parameter[] params = getParameters();
>  if (params != null) {
>  for (Parameter param : params) {
> -if ("prepend".equals(param.getName())) {
> +final String paramName = param.getName();
> +if ("prepend".equals(paramName)) {
>  setPrepend(new File(param.getValue()));
> -continue;
> -}
> -if ("append".equals(param.getName())) {
> +} else if ("append".equals(paramName)) {
>  setAppend(new File(param.getValue()));
> -continue;
>  }
>  }
>  }
>
>
> http://git-wip-us.apache.org/repos/asf/ant/blob/66d7986c/src/main/org/apache/tools/ant/filters/HeadFilter.java
> --
> diff --git a/src/main/org/apache/tools/ant/filters/HeadFilter.java
> b/src/main/org/apache/tools/ant/filters/HeadFilter.java
> index 29806b3..24e2403 100644
> --- a/src/main/org/apache/tools/ant/filters/HeadFilter.java
> +++ b/src/main/org/apache/tools/ant/filters/HeadFilter.java

Re: [2/2] ant git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ant

[Stefan Bodewig]

On 2018-04-05, Maarten Coene wrote:

> Sorry, I have no idea what this is... should it be reverted?

No, you haven't really changed anything.

Your "fix typo" commit was based on a version of the master branch that
is older than the HEAD at apache as you didn't update your local copy
first. When you tried to push the changes git told you you needed to
update your working copy first. For this there are two options:

* merge the changes that have happened at Apache with yours - this
  creates the merge commit you've seen. This is probably the default
  option, my git setup has been tweaked long ago and I don't trust my
  local defaults :-)

* rebase your changes on top of the version at apache. This would have
  shown a clean linear history and is what I tend to prefer where
  possible.

rebasing is a bit of an advanced git strategy.

The merge commit really only shows as a "diamond" in history. If you
look at the commit in gitk or a similar tool you'll see it has two
parents: your typo fix and the latest HEAD at apache. It hasn't really
changed any files you didn't intend to change, it just shows that your
working copy and apache's HEAD have diverted at one point in time. This
is seen as noise by some, but really doesn't do any harm beyond that.

Stefan

-
To unsubscribe, e-mail: dev-unsubscr...@ant.apache.org
For additional commands, e-mail: dev-h...@ant.apache.org

Re: [2/2] ant git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ant

[Maarten Coene]

Sorry, I have no idea what this is... should it be reverted?
(I'm a Git noob and this is something that my IntelliJ git plugin seems to have 
done).

Maarten

  Van: "maart...@apache.org" 
 Aan: notificati...@ant.apache.org 
 Verzonden: donderdag 5 april 11:33 2018
 Onderwerp: [2/2] ant git commit: Merge branch 'master' of 
https://git-wip-us.apache.org/repos/asf/ant
   
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ant


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

Branch: refs/heads/master
Commit: f2459248f23aa439e2c5ab642d9d9d7e6cffc933
Parents: 277906b 26c8789
Author: Maarten Coene 
Authored: Thu Apr 5 11:32:22 2018 +0200
Committer: Maarten Coene 
Committed: Thu Apr 5 11:32:22 2018 +0200

--
 .../org/apache/tools/ant/AntClassLoader.java    |  16 +-
 .../org/apache/tools/ant/DefaultLogger.java    |  3 +-
 .../org/apache/tools/ant/DirectoryScanner.java  |  1 +
 src/main/org/apache/tools/ant/Main.java        |  2 +-
 .../org/apache/tools/ant/PathTokenizer.java    |  6 +-
 src/main/org/apache/tools/ant/Project.java      |  8 +-
 .../org/apache/tools/ant/ProjectHelper.java    |  6 +-
 .../org/apache/tools/ant/PropertyHelper.java    |  30 ++--
 .../apache/tools/ant/RuntimeConfigurable.java  |  25 ++--
 .../tools/ant/TaskConfigurationChecker.java    |  10 +-
 src/main/org/apache/tools/ant/XmlLogger.java    |  3 +-
 .../tools/ant/attribute/BaseIfAttribute.java    |  3 +-
 .../tools/ant/filters/ClassConstants.java      |  31 ++--
 .../apache/tools/ant/filters/ConcatFilter.java  |  8 +-
 .../tools/ant/filters/ExpandProperties.java    |  4 +-
 .../apache/tools/ant/filters/HeadFilter.java    |  8 +-
 .../tools/ant/filters/LineContainsRegExp.java  |  6 +-
 .../apache/tools/ant/filters/SortFilter.java    |  5 +-
 .../tools/ant/filters/StripJavaComments.java    |  3 +-
 .../apache/tools/ant/filters/TailFilter.java    |  8 +-
 .../tools/ant/filters/util/JavaClassHelper.java |  15 +-
 .../apache/tools/ant/helper/ProjectHelper2.java | 150 ++-
 .../tools/ant/helper/ProjectHelperImpl.java    |  75 ++
 .../org/apache/tools/ant/launch/Locator.java    |  2 +-
 .../apache/tools/ant/taskdefs/AntStructure.java |  33 ++--
 .../org/apache/tools/ant/taskdefs/Concat.java  |  11 +-
 .../org/apache/tools/ant/taskdefs/Copy.java    |  14 +-
 .../org/apache/tools/ant/taskdefs/EchoXML.java  |  2 +-
 .../org/apache/tools/ant/taskdefs/Expand.java  |  23 +--
 src/main/org/apache/tools/ant/taskdefs/Get.java |  15 +-
 src/main/org/apache/tools/ant/taskdefs/Jar.java |  5 +-
 .../org/apache/tools/ant/taskdefs/Javac.java    |  6 +-
 .../org/apache/tools/ant/taskdefs/Manifest.java |  29 +---
 .../org/apache/tools/ant/taskdefs/Recorder.java |  3 +-
 .../org/apache/tools/ant/taskdefs/Replace.java  |  2 +-
 .../org/apache/tools/ant/taskdefs/Rmic.java    |  5 +-
 src/main/org/apache/tools/ant/taskdefs/Tar.java |  4 +-
 .../org/apache/tools/ant/taskdefs/UpToDate.java |  13 +-
 .../compilers/DefaultCompilerAdapter.java      |  7 +-
 .../ant/taskdefs/condition/IsReference.java    |  19 +--
 .../apache/tools/ant/taskdefs/condition/Os.java |  4 +-
 .../ant/taskdefs/cvslib/ChangeLogParser.java    |  8 +-
 .../taskdefs/launcher/VmsCommandLauncher.java  |  2 +-
 .../tools/ant/taskdefs/optional/NetRexxC.java  |  6 +-
 .../ant/taskdefs/optional/RenameExtensions.java |  1 +
 .../ant/taskdefs/optional/SchemaValidate.java  |  26 ++--
 .../taskdefs/optional/depend/AntAnalyzer.java  |  4 +-
 .../ant/taskdefs/optional/ejb/IPlanetEjbc.java  |  33 ++--
 .../taskdefs/optional/jdepend/JDependTask.java  |  2 +
 .../optional/jlink/ClassNameReader.java        |  3 +-
 .../compilers/DefaultJspCompilerAdapter.java    |  11 +-
 .../ant/taskdefs/optional/junit/JUnitTask.java  |  21 +--
 .../junit/SummaryJUnitResultFormatter.java      |  14 +-
 .../AbstractJUnitResultFormatter.java          |  4 -
 .../junitlauncher/JUnitLauncherTask.java        |  2 -
 .../LegacyPlainResultFormatter.java            |  4 +-
 .../junitlauncher/LegacyXmlResultFormatter.java |  1 -
 .../native2ascii/BuiltinNative2Ascii.java      |  18 +--
 .../tools/ant/taskdefs/optional/net/FTP.java    |  11 +-
 .../optional/net/FTPTaskMirrorImpl.java        |  3 +-
 .../ant/taskdefs/optional/ssh/SSHExec.java      |  2 +-
 .../taskdefs/optional/ssh/ScpFromMessage.java  |  4 +-
 .../optional/ssh/ScpFromMessageBySftp.java      |  6 +-
 .../apache/tools/ant/types/AbstractFileSet.java |  8 +-
 .../org/apache/tools/ant/types/Commandline.java |  19 +--
 .../apache/tools/ant/types/CommandlineJava.java |  13 +-
 .../org/apache/tools/ant/types/PropertySet.java |  3 +-
 .../ant/types/resources/PropertyResource.java  |  5 +-
 

[GitHub] ant pull request #:

[bodewig]

Github user bodewig commented on the pull request:


https://github.com/apache/ant/commit/1c80d507f496dde98869890e671edf635bef8dec#commitcomment-28428982
  
:+1: 


---

-
To unsubscribe, e-mail: dev-unsubscr...@ant.apache.org
For additional commands, e-mail: dev-h...@ant.apache.org

[GitHub] ant pull request #:

[bodewig]

Github user bodewig commented on the pull request:


https://github.com/apache/ant/commit/26c8789a5067809255040d3338235b5ae25a3898#commitcomment-28428974
  
don't worry. I'm happy Jenkins caught it.


---

-
To unsubscribe, e-mail: dev-unsubscr...@ant.apache.org
For additional commands, e-mail: dev-h...@ant.apache.org

[GitHub] ant pull request #:

[twogee]

Github user twogee commented on the pull request:


https://github.com/apache/ant/commit/1c80d507f496dde98869890e671edf635bef8dec#commitcomment-28428804
  
You're right, there is no concise way to do backwards foreach loops in 
Java. I will revert them later today.


---

-
To unsubscribe, e-mail: dev-unsubscr...@ant.apache.org
For additional commands, e-mail: dev-h...@ant.apache.org

[GitHub] ant pull request #:

[twogee]

Github user twogee commented on the pull request:


https://github.com/apache/ant/commit/26c8789a5067809255040d3338235b5ae25a3898#commitcomment-28428779
  
Sorry about letting this through. getLocationURLs() should be annotated 
with `@SuppressWarnings("deprecated") `.


---

-
To unsubscribe, e-mail: dev-unsubscr...@ant.apache.org
For additional commands, e-mail: dev-h...@ant.apache.org

Re: JunitTestRunner commit

[Stefan Bodewig]

On 2018-04-04, Maarten Coene wrote:

> Since this is more or less my first commit to the Ant codebase, could
> someone please review my change to JunitTestRunner ?

Typo in WHATSNEW (until rather than untill).

I think the change is good, although I'm not sure whether there is a
difference in how a failure in the static initializer of a real test
class gets reported now. I.e. do I get the exact same error/failure
output from your testStaticInitializerErrorTestCase that would be
created in 1.10.3?

> And if all is ok, what is the correct way to merge this into the 1.9.x
> branch?

Personally I prefer to do it the other way around - commit to 1.9.x and
merge to master - but that's too late now. In either case, as the master
branch is evolving merge conflicts will become more prevalent over
time. Most likely you will get by with just a single conflict in
WHATSNEW that you'll need to resolve manually. Something like

git checkout 1.9.x
git cherry-pick 30c9dee9bad90e56703554d21819cec6033276dc
# most likely resolve conflict and commit
git cherry-pick 20b6163989fdf4e98d7739fca3cdf9f18a5bdc7a

should probably work. If you need any help, please ask.

Stefan

-
To unsubscribe, e-mail: dev-unsubscr...@ant.apache.org
For additional commands, e-mail: dev-h...@ant.apache.org

[GitHub] ant pull request #:

[bodewig]

Github user bodewig commented on the pull request:


https://github.com/apache/ant/commit/1c80d507f496dde98869890e671edf635bef8dec#commitcomment-28426966
  
In 
src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java:
In 
src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java on 
line 1191:
see 
https://github.com/apache/ant/commit/1c80d507f496dde98869890e671edf635bef8dec#r28426956


---

-
To unsubscribe, e-mail: dev-unsubscr...@ant.apache.org
For additional commands, e-mail: dev-h...@ant.apache.org