[maven-dependency-tree] 01/05: Merge tag 'upstream/2.1'

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository maven-dependency-tree.

commit f3bac704e0b46f433476da9c499b3d743d0c46cf
Merge: 50283eb f0da404
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Oct 30 14:10:36 2015 +0100

    Merge tag 'upstream/2.1'
    
    Upstream version 2.1

 pom.xml                                            |  73 ++++-
 src/it/maven-version/expected.txt                  |  13 +
 src/it/maven-version/invoker.properties            |   1 +
 src/it/maven-version/pom.xml                       |  90 ++++++
 src/it/maven-version/verify.bsh                    |  18 ++
 src/it/mshared-167/expected-M2.txt                 |  18 ++
 src/it/mshared-167/expected-M3.txt                 |  19 ++
 src/it/mshared-167/invoker.properties              |   1 +
 src/it/mshared-167/pom.xml                         |  85 ++++++
 src/it/mshared-167/verify.bsh                      |  26 ++
 src/it/settings.xml                                |  55 ++++
 src/it/verbose/expected-default.txt                |  28 ++
 src/it/verbose/expected-verbose.txt                |  84 ++++++
 src/it/verbose/invoker.properties                  |   1 +
 src/it/verbose/pom.xml                             | 120 ++++++++
 src/it/verbose/verify.bsh                          |  31 ++
 .../shared/dependency/graph/DependencyNode.java    |   4 +-
 .../internal/DefaultDependencyGraphBuilder.java    |  21 +-
 ...der.java => Maven31DependencyGraphBuilder.java} | 327 +++++++++++----------
 .../internal/Maven3DependencyGraphBuilder.java     |   6 +-
 .../SerializingDependencyNodeVisitor.java          |  28 +-
 .../tree/DefaultDependencyTreeBuilder.java         |   8 +-
 .../dependency/tree/DependencyTreeBuilder.java     |  17 +-
 src/site/apt/index.apt                             |  10 +-
 24 files changed, 893 insertions(+), 191 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-dependency-tree.git