[maven2] 86/87: Merge tag 'upstream/2.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 maven2.

commit c7f55ac02d3e4fcfb6e0f36d6736a28a1e68c16c
Merge: c635533 f6cb199
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Feb 27 13:32:43 2015 +0100

    Merge tag 'upstream/2.2.1'
    
    Upstream version 2.2.1

 README.txt                                         |  40 ++
 apache-maven/LICENSE.txt                           | 233 ++++++++
 apache-maven/NOTICE.txt                            |  20 +
 apache-maven/README.txt                            |  78 +++
 apache-maven/pom.xml                               | 232 ++++++++
 apache-maven/src/assemble/bin.xml                  |  78 +++
 apache-maven/src/assemble/src.xml                  |  53 ++
 apache-maven/src/bin/m2.conf                       |   6 +
 apache-maven/src/bin/mvn                           | 163 ++++++
 apache-maven/src/bin/mvn.bat                       | 188 +++++++
 apache-maven/src/bin/mvnDebug                      | 169 ++++++
 apache-maven/src/bin/mvnDebug.bat                  | 191 +++++++
 apache-maven/src/conf/settings.xml                 | 257 +++++++++
 apache-maven/src/site/site.xml                     |   6 +
 .../apache/maven/settings/GlobalSettingsTest.java  |  60 ++
 build.xml                                          | 322 +++++++++++
 pom.xml                                            | 613 +++++++++++++++++++++
 src/site/site.xml                                  |  33 ++
 18 files changed, 2742 insertions(+)

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