[maven-bundle-plugin] 01/02: Merge tag 'upstream/2.4.0'

[Miguel Landaeta]

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

nomadium pushed a commit to branch master
in repository maven-bundle-plugin.

commit 847ef0d9518df9168a2d1e9a793602d7ecbcedb1
Merge: fcc6efa 2e0e2e2
Author: Miguel Landaeta <nomadium at debian.org>
Date:   Mon Mar 9 17:35:17 2015 -0300

    Merge tag 'upstream/2.4.0'
    
    Upstream release 2.4.0

 DEPENDENCIES                                       |    4 +-
 NOTICE                                             |    2 +-
 doc/apache-felix-maven-bundle-plugin-bnd.html      |   27 +-
 .../button.html                                    |    3 +-
 .../button_data/2011-na-125x125.png                |  Bin 8355 -> 0 bytes
 .../button_data/2013-na-125x125.png                |  Bin 0 -> 22279 bytes
 doc/changelog.txt                                  |   27 +
 doc/site/ant-mojo.html                             |   69 +-
 doc/site/bundle-mojo.html                          |   69 +-
 doc/site/bundleall-mojo.html                       |   79 +-
 doc/site/clean-mojo.html                           |   18 +-
 doc/site/cleanVersions-mojo.html                   |   12 +-
 doc/site/dependencies.html                         |   25 +-
 doc/site/deploy-file-mojo.html                     |   70 +-
 doc/site/deploy-mojo.html                          |   42 +-
 doc/site/index-mojo.html                           |   24 +-
 doc/site/index.html                                |   10 +-
 doc/site/install-file-mojo.html                    |   50 +-
 doc/site/install-mojo.html                         |   18 +-
 doc/site/instructions-mojo.html                    |   69 +-
 doc/site/issue-tracking.html                       |   10 +-
 doc/site/jira-report.html                          |   12 +-
 doc/site/license.html                              |   10 +-
 doc/site/mail-lists.html                           |   10 +-
 doc/site/manifest-mojo.html                        |   73 +-
 doc/site/plugin-info.html                          |   18 +-
 doc/site/project-info.html                         |   10 +-
 doc/site/project-reports.html                      |   10 +-
 doc/site/remote-clean-mojo.html                    |   38 +-
 doc/site/source-repository.html                    |   12 +-
 doc/site/surefire-report.html                      |   12 +-
 doc/site/team-list.html                            |   10 +-
 doc/site/wrap-mojo.html                            |   79 +-
 doc/site/xref-test/allclasses-frame.html           |    3 +
 doc/site/xref-test/index.html                      |    2 +-
 .../felix/bundleplugin/BlueprintComponentTest.html |    2 +-
 .../felix/bundleplugin/BundlePluginTest.html       |    8 +-
 .../apache/felix/bundleplugin/package-frame.html   |    2 +-
 .../apache/felix/bundleplugin/package-summary.html |    4 +-
 .../maven/shared/osgi/Maven2OsgiConverterTest.html |  188 ++
 .../apache/maven/shared/osgi}/package-frame.html   |    8 +-
 .../apache/maven/shared/osgi/package-summary.html  |   16 +-
 doc/site/xref-test/overview-frame.html             |    5 +-
 doc/site/xref-test/overview-summary.html           |   11 +-
 doc/site/xref/index.html                           |    2 +-
 .../bundleplugin/AbstractDependencyFilter.html     |    6 +-
 .../org/apache/felix/bundleplugin/AntPlugin.html   |    4 +-
 .../apache/felix/bundleplugin/BlueprintPlugin.html |  710 ++---
 .../apache/felix/bundleplugin/BundleAllPlugin.html |    4 +-
 .../apache/felix/bundleplugin/BundlePlugin.html    | 2923 ++++++++++----------
 .../felix/bundleplugin/DependencyEmbedder.html     |    2 +-
 .../felix/bundleplugin/InstructionsPlugin.html     |    2 +-
 .../apache/felix/bundleplugin/ManifestPlugin.html  |  215 +-
 .../apache/felix/bundleplugin/package-frame.html   |    2 +-
 .../apache/felix/bundleplugin/package-summary.html |    4 +-
 .../org/apache/felix/obrplugin/ObrInstall.html     |   95 +-
 .../org/apache/felix/obrplugin/package-frame.html  |    2 +-
 .../apache/felix/obrplugin/package-summary.html    |    4 +-
 .../shared/dependency/tree/package-frame.html      |    2 +-
 .../shared/dependency/tree/package-summary.html    |    4 +-
 .../shared/osgi/DefaultMaven2OsgiConverter.html    |  529 ++--
 .../apache/maven/shared/osgi/package-frame.html    |    2 +-
 .../apache/maven/shared/osgi/package-summary.html  |    4 +-
 doc/site/xref/overview-frame.html                  |    2 +-
 doc/site/xref/overview-summary.html                |    6 +-
 pom.xml                                            |   23 +-
 .../bundleplugin/AbstractDependencyFilter.java     |    6 +-
 .../org/apache/felix/bundleplugin/AntPlugin.java   |    4 +-
 .../apache/felix/bundleplugin/BlueprintPlugin.java |   42 +-
 .../apache/felix/bundleplugin/BundleAllPlugin.java |    4 +-
 .../apache/felix/bundleplugin/BundlePlugin.java    |  157 +-
 .../felix/bundleplugin/DependencyEmbedder.java     |    2 +-
 .../felix/bundleplugin/InstructionsPlugin.java     |    2 +-
 .../apache/felix/bundleplugin/ManifestPlugin.java  |   19 +-
 .../org/apache/felix/obrplugin/ObrInstall.java     |   17 +-
 .../shared/osgi/DefaultMaven2OsgiConverter.java    |    9 +-
 .../felix/bundleplugin/BlueprintComponentTest.java |    2 +-
 .../felix/bundleplugin/BundlePluginTest.java       |    8 +-
 .../maven/shared/osgi/Maven2OsgiConverterTest.java |  174 ++
 79 files changed, 3440 insertions(+), 2724 deletions(-)

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