[maven-archiver] 01/10: Merge tag 'upstream/2.6'

[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-archiver.

commit 4f8532f85c0b763beb3a36e2f52cd048f3b46291
Merge: d3adac2 fc6a6af
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon May 4 19:21:59 2015 +0200

    Merge tag 'upstream/2.6'
    
    Upstream version 2.6

 pom.xml                                            |  118 +++
 .../maven/archiver/ManifestConfiguration.java      |  267 +++++
 .../org/apache/maven/archiver/ManifestSection.java |   65 ++
 .../maven/archiver/MavenArchiveConfiguration.java  |  242 +++++
 .../org/apache/maven/archiver/MavenArchiver.java   |  632 ++++++++++++
 .../apache/maven/archiver/PomPropertiesUtil.java   |  120 +++
 src/site/apt/examples/classpath.apt                |  412 ++++++++
 src/site/apt/examples/manifest.apt                 |  105 ++
 src/site/apt/examples/manifestEntries.apt          |   81 ++
 src/site/apt/examples/manifestFile.apt             |   61 ++
 src/site/apt/examples/manifestSections.apt         |   87 ++
 src/site/resources/download.cgi                    |   22 +
 src/site/site.xml                                  |   42 +
 src/site/xdoc/download.xml.vm                      |  126 +++
 src/site/xdoc/index.xml.vm                         |  351 +++++++
 .../apache/maven/archiver/MavenArchiverTest.java   | 1082 ++++++++++++++++++++
 .../org/apache/maven/archiver/MockArtifact.java    |  341 ++++++
 src/test/resources/dummy.dot-1.5.jar               |  Bin 0 -> 17061 bytes
 src/test/resources/dummy1-1.0.jar                  |  Bin 0 -> 17061 bytes
 .../resources/dummy1-1.1-20081022.112233-1.jar     |  Bin 0 -> 17061 bytes
 src/test/resources/dummy2-1.5.jar                  |  Bin 0 -> 17061 bytes
 src/test/resources/dummy3-2.0.jar                  |  Bin 0 -> 17061 bytes
 src/test/resources/pom.xml                         |   53 +
 23 files changed, 4207 insertions(+)

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