[maven-bundle-plugin] 03/08: Merge tag 'upstream/2.5.4'
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Mon Dec 7 11:25:32 UTC 2015
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository maven-bundle-plugin.
commit 476315d85a70b49d2433f41caacaf86fc3bc1218
Merge: 2fed5b7 ced816b
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Mon Dec 7 11:55:53 2015 +0100
Merge tag 'upstream/2.5.4'
Upstream version 2.5.4
DEPENDENCIES | 6 +-
NOTICE | 4 +-
doc/apache-felix-maven-bundle-plugin-bnd.html | 337 +--
doc/changelog.txt | 48 +
doc/site/ant-mojo.html | 29 +-
doc/site/{deploy-mojo.html => baseline-mojo.html} | 152 +-
...e-clean-mojo.html => baseline-report-mojo.html} | 140 +-
doc/site/bundle-mojo.html | 29 +-
doc/site/bundleall-mojo.html | 33 +-
doc/site/clean-mojo.html | 12 +-
doc/site/cleanVersions-mojo.html | 14 +-
doc/site/css/maven-base.css | 302 +-
doc/site/css/print.css | 14 +-
doc/site/dependencies.html | 31 +-
doc/site/deploy-file-mojo.html | 12 +-
doc/site/deploy-mojo.html | 12 +-
doc/site/index-mojo.html | 12 +-
doc/site/index.html | 10 +-
doc/site/install-file-mojo.html | 12 +-
doc/site/install-mojo.html | 12 +-
doc/site/instructions-mojo.html | 29 +-
doc/site/issue-tracking.html | 12 +-
doc/site/jira-report.html | 12 +-
doc/site/license.html | 10 +-
doc/site/mail-lists.html | 10 +-
doc/site/manifest-mojo.html | 31 +-
doc/site/plugin-info.html | 40 +-
doc/site/project-info.html | 10 +-
doc/site/project-reports.html | 10 +-
doc/site/remote-clean-mojo.html | 12 +-
doc/site/source-repository.html | 10 +-
doc/site/surefire-report.html | 12 +-
doc/site/team-list.html | 10 +-
doc/site/wrap-mojo.html | 36 +-
doc/site/xref-test/allclasses-frame.html | 3 +
doc/site/xref-test/index.html | 2 +-
.../bundleplugin/AbstractBundlePluginTest.html | 2 +-
.../felix/bundleplugin/BlueprintComponentTest.html | 181 +-
.../felix/bundleplugin/BundlePluginTest.html | 2 +-
.../felix/bundleplugin/ManifestWriterTest.html | 67 +
.../apache/felix/bundleplugin/package-frame.html | 5 +-
.../apache/felix/bundleplugin/package-summary.html | 9 +-
.../maven/shared/osgi/Maven2OsgiConverterTest.html | 2 +-
.../apache/maven/shared/osgi/package-frame.html | 2 +-
.../apache/maven/shared/osgi/package-summary.html | 4 +-
doc/site/xref-test/overview-frame.html | 2 +-
doc/site/xref-test/overview-summary.html | 6 +-
doc/site/xref-test/stylesheet.css | 232 +-
doc/site/xref/allclasses-frame.html | 23 +-
doc/site/xref/index.html | 2 +-
.../apache/felix/bundleplugin/BlueprintPlugin.html | 751 +++--
.../org/apache/felix/bundleplugin/BundleInfo.html | 2 +-
.../apache/felix/bundleplugin/BundlePlugin.html | 3019 ++++++++++----------
.../apache/felix/bundleplugin/ManifestPlugin.html | 4 +-
.../apache/felix/bundleplugin/ManifestWriter.html | 264 ++
.../org/apache/felix/bundleplugin/ScrPlugin.html | 187 ++
.../felix/bundleplugin/VersionCleanerPlugin.html | 98 +-
.../org/apache/felix/bundleplugin/WrapPlugin.html | 38 +-
.../baseline/AbstractBaselinePlugin.html | 607 ++++
.../bundleplugin/baseline/BaselinePlugin.html | 271 ++
.../bundleplugin/baseline/BaselineReport.html | 360 +++
.../felix/bundleplugin/baseline/DiffMessage.html | 66 +
.../bundleplugin/baseline/InfoComparator.html | 48 +
.../felix/bundleplugin/baseline/package-frame.html | 39 +
.../bundleplugin/baseline}/package-summary.html | 27 +-
.../apache/felix/bundleplugin/package-frame.html | 11 +-
.../apache/felix/bundleplugin/package-summary.html | 19 +-
.../org/apache/felix/obrplugin/package-frame.html | 2 +-
.../apache/felix/obrplugin/package-summary.html | 4 +-
.../tree/DependencyTreeResolutionListener.html | 2 +-
.../shared/dependency/tree/package-frame.html | 2 +-
.../shared/dependency/tree/package-summary.html | 4 +-
.../shared/osgi/DefaultMaven2OsgiConverter.html | 2 +-
.../shared/osgi/ManifestReadingException.html | 2 +-
.../maven/shared/osgi/Maven2OsgiConverter.html | 2 +-
.../apache/maven/shared/osgi/package-frame.html | 2 +-
.../apache/maven/shared/osgi/package-summary.html | 4 +-
doc/site/xref/overview-frame.html | 5 +-
doc/site/xref/overview-summary.html | 15 +-
doc/site/xref/stylesheet.css | 232 +-
pom.xml | 74 +-
.../bundleplugin/AbstractDependencyFilter.java | 57 +-
.../org/apache/felix/bundleplugin/AntPlugin.java | 9 +-
.../apache/felix/bundleplugin/BlueprintPlugin.java | 350 +--
.../apache/felix/bundleplugin/BundleAllPlugin.java | 56 +-
.../org/apache/felix/bundleplugin/BundleInfo.java | 49 +-
.../apache/felix/bundleplugin/BundlePlugin.java | 414 +--
.../felix/bundleplugin/DependencyEmbedder.java | 39 +-
.../felix/bundleplugin/DependencyExcluder.java | 13 +-
.../felix/bundleplugin/InstructionsPlugin.java | 10 +-
.../apache/felix/bundleplugin/ManifestPlugin.java | 37 +-
.../apache/felix/bundleplugin/ManifestWriter.java | 199 ++
.../org/apache/felix/bundleplugin/ScrPlugin.java | 160 ++
.../felix/bundleplugin/VersionCleanerPlugin.java | 22 +-
.../org/apache/felix/bundleplugin/WrapPlugin.java | 11 +-
.../baseline/AbstractBaselinePlugin.java | 571 ++++
.../bundleplugin/baseline/BaselinePlugin.java | 290 ++
.../bundleplugin/baseline/BaselineReport.java | 386 +++
.../felix/bundleplugin/baseline/DiffMessage.java | 52 +
.../bundleplugin/baseline/InfoComparator.java | 34 +
.../apache/felix/obrplugin/AbstractFileMojo.java | 29 +-
.../org/apache/felix/obrplugin/ObrCleanRepo.java | 18 +-
.../java/org/apache/felix/obrplugin/ObrDeploy.java | 66 +-
.../org/apache/felix/obrplugin/ObrDeployFile.java | 47 +-
.../java/org/apache/felix/obrplugin/ObrIndex.java | 20 +-
.../org/apache/felix/obrplugin/ObrInstall.java | 32 +-
.../org/apache/felix/obrplugin/ObrInstallFile.java | 21 +-
.../org/apache/felix/obrplugin/ObrRemoteClean.java | 55 +-
src/main/resources/baseline-report.properties | 26 +
.../apache/felix/bundleplugin/baseline/access.gif | 1 +
.../felix/bundleplugin/baseline/annotated.gif | 1 +
.../felix/bundleplugin/baseline/annotation.gif | 1 +
.../apache/felix/bundleplugin/baseline/bundle.gif | 1 +
.../apache/felix/bundleplugin/baseline/class.gif | 4 +
.../felix/bundleplugin/baseline/constant.gif | 3 +
.../apache/felix/bundleplugin/baseline/enum.gif | 3 +
.../apache/felix/bundleplugin/baseline/error.gif | 1 +
.../apache/felix/bundleplugin/baseline/extends.gif | 3 +
.../apache/felix/bundleplugin/baseline/field.gif | 1 +
.../felix/bundleplugin/baseline/implements.gif | 1 +
.../apache/felix/bundleplugin/baseline/info.gif | 1 +
.../felix/bundleplugin/baseline/interface.gif | 2 +
.../apache/felix/bundleplugin/baseline/method.gif | 1 +
.../apache/felix/bundleplugin/baseline/package.gif | 1 +
.../felix/bundleplugin/baseline/resource.gif | 1 +
.../apache/felix/bundleplugin/baseline/return.gif | 1 +
.../apache/felix/bundleplugin/baseline/version.gif | 1 +
.../apache/felix/bundleplugin/baseline/warning.gif | 2 +
.../org/apache/felix/bundleplugin/blueprint.xsl | 26 +-
.../org/apache/felix/bundleplugin/scr.xsl | 97 +
.../felix/bundleplugin/BlueprintComponentTest.java | 41 +-
.../felix/bundleplugin/BundlePluginTest.java | 2 +-
.../felix/bundleplugin/ManifestWriterTest.java | 53 +
src/test/resources/OSGI-INF/blueprint/bp.xml | 8 +-
src/test/resources/test.mf | 153 +
src/test/resources/test2.mf | 44 +
136 files changed, 7937 insertions(+), 3762 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-bundle-plugin.git
More information about the pkg-java-commits
mailing list