commit | 1f7f4308d4cd6447ccdd5ae4d97911897d2a98ee | [log] [tgz] |
---|---|---|
author | Carsten Ziegeler <cziegeler@apache.org> | Tue Aug 11 11:46:51 2015 +0000 |
committer | Carsten Ziegeler <cziegeler@apache.org> | Tue Aug 11 11:46:51 2015 +0000 |
tree | 092cfd817846e4bee598b173f4ee1a7c3ca2d9d6 | |
parent | 92e1c664e222b9740902e671dd41976982f3cd08 [diff] |
Move bundleplugin to tools git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1695271 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/bundleplugin/DEPENDENCIES b/tools/maven-bundle-plugin/DEPENDENCIES similarity index 100% rename from bundleplugin/DEPENDENCIES rename to tools/maven-bundle-plugin/DEPENDENCIES
diff --git a/bundleplugin/LICENSE b/tools/maven-bundle-plugin/LICENSE similarity index 100% rename from bundleplugin/LICENSE rename to tools/maven-bundle-plugin/LICENSE
diff --git a/bundleplugin/NOTICE b/tools/maven-bundle-plugin/NOTICE similarity index 100% rename from bundleplugin/NOTICE rename to tools/maven-bundle-plugin/NOTICE
diff --git a/bundleplugin/doc/apache-felix-maven-bundle-plugin-bnd.html b/tools/maven-bundle-plugin/doc/apache-felix-maven-bundle-plugin-bnd.html similarity index 100% rename from bundleplugin/doc/apache-felix-maven-bundle-plugin-bnd.html rename to tools/maven-bundle-plugin/doc/apache-felix-maven-bundle-plugin-bnd.html
diff --git a/bundleplugin/doc/apache-felix-maven-bundle-plugin-bnd_files/apache.png b/tools/maven-bundle-plugin/doc/apache-felix-maven-bundle-plugin-bnd_files/apache.png similarity index 100% rename from bundleplugin/doc/apache-felix-maven-bundle-plugin-bnd_files/apache.png rename to tools/maven-bundle-plugin/doc/apache-felix-maven-bundle-plugin-bnd_files/apache.png Binary files differ
diff --git a/bundleplugin/doc/apache-felix-maven-bundle-plugin-bnd_files/button.html b/tools/maven-bundle-plugin/doc/apache-felix-maven-bundle-plugin-bnd_files/button.html similarity index 100% rename from bundleplugin/doc/apache-felix-maven-bundle-plugin-bnd_files/button.html rename to tools/maven-bundle-plugin/doc/apache-felix-maven-bundle-plugin-bnd_files/button.html
diff --git a/bundleplugin/doc/apache-felix-maven-bundle-plugin-bnd_files/button_data/2013-na-125x125.png b/tools/maven-bundle-plugin/doc/apache-felix-maven-bundle-plugin-bnd_files/button_data/2013-na-125x125.png similarity index 100% rename from bundleplugin/doc/apache-felix-maven-bundle-plugin-bnd_files/button_data/2013-na-125x125.png rename to tools/maven-bundle-plugin/doc/apache-felix-maven-bundle-plugin-bnd_files/button_data/2013-na-125x125.png Binary files differ
diff --git a/bundleplugin/doc/apache-felix-maven-bundle-plugin-bnd_files/check.gif b/tools/maven-bundle-plugin/doc/apache-felix-maven-bundle-plugin-bnd_files/check.gif similarity index 100% rename from bundleplugin/doc/apache-felix-maven-bundle-plugin-bnd_files/check.gif rename to tools/maven-bundle-plugin/doc/apache-felix-maven-bundle-plugin-bnd_files/check.gif Binary files differ
diff --git a/bundleplugin/doc/apache-felix-maven-bundle-plugin-bnd_files/information.gif b/tools/maven-bundle-plugin/doc/apache-felix-maven-bundle-plugin-bnd_files/information.gif similarity index 100% rename from bundleplugin/doc/apache-felix-maven-bundle-plugin-bnd_files/information.gif rename to tools/maven-bundle-plugin/doc/apache-felix-maven-bundle-plugin-bnd_files/information.gif Binary files differ
diff --git a/bundleplugin/doc/apache-felix-maven-bundle-plugin-bnd_files/logo.png b/tools/maven-bundle-plugin/doc/apache-felix-maven-bundle-plugin-bnd_files/logo.png similarity index 100% rename from bundleplugin/doc/apache-felix-maven-bundle-plugin-bnd_files/logo.png rename to tools/maven-bundle-plugin/doc/apache-felix-maven-bundle-plugin-bnd_files/logo.png Binary files differ
diff --git a/bundleplugin/doc/apache-felix-maven-bundle-plugin-bnd_files/site.css b/tools/maven-bundle-plugin/doc/apache-felix-maven-bundle-plugin-bnd_files/site.css similarity index 100% rename from bundleplugin/doc/apache-felix-maven-bundle-plugin-bnd_files/site.css rename to tools/maven-bundle-plugin/doc/apache-felix-maven-bundle-plugin-bnd_files/site.css
diff --git a/bundleplugin/doc/changelog.txt b/tools/maven-bundle-plugin/doc/changelog.txt similarity index 100% rename from bundleplugin/doc/changelog.txt rename to tools/maven-bundle-plugin/doc/changelog.txt
diff --git a/bundleplugin/doc/site/ant-mojo.html b/tools/maven-bundle-plugin/doc/site/ant-mojo.html similarity index 100% rename from bundleplugin/doc/site/ant-mojo.html rename to tools/maven-bundle-plugin/doc/site/ant-mojo.html
diff --git a/bundleplugin/doc/site/baseline-mojo.html b/tools/maven-bundle-plugin/doc/site/baseline-mojo.html similarity index 100% rename from bundleplugin/doc/site/baseline-mojo.html rename to tools/maven-bundle-plugin/doc/site/baseline-mojo.html
diff --git a/bundleplugin/doc/site/baseline-report-mojo.html b/tools/maven-bundle-plugin/doc/site/baseline-report-mojo.html similarity index 100% rename from bundleplugin/doc/site/baseline-report-mojo.html rename to tools/maven-bundle-plugin/doc/site/baseline-report-mojo.html
diff --git a/bundleplugin/doc/site/bundle-mojo.html b/tools/maven-bundle-plugin/doc/site/bundle-mojo.html similarity index 100% rename from bundleplugin/doc/site/bundle-mojo.html rename to tools/maven-bundle-plugin/doc/site/bundle-mojo.html
diff --git a/bundleplugin/doc/site/bundleall-mojo.html b/tools/maven-bundle-plugin/doc/site/bundleall-mojo.html similarity index 100% rename from bundleplugin/doc/site/bundleall-mojo.html rename to tools/maven-bundle-plugin/doc/site/bundleall-mojo.html
diff --git a/bundleplugin/doc/site/clean-mojo.html b/tools/maven-bundle-plugin/doc/site/clean-mojo.html similarity index 100% rename from bundleplugin/doc/site/clean-mojo.html rename to tools/maven-bundle-plugin/doc/site/clean-mojo.html
diff --git a/bundleplugin/doc/site/cleanVersions-mojo.html b/tools/maven-bundle-plugin/doc/site/cleanVersions-mojo.html similarity index 100% rename from bundleplugin/doc/site/cleanVersions-mojo.html rename to tools/maven-bundle-plugin/doc/site/cleanVersions-mojo.html
diff --git a/bundleplugin/doc/site/css/maven-base.css b/tools/maven-bundle-plugin/doc/site/css/maven-base.css similarity index 100% rename from bundleplugin/doc/site/css/maven-base.css rename to tools/maven-bundle-plugin/doc/site/css/maven-base.css
diff --git a/bundleplugin/doc/site/css/maven-theme.css b/tools/maven-bundle-plugin/doc/site/css/maven-theme.css similarity index 100% rename from bundleplugin/doc/site/css/maven-theme.css rename to tools/maven-bundle-plugin/doc/site/css/maven-theme.css
diff --git a/bundleplugin/doc/site/css/print.css b/tools/maven-bundle-plugin/doc/site/css/print.css similarity index 100% rename from bundleplugin/doc/site/css/print.css rename to tools/maven-bundle-plugin/doc/site/css/print.css
diff --git a/bundleplugin/doc/site/css/site.css b/tools/maven-bundle-plugin/doc/site/css/site.css similarity index 100% rename from bundleplugin/doc/site/css/site.css rename to tools/maven-bundle-plugin/doc/site/css/site.css
diff --git a/bundleplugin/doc/site/dependencies.html b/tools/maven-bundle-plugin/doc/site/dependencies.html similarity index 100% rename from bundleplugin/doc/site/dependencies.html rename to tools/maven-bundle-plugin/doc/site/dependencies.html
diff --git a/bundleplugin/doc/site/deploy-file-mojo.html b/tools/maven-bundle-plugin/doc/site/deploy-file-mojo.html similarity index 100% rename from bundleplugin/doc/site/deploy-file-mojo.html rename to tools/maven-bundle-plugin/doc/site/deploy-file-mojo.html
diff --git a/bundleplugin/doc/site/deploy-mojo.html b/tools/maven-bundle-plugin/doc/site/deploy-mojo.html similarity index 100% rename from bundleplugin/doc/site/deploy-mojo.html rename to tools/maven-bundle-plugin/doc/site/deploy-mojo.html
diff --git a/bundleplugin/doc/site/images/close.gif b/tools/maven-bundle-plugin/doc/site/images/close.gif similarity index 100% rename from bundleplugin/doc/site/images/close.gif rename to tools/maven-bundle-plugin/doc/site/images/close.gif Binary files differ
diff --git a/bundleplugin/doc/site/images/collapsed.gif b/tools/maven-bundle-plugin/doc/site/images/collapsed.gif similarity index 100% rename from bundleplugin/doc/site/images/collapsed.gif rename to tools/maven-bundle-plugin/doc/site/images/collapsed.gif Binary files differ
diff --git a/bundleplugin/doc/site/images/expanded.gif b/tools/maven-bundle-plugin/doc/site/images/expanded.gif similarity index 100% rename from bundleplugin/doc/site/images/expanded.gif rename to tools/maven-bundle-plugin/doc/site/images/expanded.gif Binary files differ
diff --git a/bundleplugin/doc/site/images/external.png b/tools/maven-bundle-plugin/doc/site/images/external.png similarity index 100% rename from bundleplugin/doc/site/images/external.png rename to tools/maven-bundle-plugin/doc/site/images/external.png Binary files differ
diff --git a/bundleplugin/doc/site/images/icon_error_sml.gif b/tools/maven-bundle-plugin/doc/site/images/icon_error_sml.gif similarity index 100% rename from bundleplugin/doc/site/images/icon_error_sml.gif rename to tools/maven-bundle-plugin/doc/site/images/icon_error_sml.gif Binary files differ
diff --git a/bundleplugin/doc/site/images/icon_info_sml.gif b/tools/maven-bundle-plugin/doc/site/images/icon_info_sml.gif similarity index 100% rename from bundleplugin/doc/site/images/icon_info_sml.gif rename to tools/maven-bundle-plugin/doc/site/images/icon_info_sml.gif Binary files differ
diff --git a/bundleplugin/doc/site/images/icon_success_sml.gif b/tools/maven-bundle-plugin/doc/site/images/icon_success_sml.gif similarity index 100% rename from bundleplugin/doc/site/images/icon_success_sml.gif rename to tools/maven-bundle-plugin/doc/site/images/icon_success_sml.gif Binary files differ
diff --git a/bundleplugin/doc/site/images/icon_warning_sml.gif b/tools/maven-bundle-plugin/doc/site/images/icon_warning_sml.gif similarity index 100% rename from bundleplugin/doc/site/images/icon_warning_sml.gif rename to tools/maven-bundle-plugin/doc/site/images/icon_warning_sml.gif Binary files differ
diff --git a/bundleplugin/doc/site/images/logos/build-by-maven-black.png b/tools/maven-bundle-plugin/doc/site/images/logos/build-by-maven-black.png similarity index 100% rename from bundleplugin/doc/site/images/logos/build-by-maven-black.png rename to tools/maven-bundle-plugin/doc/site/images/logos/build-by-maven-black.png Binary files differ
diff --git a/bundleplugin/doc/site/images/logos/build-by-maven-white.png b/tools/maven-bundle-plugin/doc/site/images/logos/build-by-maven-white.png similarity index 100% rename from bundleplugin/doc/site/images/logos/build-by-maven-white.png rename to tools/maven-bundle-plugin/doc/site/images/logos/build-by-maven-white.png Binary files differ
diff --git a/bundleplugin/doc/site/images/logos/maven-feather.png b/tools/maven-bundle-plugin/doc/site/images/logos/maven-feather.png similarity index 100% rename from bundleplugin/doc/site/images/logos/maven-feather.png rename to tools/maven-bundle-plugin/doc/site/images/logos/maven-feather.png Binary files differ
diff --git a/bundleplugin/doc/site/images/newwindow.png b/tools/maven-bundle-plugin/doc/site/images/newwindow.png similarity index 100% rename from bundleplugin/doc/site/images/newwindow.png rename to tools/maven-bundle-plugin/doc/site/images/newwindow.png Binary files differ
diff --git a/bundleplugin/doc/site/index-mojo.html b/tools/maven-bundle-plugin/doc/site/index-mojo.html similarity index 100% rename from bundleplugin/doc/site/index-mojo.html rename to tools/maven-bundle-plugin/doc/site/index-mojo.html
diff --git a/bundleplugin/doc/site/index.html b/tools/maven-bundle-plugin/doc/site/index.html similarity index 100% rename from bundleplugin/doc/site/index.html rename to tools/maven-bundle-plugin/doc/site/index.html
diff --git a/bundleplugin/doc/site/install-file-mojo.html b/tools/maven-bundle-plugin/doc/site/install-file-mojo.html similarity index 100% rename from bundleplugin/doc/site/install-file-mojo.html rename to tools/maven-bundle-plugin/doc/site/install-file-mojo.html
diff --git a/bundleplugin/doc/site/install-mojo.html b/tools/maven-bundle-plugin/doc/site/install-mojo.html similarity index 100% rename from bundleplugin/doc/site/install-mojo.html rename to tools/maven-bundle-plugin/doc/site/install-mojo.html
diff --git a/bundleplugin/doc/site/instructions-mojo.html b/tools/maven-bundle-plugin/doc/site/instructions-mojo.html similarity index 100% rename from bundleplugin/doc/site/instructions-mojo.html rename to tools/maven-bundle-plugin/doc/site/instructions-mojo.html
diff --git a/bundleplugin/doc/site/issue-tracking.html b/tools/maven-bundle-plugin/doc/site/issue-tracking.html similarity index 100% rename from bundleplugin/doc/site/issue-tracking.html rename to tools/maven-bundle-plugin/doc/site/issue-tracking.html
diff --git a/bundleplugin/doc/site/jira-report.html b/tools/maven-bundle-plugin/doc/site/jira-report.html similarity index 100% rename from bundleplugin/doc/site/jira-report.html rename to tools/maven-bundle-plugin/doc/site/jira-report.html
diff --git a/bundleplugin/doc/site/license.html b/tools/maven-bundle-plugin/doc/site/license.html similarity index 100% rename from bundleplugin/doc/site/license.html rename to tools/maven-bundle-plugin/doc/site/license.html
diff --git a/bundleplugin/doc/site/mail-lists.html b/tools/maven-bundle-plugin/doc/site/mail-lists.html similarity index 100% rename from bundleplugin/doc/site/mail-lists.html rename to tools/maven-bundle-plugin/doc/site/mail-lists.html
diff --git a/bundleplugin/doc/site/manifest-mojo.html b/tools/maven-bundle-plugin/doc/site/manifest-mojo.html similarity index 100% rename from bundleplugin/doc/site/manifest-mojo.html rename to tools/maven-bundle-plugin/doc/site/manifest-mojo.html
diff --git a/bundleplugin/doc/site/plugin-info.html b/tools/maven-bundle-plugin/doc/site/plugin-info.html similarity index 100% rename from bundleplugin/doc/site/plugin-info.html rename to tools/maven-bundle-plugin/doc/site/plugin-info.html
diff --git a/bundleplugin/doc/site/project-info.html b/tools/maven-bundle-plugin/doc/site/project-info.html similarity index 100% rename from bundleplugin/doc/site/project-info.html rename to tools/maven-bundle-plugin/doc/site/project-info.html
diff --git a/bundleplugin/doc/site/project-reports.html b/tools/maven-bundle-plugin/doc/site/project-reports.html similarity index 100% rename from bundleplugin/doc/site/project-reports.html rename to tools/maven-bundle-plugin/doc/site/project-reports.html
diff --git a/bundleplugin/doc/site/remote-clean-mojo.html b/tools/maven-bundle-plugin/doc/site/remote-clean-mojo.html similarity index 100% rename from bundleplugin/doc/site/remote-clean-mojo.html rename to tools/maven-bundle-plugin/doc/site/remote-clean-mojo.html
diff --git a/bundleplugin/doc/site/source-repository.html b/tools/maven-bundle-plugin/doc/site/source-repository.html similarity index 100% rename from bundleplugin/doc/site/source-repository.html rename to tools/maven-bundle-plugin/doc/site/source-repository.html
diff --git a/bundleplugin/doc/site/surefire-report.html b/tools/maven-bundle-plugin/doc/site/surefire-report.html similarity index 100% rename from bundleplugin/doc/site/surefire-report.html rename to tools/maven-bundle-plugin/doc/site/surefire-report.html
diff --git a/bundleplugin/doc/site/team-list.html b/tools/maven-bundle-plugin/doc/site/team-list.html similarity index 100% rename from bundleplugin/doc/site/team-list.html rename to tools/maven-bundle-plugin/doc/site/team-list.html
diff --git a/bundleplugin/doc/site/wrap-mojo.html b/tools/maven-bundle-plugin/doc/site/wrap-mojo.html similarity index 100% rename from bundleplugin/doc/site/wrap-mojo.html rename to tools/maven-bundle-plugin/doc/site/wrap-mojo.html
diff --git a/bundleplugin/doc/site/xref-test/allclasses-frame.html b/tools/maven-bundle-plugin/doc/site/xref-test/allclasses-frame.html similarity index 100% rename from bundleplugin/doc/site/xref-test/allclasses-frame.html rename to tools/maven-bundle-plugin/doc/site/xref-test/allclasses-frame.html
diff --git a/bundleplugin/doc/site/xref-test/index.html b/tools/maven-bundle-plugin/doc/site/xref-test/index.html similarity index 100% rename from bundleplugin/doc/site/xref-test/index.html rename to tools/maven-bundle-plugin/doc/site/xref-test/index.html
diff --git a/bundleplugin/doc/site/xref-test/org/apache/felix/bundleplugin/AbstractBundlePluginTest.html b/tools/maven-bundle-plugin/doc/site/xref-test/org/apache/felix/bundleplugin/AbstractBundlePluginTest.html similarity index 100% rename from bundleplugin/doc/site/xref-test/org/apache/felix/bundleplugin/AbstractBundlePluginTest.html rename to tools/maven-bundle-plugin/doc/site/xref-test/org/apache/felix/bundleplugin/AbstractBundlePluginTest.html
diff --git a/bundleplugin/doc/site/xref-test/org/apache/felix/bundleplugin/ArtifactStubFactory.html b/tools/maven-bundle-plugin/doc/site/xref-test/org/apache/felix/bundleplugin/ArtifactStubFactory.html similarity index 100% rename from bundleplugin/doc/site/xref-test/org/apache/felix/bundleplugin/ArtifactStubFactory.html rename to tools/maven-bundle-plugin/doc/site/xref-test/org/apache/felix/bundleplugin/ArtifactStubFactory.html
diff --git a/bundleplugin/doc/site/xref-test/org/apache/felix/bundleplugin/BlueprintComponentTest.html b/tools/maven-bundle-plugin/doc/site/xref-test/org/apache/felix/bundleplugin/BlueprintComponentTest.html similarity index 100% rename from bundleplugin/doc/site/xref-test/org/apache/felix/bundleplugin/BlueprintComponentTest.html rename to tools/maven-bundle-plugin/doc/site/xref-test/org/apache/felix/bundleplugin/BlueprintComponentTest.html
diff --git a/bundleplugin/doc/site/xref-test/org/apache/felix/bundleplugin/BundleAllPluginTest.html b/tools/maven-bundle-plugin/doc/site/xref-test/org/apache/felix/bundleplugin/BundleAllPluginTest.html similarity index 100% rename from bundleplugin/doc/site/xref-test/org/apache/felix/bundleplugin/BundleAllPluginTest.html rename to tools/maven-bundle-plugin/doc/site/xref-test/org/apache/felix/bundleplugin/BundleAllPluginTest.html
diff --git a/bundleplugin/doc/site/xref-test/org/apache/felix/bundleplugin/BundlePluginTest.html b/tools/maven-bundle-plugin/doc/site/xref-test/org/apache/felix/bundleplugin/BundlePluginTest.html similarity index 100% rename from bundleplugin/doc/site/xref-test/org/apache/felix/bundleplugin/BundlePluginTest.html rename to tools/maven-bundle-plugin/doc/site/xref-test/org/apache/felix/bundleplugin/BundlePluginTest.html
diff --git a/bundleplugin/doc/site/xref-test/org/apache/felix/bundleplugin/ManifestWriterTest.html b/tools/maven-bundle-plugin/doc/site/xref-test/org/apache/felix/bundleplugin/ManifestWriterTest.html similarity index 100% rename from bundleplugin/doc/site/xref-test/org/apache/felix/bundleplugin/ManifestWriterTest.html rename to tools/maven-bundle-plugin/doc/site/xref-test/org/apache/felix/bundleplugin/ManifestWriterTest.html
diff --git a/bundleplugin/doc/site/xref-test/org/apache/felix/bundleplugin/package-frame.html b/tools/maven-bundle-plugin/doc/site/xref-test/org/apache/felix/bundleplugin/package-frame.html similarity index 100% rename from bundleplugin/doc/site/xref-test/org/apache/felix/bundleplugin/package-frame.html rename to tools/maven-bundle-plugin/doc/site/xref-test/org/apache/felix/bundleplugin/package-frame.html
diff --git a/bundleplugin/doc/site/xref-test/org/apache/felix/bundleplugin/package-summary.html b/tools/maven-bundle-plugin/doc/site/xref-test/org/apache/felix/bundleplugin/package-summary.html similarity index 100% rename from bundleplugin/doc/site/xref-test/org/apache/felix/bundleplugin/package-summary.html rename to tools/maven-bundle-plugin/doc/site/xref-test/org/apache/felix/bundleplugin/package-summary.html
diff --git a/bundleplugin/doc/site/xref-test/org/apache/maven/shared/osgi/Maven2OsgiConverterTest.html b/tools/maven-bundle-plugin/doc/site/xref-test/org/apache/maven/shared/osgi/Maven2OsgiConverterTest.html similarity index 100% rename from bundleplugin/doc/site/xref-test/org/apache/maven/shared/osgi/Maven2OsgiConverterTest.html rename to tools/maven-bundle-plugin/doc/site/xref-test/org/apache/maven/shared/osgi/Maven2OsgiConverterTest.html
diff --git a/bundleplugin/doc/site/xref-test/org/apache/maven/shared/osgi/package-frame.html b/tools/maven-bundle-plugin/doc/site/xref-test/org/apache/maven/shared/osgi/package-frame.html similarity index 100% rename from bundleplugin/doc/site/xref-test/org/apache/maven/shared/osgi/package-frame.html rename to tools/maven-bundle-plugin/doc/site/xref-test/org/apache/maven/shared/osgi/package-frame.html
diff --git a/bundleplugin/doc/site/xref-test/org/apache/maven/shared/osgi/package-summary.html b/tools/maven-bundle-plugin/doc/site/xref-test/org/apache/maven/shared/osgi/package-summary.html similarity index 100% rename from bundleplugin/doc/site/xref-test/org/apache/maven/shared/osgi/package-summary.html rename to tools/maven-bundle-plugin/doc/site/xref-test/org/apache/maven/shared/osgi/package-summary.html
diff --git a/bundleplugin/doc/site/xref-test/overview-frame.html b/tools/maven-bundle-plugin/doc/site/xref-test/overview-frame.html similarity index 100% rename from bundleplugin/doc/site/xref-test/overview-frame.html rename to tools/maven-bundle-plugin/doc/site/xref-test/overview-frame.html
diff --git a/bundleplugin/doc/site/xref-test/overview-summary.html b/tools/maven-bundle-plugin/doc/site/xref-test/overview-summary.html similarity index 100% rename from bundleplugin/doc/site/xref-test/overview-summary.html rename to tools/maven-bundle-plugin/doc/site/xref-test/overview-summary.html
diff --git a/bundleplugin/doc/site/xref-test/stylesheet.css b/tools/maven-bundle-plugin/doc/site/xref-test/stylesheet.css similarity index 100% rename from bundleplugin/doc/site/xref-test/stylesheet.css rename to tools/maven-bundle-plugin/doc/site/xref-test/stylesheet.css
diff --git a/bundleplugin/doc/site/xref/allclasses-frame.html b/tools/maven-bundle-plugin/doc/site/xref/allclasses-frame.html similarity index 100% rename from bundleplugin/doc/site/xref/allclasses-frame.html rename to tools/maven-bundle-plugin/doc/site/xref/allclasses-frame.html
diff --git a/bundleplugin/doc/site/xref/index.html b/tools/maven-bundle-plugin/doc/site/xref/index.html similarity index 100% rename from bundleplugin/doc/site/xref/index.html rename to tools/maven-bundle-plugin/doc/site/xref/index.html
diff --git a/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/AbstractDependencyFilter.html b/tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/bundleplugin/AbstractDependencyFilter.html similarity index 100% rename from bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/AbstractDependencyFilter.html rename to tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/bundleplugin/AbstractDependencyFilter.html
diff --git a/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/AntPlugin.html b/tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/bundleplugin/AntPlugin.html similarity index 100% rename from bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/AntPlugin.html rename to tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/bundleplugin/AntPlugin.html
diff --git a/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/BlueprintPlugin.html b/tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/bundleplugin/BlueprintPlugin.html similarity index 100% rename from bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/BlueprintPlugin.html rename to tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/bundleplugin/BlueprintPlugin.html
diff --git a/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/BundleAllPlugin.html b/tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/bundleplugin/BundleAllPlugin.html similarity index 100% rename from bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/BundleAllPlugin.html rename to tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/bundleplugin/BundleAllPlugin.html
diff --git a/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/BundleInfo.html b/tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/bundleplugin/BundleInfo.html similarity index 100% rename from bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/BundleInfo.html rename to tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/bundleplugin/BundleInfo.html
diff --git a/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/BundlePlugin.html b/tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/bundleplugin/BundlePlugin.html similarity index 100% rename from bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/BundlePlugin.html rename to tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/bundleplugin/BundlePlugin.html
diff --git a/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/DependencyEmbedder.html b/tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/bundleplugin/DependencyEmbedder.html similarity index 100% rename from bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/DependencyEmbedder.html rename to tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/bundleplugin/DependencyEmbedder.html
diff --git a/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/DependencyExcluder.html b/tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/bundleplugin/DependencyExcluder.html similarity index 100% rename from bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/DependencyExcluder.html rename to tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/bundleplugin/DependencyExcluder.html
diff --git a/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/InstructionsPlugin.html b/tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/bundleplugin/InstructionsPlugin.html similarity index 100% rename from bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/InstructionsPlugin.html rename to tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/bundleplugin/InstructionsPlugin.html
diff --git a/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/JarPluginConfiguration.html b/tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/bundleplugin/JarPluginConfiguration.html similarity index 100% rename from bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/JarPluginConfiguration.html rename to tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/bundleplugin/JarPluginConfiguration.html
diff --git a/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/ManifestPlugin.html b/tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/bundleplugin/ManifestPlugin.html similarity index 100% rename from bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/ManifestPlugin.html rename to tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/bundleplugin/ManifestPlugin.html
diff --git a/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/ManifestWriter.html b/tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/bundleplugin/ManifestWriter.html similarity index 100% rename from bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/ManifestWriter.html rename to tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/bundleplugin/ManifestWriter.html
diff --git a/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/ScrPlugin.html b/tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/bundleplugin/ScrPlugin.html similarity index 100% rename from bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/ScrPlugin.html rename to tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/bundleplugin/ScrPlugin.html
diff --git a/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/VersionCleanerPlugin.html b/tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/bundleplugin/VersionCleanerPlugin.html similarity index 100% rename from bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/VersionCleanerPlugin.html rename to tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/bundleplugin/VersionCleanerPlugin.html
diff --git a/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/WrapPlugin.html b/tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/bundleplugin/WrapPlugin.html similarity index 100% rename from bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/WrapPlugin.html rename to tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/bundleplugin/WrapPlugin.html
diff --git a/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/baseline/AbstractBaselinePlugin.html b/tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/bundleplugin/baseline/AbstractBaselinePlugin.html similarity index 100% rename from bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/baseline/AbstractBaselinePlugin.html rename to tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/bundleplugin/baseline/AbstractBaselinePlugin.html
diff --git a/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/baseline/BaselinePlugin.html b/tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/bundleplugin/baseline/BaselinePlugin.html similarity index 100% rename from bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/baseline/BaselinePlugin.html rename to tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/bundleplugin/baseline/BaselinePlugin.html
diff --git a/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/baseline/BaselineReport.html b/tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/bundleplugin/baseline/BaselineReport.html similarity index 100% rename from bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/baseline/BaselineReport.html rename to tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/bundleplugin/baseline/BaselineReport.html
diff --git a/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/baseline/DiffMessage.html b/tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/bundleplugin/baseline/DiffMessage.html similarity index 100% rename from bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/baseline/DiffMessage.html rename to tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/bundleplugin/baseline/DiffMessage.html
diff --git a/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/baseline/InfoComparator.html b/tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/bundleplugin/baseline/InfoComparator.html similarity index 100% rename from bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/baseline/InfoComparator.html rename to tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/bundleplugin/baseline/InfoComparator.html
diff --git a/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/baseline/package-frame.html b/tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/bundleplugin/baseline/package-frame.html similarity index 100% rename from bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/baseline/package-frame.html rename to tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/bundleplugin/baseline/package-frame.html
diff --git a/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/baseline/package-summary.html b/tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/bundleplugin/baseline/package-summary.html similarity index 100% rename from bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/baseline/package-summary.html rename to tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/bundleplugin/baseline/package-summary.html
diff --git a/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/package-frame.html b/tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/bundleplugin/package-frame.html similarity index 100% rename from bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/package-frame.html rename to tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/bundleplugin/package-frame.html
diff --git a/bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/package-summary.html b/tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/bundleplugin/package-summary.html similarity index 100% rename from bundleplugin/doc/site/xref/org/apache/felix/bundleplugin/package-summary.html rename to tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/bundleplugin/package-summary.html
diff --git a/bundleplugin/doc/site/xref/org/apache/felix/obrplugin/AbstractFileMojo.html b/tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/obrplugin/AbstractFileMojo.html similarity index 100% rename from bundleplugin/doc/site/xref/org/apache/felix/obrplugin/AbstractFileMojo.html rename to tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/obrplugin/AbstractFileMojo.html
diff --git a/bundleplugin/doc/site/xref/org/apache/felix/obrplugin/Config.html b/tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/obrplugin/Config.html similarity index 100% rename from bundleplugin/doc/site/xref/org/apache/felix/obrplugin/Config.html rename to tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/obrplugin/Config.html
diff --git a/bundleplugin/doc/site/xref/org/apache/felix/obrplugin/ObrCleanRepo.html b/tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/obrplugin/ObrCleanRepo.html similarity index 100% rename from bundleplugin/doc/site/xref/org/apache/felix/obrplugin/ObrCleanRepo.html rename to tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/obrplugin/ObrCleanRepo.html
diff --git a/bundleplugin/doc/site/xref/org/apache/felix/obrplugin/ObrDeploy.html b/tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/obrplugin/ObrDeploy.html similarity index 100% rename from bundleplugin/doc/site/xref/org/apache/felix/obrplugin/ObrDeploy.html rename to tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/obrplugin/ObrDeploy.html
diff --git a/bundleplugin/doc/site/xref/org/apache/felix/obrplugin/ObrDeployFile.html b/tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/obrplugin/ObrDeployFile.html similarity index 100% rename from bundleplugin/doc/site/xref/org/apache/felix/obrplugin/ObrDeployFile.html rename to tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/obrplugin/ObrDeployFile.html
diff --git a/bundleplugin/doc/site/xref/org/apache/felix/obrplugin/ObrIndex.html b/tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/obrplugin/ObrIndex.html similarity index 100% rename from bundleplugin/doc/site/xref/org/apache/felix/obrplugin/ObrIndex.html rename to tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/obrplugin/ObrIndex.html
diff --git a/bundleplugin/doc/site/xref/org/apache/felix/obrplugin/ObrInstall.html b/tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/obrplugin/ObrInstall.html similarity index 100% rename from bundleplugin/doc/site/xref/org/apache/felix/obrplugin/ObrInstall.html rename to tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/obrplugin/ObrInstall.html
diff --git a/bundleplugin/doc/site/xref/org/apache/felix/obrplugin/ObrInstallFile.html b/tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/obrplugin/ObrInstallFile.html similarity index 100% rename from bundleplugin/doc/site/xref/org/apache/felix/obrplugin/ObrInstallFile.html rename to tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/obrplugin/ObrInstallFile.html
diff --git a/bundleplugin/doc/site/xref/org/apache/felix/obrplugin/ObrRemoteClean.html b/tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/obrplugin/ObrRemoteClean.html similarity index 100% rename from bundleplugin/doc/site/xref/org/apache/felix/obrplugin/ObrRemoteClean.html rename to tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/obrplugin/ObrRemoteClean.html
diff --git a/bundleplugin/doc/site/xref/org/apache/felix/obrplugin/ObrUpdate.html b/tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/obrplugin/ObrUpdate.html similarity index 100% rename from bundleplugin/doc/site/xref/org/apache/felix/obrplugin/ObrUpdate.html rename to tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/obrplugin/ObrUpdate.html
diff --git a/bundleplugin/doc/site/xref/org/apache/felix/obrplugin/ObrUtils.html b/tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/obrplugin/ObrUtils.html similarity index 100% rename from bundleplugin/doc/site/xref/org/apache/felix/obrplugin/ObrUtils.html rename to tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/obrplugin/ObrUtils.html
diff --git a/bundleplugin/doc/site/xref/org/apache/felix/obrplugin/PomHelper.html b/tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/obrplugin/PomHelper.html similarity index 100% rename from bundleplugin/doc/site/xref/org/apache/felix/obrplugin/PomHelper.html rename to tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/obrplugin/PomHelper.html
diff --git a/bundleplugin/doc/site/xref/org/apache/felix/obrplugin/RemoteFileManager.html b/tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/obrplugin/RemoteFileManager.html similarity index 100% rename from bundleplugin/doc/site/xref/org/apache/felix/obrplugin/RemoteFileManager.html rename to tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/obrplugin/RemoteFileManager.html
diff --git a/bundleplugin/doc/site/xref/org/apache/felix/obrplugin/XmlHelper.html b/tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/obrplugin/XmlHelper.html similarity index 100% rename from bundleplugin/doc/site/xref/org/apache/felix/obrplugin/XmlHelper.html rename to tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/obrplugin/XmlHelper.html
diff --git a/bundleplugin/doc/site/xref/org/apache/felix/obrplugin/package-frame.html b/tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/obrplugin/package-frame.html similarity index 100% rename from bundleplugin/doc/site/xref/org/apache/felix/obrplugin/package-frame.html rename to tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/obrplugin/package-frame.html
diff --git a/bundleplugin/doc/site/xref/org/apache/felix/obrplugin/package-summary.html b/tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/obrplugin/package-summary.html similarity index 100% rename from bundleplugin/doc/site/xref/org/apache/felix/obrplugin/package-summary.html rename to tools/maven-bundle-plugin/doc/site/xref/org/apache/felix/obrplugin/package-summary.html
diff --git a/bundleplugin/doc/site/xref/org/apache/maven/shared/dependency/tree/DependencyTreeResolutionListener.html b/tools/maven-bundle-plugin/doc/site/xref/org/apache/maven/shared/dependency/tree/DependencyTreeResolutionListener.html similarity index 100% rename from bundleplugin/doc/site/xref/org/apache/maven/shared/dependency/tree/DependencyTreeResolutionListener.html rename to tools/maven-bundle-plugin/doc/site/xref/org/apache/maven/shared/dependency/tree/DependencyTreeResolutionListener.html
diff --git a/bundleplugin/doc/site/xref/org/apache/maven/shared/dependency/tree/package-frame.html b/tools/maven-bundle-plugin/doc/site/xref/org/apache/maven/shared/dependency/tree/package-frame.html similarity index 100% rename from bundleplugin/doc/site/xref/org/apache/maven/shared/dependency/tree/package-frame.html rename to tools/maven-bundle-plugin/doc/site/xref/org/apache/maven/shared/dependency/tree/package-frame.html
diff --git a/bundleplugin/doc/site/xref/org/apache/maven/shared/dependency/tree/package-summary.html b/tools/maven-bundle-plugin/doc/site/xref/org/apache/maven/shared/dependency/tree/package-summary.html similarity index 100% rename from bundleplugin/doc/site/xref/org/apache/maven/shared/dependency/tree/package-summary.html rename to tools/maven-bundle-plugin/doc/site/xref/org/apache/maven/shared/dependency/tree/package-summary.html
diff --git a/bundleplugin/doc/site/xref/org/apache/maven/shared/osgi/DefaultMaven2OsgiConverter.html b/tools/maven-bundle-plugin/doc/site/xref/org/apache/maven/shared/osgi/DefaultMaven2OsgiConverter.html similarity index 100% rename from bundleplugin/doc/site/xref/org/apache/maven/shared/osgi/DefaultMaven2OsgiConverter.html rename to tools/maven-bundle-plugin/doc/site/xref/org/apache/maven/shared/osgi/DefaultMaven2OsgiConverter.html
diff --git a/bundleplugin/doc/site/xref/org/apache/maven/shared/osgi/ManifestReadingException.html b/tools/maven-bundle-plugin/doc/site/xref/org/apache/maven/shared/osgi/ManifestReadingException.html similarity index 100% rename from bundleplugin/doc/site/xref/org/apache/maven/shared/osgi/ManifestReadingException.html rename to tools/maven-bundle-plugin/doc/site/xref/org/apache/maven/shared/osgi/ManifestReadingException.html
diff --git a/bundleplugin/doc/site/xref/org/apache/maven/shared/osgi/Maven2OsgiConverter.html b/tools/maven-bundle-plugin/doc/site/xref/org/apache/maven/shared/osgi/Maven2OsgiConverter.html similarity index 100% rename from bundleplugin/doc/site/xref/org/apache/maven/shared/osgi/Maven2OsgiConverter.html rename to tools/maven-bundle-plugin/doc/site/xref/org/apache/maven/shared/osgi/Maven2OsgiConverter.html
diff --git a/bundleplugin/doc/site/xref/org/apache/maven/shared/osgi/package-frame.html b/tools/maven-bundle-plugin/doc/site/xref/org/apache/maven/shared/osgi/package-frame.html similarity index 100% rename from bundleplugin/doc/site/xref/org/apache/maven/shared/osgi/package-frame.html rename to tools/maven-bundle-plugin/doc/site/xref/org/apache/maven/shared/osgi/package-frame.html
diff --git a/bundleplugin/doc/site/xref/org/apache/maven/shared/osgi/package-summary.html b/tools/maven-bundle-plugin/doc/site/xref/org/apache/maven/shared/osgi/package-summary.html similarity index 100% rename from bundleplugin/doc/site/xref/org/apache/maven/shared/osgi/package-summary.html rename to tools/maven-bundle-plugin/doc/site/xref/org/apache/maven/shared/osgi/package-summary.html
diff --git a/bundleplugin/doc/site/xref/overview-frame.html b/tools/maven-bundle-plugin/doc/site/xref/overview-frame.html similarity index 100% rename from bundleplugin/doc/site/xref/overview-frame.html rename to tools/maven-bundle-plugin/doc/site/xref/overview-frame.html
diff --git a/bundleplugin/doc/site/xref/overview-summary.html b/tools/maven-bundle-plugin/doc/site/xref/overview-summary.html similarity index 100% rename from bundleplugin/doc/site/xref/overview-summary.html rename to tools/maven-bundle-plugin/doc/site/xref/overview-summary.html
diff --git a/bundleplugin/doc/site/xref/stylesheet.css b/tools/maven-bundle-plugin/doc/site/xref/stylesheet.css similarity index 100% rename from bundleplugin/doc/site/xref/stylesheet.css rename to tools/maven-bundle-plugin/doc/site/xref/stylesheet.css
diff --git a/bundleplugin/pom.xml b/tools/maven-bundle-plugin/pom.xml similarity index 100% rename from bundleplugin/pom.xml rename to tools/maven-bundle-plugin/pom.xml
diff --git a/bundleplugin/src/main/java/org/apache/felix/bundleplugin/AbstractDependencyFilter.java b/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/AbstractDependencyFilter.java similarity index 100% rename from bundleplugin/src/main/java/org/apache/felix/bundleplugin/AbstractDependencyFilter.java rename to tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/AbstractDependencyFilter.java
diff --git a/bundleplugin/src/main/java/org/apache/felix/bundleplugin/AntPlugin.java b/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/AntPlugin.java similarity index 100% rename from bundleplugin/src/main/java/org/apache/felix/bundleplugin/AntPlugin.java rename to tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/AntPlugin.java
diff --git a/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BlueprintPlugin.java b/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/BlueprintPlugin.java similarity index 100% rename from bundleplugin/src/main/java/org/apache/felix/bundleplugin/BlueprintPlugin.java rename to tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/BlueprintPlugin.java
diff --git a/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundleAllPlugin.java b/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/BundleAllPlugin.java similarity index 100% rename from bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundleAllPlugin.java rename to tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/BundleAllPlugin.java
diff --git a/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundleInfo.java b/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/BundleInfo.java similarity index 100% rename from bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundleInfo.java rename to tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/BundleInfo.java
diff --git a/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java b/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java similarity index 100% rename from bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java rename to tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
diff --git a/bundleplugin/src/main/java/org/apache/felix/bundleplugin/DependencyEmbedder.java b/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/DependencyEmbedder.java similarity index 100% rename from bundleplugin/src/main/java/org/apache/felix/bundleplugin/DependencyEmbedder.java rename to tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/DependencyEmbedder.java
diff --git a/bundleplugin/src/main/java/org/apache/felix/bundleplugin/DependencyExcluder.java b/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/DependencyExcluder.java similarity index 100% rename from bundleplugin/src/main/java/org/apache/felix/bundleplugin/DependencyExcluder.java rename to tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/DependencyExcluder.java
diff --git a/bundleplugin/src/main/java/org/apache/felix/bundleplugin/InstructionsPlugin.java b/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/InstructionsPlugin.java similarity index 100% rename from bundleplugin/src/main/java/org/apache/felix/bundleplugin/InstructionsPlugin.java rename to tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/InstructionsPlugin.java
diff --git a/bundleplugin/src/main/java/org/apache/felix/bundleplugin/JarPluginConfiguration.java b/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/JarPluginConfiguration.java similarity index 100% rename from bundleplugin/src/main/java/org/apache/felix/bundleplugin/JarPluginConfiguration.java rename to tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/JarPluginConfiguration.java
diff --git a/bundleplugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java b/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java similarity index 100% rename from bundleplugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java rename to tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java
diff --git a/bundleplugin/src/main/java/org/apache/felix/bundleplugin/ManifestWriter.java b/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/ManifestWriter.java similarity index 100% rename from bundleplugin/src/main/java/org/apache/felix/bundleplugin/ManifestWriter.java rename to tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/ManifestWriter.java
diff --git a/bundleplugin/src/main/java/org/apache/felix/bundleplugin/ScrPlugin.java b/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/ScrPlugin.java similarity index 100% rename from bundleplugin/src/main/java/org/apache/felix/bundleplugin/ScrPlugin.java rename to tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/ScrPlugin.java
diff --git a/bundleplugin/src/main/java/org/apache/felix/bundleplugin/VersionCleanerPlugin.java b/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/VersionCleanerPlugin.java similarity index 100% rename from bundleplugin/src/main/java/org/apache/felix/bundleplugin/VersionCleanerPlugin.java rename to tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/VersionCleanerPlugin.java
diff --git a/bundleplugin/src/main/java/org/apache/felix/bundleplugin/WrapPlugin.java b/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/WrapPlugin.java similarity index 100% rename from bundleplugin/src/main/java/org/apache/felix/bundleplugin/WrapPlugin.java rename to tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/WrapPlugin.java
diff --git a/bundleplugin/src/main/java/org/apache/felix/bundleplugin/baseline/AbstractBaselinePlugin.java b/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/baseline/AbstractBaselinePlugin.java similarity index 100% rename from bundleplugin/src/main/java/org/apache/felix/bundleplugin/baseline/AbstractBaselinePlugin.java rename to tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/baseline/AbstractBaselinePlugin.java
diff --git a/bundleplugin/src/main/java/org/apache/felix/bundleplugin/baseline/BaselinePlugin.java b/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/baseline/BaselinePlugin.java similarity index 100% rename from bundleplugin/src/main/java/org/apache/felix/bundleplugin/baseline/BaselinePlugin.java rename to tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/baseline/BaselinePlugin.java
diff --git a/bundleplugin/src/main/java/org/apache/felix/bundleplugin/baseline/BaselineReport.java b/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/baseline/BaselineReport.java similarity index 100% rename from bundleplugin/src/main/java/org/apache/felix/bundleplugin/baseline/BaselineReport.java rename to tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/baseline/BaselineReport.java
diff --git a/bundleplugin/src/main/java/org/apache/felix/bundleplugin/baseline/DiffMessage.java b/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/baseline/DiffMessage.java similarity index 100% rename from bundleplugin/src/main/java/org/apache/felix/bundleplugin/baseline/DiffMessage.java rename to tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/baseline/DiffMessage.java
diff --git a/bundleplugin/src/main/java/org/apache/felix/bundleplugin/baseline/InfoComparator.java b/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/baseline/InfoComparator.java similarity index 100% rename from bundleplugin/src/main/java/org/apache/felix/bundleplugin/baseline/InfoComparator.java rename to tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/baseline/InfoComparator.java
diff --git a/bundleplugin/src/main/java/org/apache/felix/obrplugin/AbstractFileMojo.java b/tools/maven-bundle-plugin/src/main/java/org/apache/felix/obrplugin/AbstractFileMojo.java similarity index 100% rename from bundleplugin/src/main/java/org/apache/felix/obrplugin/AbstractFileMojo.java rename to tools/maven-bundle-plugin/src/main/java/org/apache/felix/obrplugin/AbstractFileMojo.java
diff --git a/bundleplugin/src/main/java/org/apache/felix/obrplugin/Config.java b/tools/maven-bundle-plugin/src/main/java/org/apache/felix/obrplugin/Config.java similarity index 100% rename from bundleplugin/src/main/java/org/apache/felix/obrplugin/Config.java rename to tools/maven-bundle-plugin/src/main/java/org/apache/felix/obrplugin/Config.java
diff --git a/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrCleanRepo.java b/tools/maven-bundle-plugin/src/main/java/org/apache/felix/obrplugin/ObrCleanRepo.java similarity index 100% rename from bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrCleanRepo.java rename to tools/maven-bundle-plugin/src/main/java/org/apache/felix/obrplugin/ObrCleanRepo.java
diff --git a/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrDeploy.java b/tools/maven-bundle-plugin/src/main/java/org/apache/felix/obrplugin/ObrDeploy.java similarity index 100% rename from bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrDeploy.java rename to tools/maven-bundle-plugin/src/main/java/org/apache/felix/obrplugin/ObrDeploy.java
diff --git a/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrDeployFile.java b/tools/maven-bundle-plugin/src/main/java/org/apache/felix/obrplugin/ObrDeployFile.java similarity index 100% rename from bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrDeployFile.java rename to tools/maven-bundle-plugin/src/main/java/org/apache/felix/obrplugin/ObrDeployFile.java
diff --git a/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrIndex.java b/tools/maven-bundle-plugin/src/main/java/org/apache/felix/obrplugin/ObrIndex.java similarity index 100% rename from bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrIndex.java rename to tools/maven-bundle-plugin/src/main/java/org/apache/felix/obrplugin/ObrIndex.java
diff --git a/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrInstall.java b/tools/maven-bundle-plugin/src/main/java/org/apache/felix/obrplugin/ObrInstall.java similarity index 100% rename from bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrInstall.java rename to tools/maven-bundle-plugin/src/main/java/org/apache/felix/obrplugin/ObrInstall.java
diff --git a/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrInstallFile.java b/tools/maven-bundle-plugin/src/main/java/org/apache/felix/obrplugin/ObrInstallFile.java similarity index 100% rename from bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrInstallFile.java rename to tools/maven-bundle-plugin/src/main/java/org/apache/felix/obrplugin/ObrInstallFile.java
diff --git a/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrRemoteClean.java b/tools/maven-bundle-plugin/src/main/java/org/apache/felix/obrplugin/ObrRemoteClean.java similarity index 100% rename from bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrRemoteClean.java rename to tools/maven-bundle-plugin/src/main/java/org/apache/felix/obrplugin/ObrRemoteClean.java
diff --git a/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrUpdate.java b/tools/maven-bundle-plugin/src/main/java/org/apache/felix/obrplugin/ObrUpdate.java similarity index 100% rename from bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrUpdate.java rename to tools/maven-bundle-plugin/src/main/java/org/apache/felix/obrplugin/ObrUpdate.java
diff --git a/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrUtils.java b/tools/maven-bundle-plugin/src/main/java/org/apache/felix/obrplugin/ObrUtils.java similarity index 100% rename from bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrUtils.java rename to tools/maven-bundle-plugin/src/main/java/org/apache/felix/obrplugin/ObrUtils.java
diff --git a/bundleplugin/src/main/java/org/apache/felix/obrplugin/PomHelper.java b/tools/maven-bundle-plugin/src/main/java/org/apache/felix/obrplugin/PomHelper.java similarity index 100% rename from bundleplugin/src/main/java/org/apache/felix/obrplugin/PomHelper.java rename to tools/maven-bundle-plugin/src/main/java/org/apache/felix/obrplugin/PomHelper.java
diff --git a/bundleplugin/src/main/java/org/apache/felix/obrplugin/RemoteFileManager.java b/tools/maven-bundle-plugin/src/main/java/org/apache/felix/obrplugin/RemoteFileManager.java similarity index 100% rename from bundleplugin/src/main/java/org/apache/felix/obrplugin/RemoteFileManager.java rename to tools/maven-bundle-plugin/src/main/java/org/apache/felix/obrplugin/RemoteFileManager.java
diff --git a/bundleplugin/src/main/java/org/apache/felix/obrplugin/XmlHelper.java b/tools/maven-bundle-plugin/src/main/java/org/apache/felix/obrplugin/XmlHelper.java similarity index 100% rename from bundleplugin/src/main/java/org/apache/felix/obrplugin/XmlHelper.java rename to tools/maven-bundle-plugin/src/main/java/org/apache/felix/obrplugin/XmlHelper.java
diff --git a/bundleplugin/src/main/java/org/apache/maven/shared/dependency/tree/DependencyTreeResolutionListener.java b/tools/maven-bundle-plugin/src/main/java/org/apache/maven/shared/dependency/tree/DependencyTreeResolutionListener.java similarity index 100% rename from bundleplugin/src/main/java/org/apache/maven/shared/dependency/tree/DependencyTreeResolutionListener.java rename to tools/maven-bundle-plugin/src/main/java/org/apache/maven/shared/dependency/tree/DependencyTreeResolutionListener.java
diff --git a/bundleplugin/src/main/java/org/apache/maven/shared/osgi/DefaultMaven2OsgiConverter.java b/tools/maven-bundle-plugin/src/main/java/org/apache/maven/shared/osgi/DefaultMaven2OsgiConverter.java similarity index 100% rename from bundleplugin/src/main/java/org/apache/maven/shared/osgi/DefaultMaven2OsgiConverter.java rename to tools/maven-bundle-plugin/src/main/java/org/apache/maven/shared/osgi/DefaultMaven2OsgiConverter.java
diff --git a/bundleplugin/src/main/java/org/apache/maven/shared/osgi/ManifestReadingException.java b/tools/maven-bundle-plugin/src/main/java/org/apache/maven/shared/osgi/ManifestReadingException.java similarity index 100% rename from bundleplugin/src/main/java/org/apache/maven/shared/osgi/ManifestReadingException.java rename to tools/maven-bundle-plugin/src/main/java/org/apache/maven/shared/osgi/ManifestReadingException.java
diff --git a/bundleplugin/src/main/java/org/apache/maven/shared/osgi/Maven2OsgiConverter.java b/tools/maven-bundle-plugin/src/main/java/org/apache/maven/shared/osgi/Maven2OsgiConverter.java similarity index 100% rename from bundleplugin/src/main/java/org/apache/maven/shared/osgi/Maven2OsgiConverter.java rename to tools/maven-bundle-plugin/src/main/java/org/apache/maven/shared/osgi/Maven2OsgiConverter.java
diff --git a/bundleplugin/src/main/resources/META-INF/plexus/components.xml b/tools/maven-bundle-plugin/src/main/resources/META-INF/plexus/components.xml similarity index 100% rename from bundleplugin/src/main/resources/META-INF/plexus/components.xml rename to tools/maven-bundle-plugin/src/main/resources/META-INF/plexus/components.xml
diff --git a/bundleplugin/src/main/resources/SchemaObr.xsd b/tools/maven-bundle-plugin/src/main/resources/SchemaObr.xsd similarity index 100% rename from bundleplugin/src/main/resources/SchemaObr.xsd rename to tools/maven-bundle-plugin/src/main/resources/SchemaObr.xsd
diff --git a/bundleplugin/src/main/resources/baseline-report.properties b/tools/maven-bundle-plugin/src/main/resources/baseline-report.properties similarity index 100% rename from bundleplugin/src/main/resources/baseline-report.properties rename to tools/maven-bundle-plugin/src/main/resources/baseline-report.properties
diff --git a/bundleplugin/src/main/resources/build.xml b/tools/maven-bundle-plugin/src/main/resources/build.xml similarity index 100% rename from bundleplugin/src/main/resources/build.xml rename to tools/maven-bundle-plugin/src/main/resources/build.xml
diff --git a/bundleplugin/src/main/resources/org/apache/felix/bundleplugin/baseline/access.gif b/tools/maven-bundle-plugin/src/main/resources/org/apache/felix/bundleplugin/baseline/access.gif similarity index 100% rename from bundleplugin/src/main/resources/org/apache/felix/bundleplugin/baseline/access.gif rename to tools/maven-bundle-plugin/src/main/resources/org/apache/felix/bundleplugin/baseline/access.gif
diff --git a/bundleplugin/src/main/resources/org/apache/felix/bundleplugin/baseline/annotated.gif b/tools/maven-bundle-plugin/src/main/resources/org/apache/felix/bundleplugin/baseline/annotated.gif similarity index 100% rename from bundleplugin/src/main/resources/org/apache/felix/bundleplugin/baseline/annotated.gif rename to tools/maven-bundle-plugin/src/main/resources/org/apache/felix/bundleplugin/baseline/annotated.gif
diff --git a/bundleplugin/src/main/resources/org/apache/felix/bundleplugin/baseline/annotation.gif b/tools/maven-bundle-plugin/src/main/resources/org/apache/felix/bundleplugin/baseline/annotation.gif similarity index 100% rename from bundleplugin/src/main/resources/org/apache/felix/bundleplugin/baseline/annotation.gif rename to tools/maven-bundle-plugin/src/main/resources/org/apache/felix/bundleplugin/baseline/annotation.gif
diff --git a/bundleplugin/src/main/resources/org/apache/felix/bundleplugin/baseline/bundle.gif b/tools/maven-bundle-plugin/src/main/resources/org/apache/felix/bundleplugin/baseline/bundle.gif similarity index 100% rename from bundleplugin/src/main/resources/org/apache/felix/bundleplugin/baseline/bundle.gif rename to tools/maven-bundle-plugin/src/main/resources/org/apache/felix/bundleplugin/baseline/bundle.gif
diff --git a/bundleplugin/src/main/resources/org/apache/felix/bundleplugin/baseline/class.gif b/tools/maven-bundle-plugin/src/main/resources/org/apache/felix/bundleplugin/baseline/class.gif similarity index 100% rename from bundleplugin/src/main/resources/org/apache/felix/bundleplugin/baseline/class.gif rename to tools/maven-bundle-plugin/src/main/resources/org/apache/felix/bundleplugin/baseline/class.gif
diff --git a/bundleplugin/src/main/resources/org/apache/felix/bundleplugin/baseline/constant.gif b/tools/maven-bundle-plugin/src/main/resources/org/apache/felix/bundleplugin/baseline/constant.gif similarity index 100% rename from bundleplugin/src/main/resources/org/apache/felix/bundleplugin/baseline/constant.gif rename to tools/maven-bundle-plugin/src/main/resources/org/apache/felix/bundleplugin/baseline/constant.gif
diff --git a/bundleplugin/src/main/resources/org/apache/felix/bundleplugin/baseline/enum.gif b/tools/maven-bundle-plugin/src/main/resources/org/apache/felix/bundleplugin/baseline/enum.gif similarity index 100% rename from bundleplugin/src/main/resources/org/apache/felix/bundleplugin/baseline/enum.gif rename to tools/maven-bundle-plugin/src/main/resources/org/apache/felix/bundleplugin/baseline/enum.gif
diff --git a/bundleplugin/src/main/resources/org/apache/felix/bundleplugin/baseline/error.gif b/tools/maven-bundle-plugin/src/main/resources/org/apache/felix/bundleplugin/baseline/error.gif similarity index 100% rename from bundleplugin/src/main/resources/org/apache/felix/bundleplugin/baseline/error.gif rename to tools/maven-bundle-plugin/src/main/resources/org/apache/felix/bundleplugin/baseline/error.gif
diff --git a/bundleplugin/src/main/resources/org/apache/felix/bundleplugin/baseline/extends.gif b/tools/maven-bundle-plugin/src/main/resources/org/apache/felix/bundleplugin/baseline/extends.gif similarity index 100% rename from bundleplugin/src/main/resources/org/apache/felix/bundleplugin/baseline/extends.gif rename to tools/maven-bundle-plugin/src/main/resources/org/apache/felix/bundleplugin/baseline/extends.gif
diff --git a/bundleplugin/src/main/resources/org/apache/felix/bundleplugin/baseline/field.gif b/tools/maven-bundle-plugin/src/main/resources/org/apache/felix/bundleplugin/baseline/field.gif similarity index 100% rename from bundleplugin/src/main/resources/org/apache/felix/bundleplugin/baseline/field.gif rename to tools/maven-bundle-plugin/src/main/resources/org/apache/felix/bundleplugin/baseline/field.gif
diff --git a/bundleplugin/src/main/resources/org/apache/felix/bundleplugin/baseline/implements.gif b/tools/maven-bundle-plugin/src/main/resources/org/apache/felix/bundleplugin/baseline/implements.gif similarity index 100% rename from bundleplugin/src/main/resources/org/apache/felix/bundleplugin/baseline/implements.gif rename to tools/maven-bundle-plugin/src/main/resources/org/apache/felix/bundleplugin/baseline/implements.gif
diff --git a/bundleplugin/src/main/resources/org/apache/felix/bundleplugin/baseline/info.gif b/tools/maven-bundle-plugin/src/main/resources/org/apache/felix/bundleplugin/baseline/info.gif similarity index 100% rename from bundleplugin/src/main/resources/org/apache/felix/bundleplugin/baseline/info.gif rename to tools/maven-bundle-plugin/src/main/resources/org/apache/felix/bundleplugin/baseline/info.gif
diff --git a/bundleplugin/src/main/resources/org/apache/felix/bundleplugin/baseline/interface.gif b/tools/maven-bundle-plugin/src/main/resources/org/apache/felix/bundleplugin/baseline/interface.gif similarity index 100% rename from bundleplugin/src/main/resources/org/apache/felix/bundleplugin/baseline/interface.gif rename to tools/maven-bundle-plugin/src/main/resources/org/apache/felix/bundleplugin/baseline/interface.gif
diff --git a/bundleplugin/src/main/resources/org/apache/felix/bundleplugin/baseline/method.gif b/tools/maven-bundle-plugin/src/main/resources/org/apache/felix/bundleplugin/baseline/method.gif similarity index 100% rename from bundleplugin/src/main/resources/org/apache/felix/bundleplugin/baseline/method.gif rename to tools/maven-bundle-plugin/src/main/resources/org/apache/felix/bundleplugin/baseline/method.gif
diff --git a/bundleplugin/src/main/resources/org/apache/felix/bundleplugin/baseline/package.gif b/tools/maven-bundle-plugin/src/main/resources/org/apache/felix/bundleplugin/baseline/package.gif similarity index 100% rename from bundleplugin/src/main/resources/org/apache/felix/bundleplugin/baseline/package.gif rename to tools/maven-bundle-plugin/src/main/resources/org/apache/felix/bundleplugin/baseline/package.gif
diff --git a/bundleplugin/src/main/resources/org/apache/felix/bundleplugin/baseline/resource.gif b/tools/maven-bundle-plugin/src/main/resources/org/apache/felix/bundleplugin/baseline/resource.gif similarity index 100% rename from bundleplugin/src/main/resources/org/apache/felix/bundleplugin/baseline/resource.gif rename to tools/maven-bundle-plugin/src/main/resources/org/apache/felix/bundleplugin/baseline/resource.gif
diff --git a/bundleplugin/src/main/resources/org/apache/felix/bundleplugin/baseline/return.gif b/tools/maven-bundle-plugin/src/main/resources/org/apache/felix/bundleplugin/baseline/return.gif similarity index 100% rename from bundleplugin/src/main/resources/org/apache/felix/bundleplugin/baseline/return.gif rename to tools/maven-bundle-plugin/src/main/resources/org/apache/felix/bundleplugin/baseline/return.gif
diff --git a/bundleplugin/src/main/resources/org/apache/felix/bundleplugin/baseline/version.gif b/tools/maven-bundle-plugin/src/main/resources/org/apache/felix/bundleplugin/baseline/version.gif similarity index 100% rename from bundleplugin/src/main/resources/org/apache/felix/bundleplugin/baseline/version.gif rename to tools/maven-bundle-plugin/src/main/resources/org/apache/felix/bundleplugin/baseline/version.gif
diff --git a/bundleplugin/src/main/resources/org/apache/felix/bundleplugin/baseline/warning.gif b/tools/maven-bundle-plugin/src/main/resources/org/apache/felix/bundleplugin/baseline/warning.gif similarity index 100% rename from bundleplugin/src/main/resources/org/apache/felix/bundleplugin/baseline/warning.gif rename to tools/maven-bundle-plugin/src/main/resources/org/apache/felix/bundleplugin/baseline/warning.gif
diff --git a/bundleplugin/src/main/resources/org/apache/felix/bundleplugin/blueprint.xsl b/tools/maven-bundle-plugin/src/main/resources/org/apache/felix/bundleplugin/blueprint.xsl similarity index 100% rename from bundleplugin/src/main/resources/org/apache/felix/bundleplugin/blueprint.xsl rename to tools/maven-bundle-plugin/src/main/resources/org/apache/felix/bundleplugin/blueprint.xsl
diff --git a/bundleplugin/src/main/resources/org/apache/felix/bundleplugin/scr.xsl b/tools/maven-bundle-plugin/src/main/resources/org/apache/felix/bundleplugin/scr.xsl similarity index 100% rename from bundleplugin/src/main/resources/org/apache/felix/bundleplugin/scr.xsl rename to tools/maven-bundle-plugin/src/main/resources/org/apache/felix/bundleplugin/scr.xsl
diff --git a/bundleplugin/src/repo/biz/aQute/bnd/biz.aQute.bndlib/20150713/biz.aQute.bndlib-20150713-javadoc.jar b/tools/maven-bundle-plugin/src/repo/biz/aQute/bnd/biz.aQute.bndlib/20150713/biz.aQute.bndlib-20150713-javadoc.jar similarity index 100% rename from bundleplugin/src/repo/biz/aQute/bnd/biz.aQute.bndlib/20150713/biz.aQute.bndlib-20150713-javadoc.jar rename to tools/maven-bundle-plugin/src/repo/biz/aQute/bnd/biz.aQute.bndlib/20150713/biz.aQute.bndlib-20150713-javadoc.jar Binary files differ
diff --git a/bundleplugin/src/repo/biz/aQute/bnd/biz.aQute.bndlib/20150713/biz.aQute.bndlib-20150713-sources.jar b/tools/maven-bundle-plugin/src/repo/biz/aQute/bnd/biz.aQute.bndlib/20150713/biz.aQute.bndlib-20150713-sources.jar similarity index 100% rename from bundleplugin/src/repo/biz/aQute/bnd/biz.aQute.bndlib/20150713/biz.aQute.bndlib-20150713-sources.jar rename to tools/maven-bundle-plugin/src/repo/biz/aQute/bnd/biz.aQute.bndlib/20150713/biz.aQute.bndlib-20150713-sources.jar Binary files differ
diff --git a/bundleplugin/src/repo/biz/aQute/bnd/biz.aQute.bndlib/20150713/biz.aQute.bndlib-20150713.jar b/tools/maven-bundle-plugin/src/repo/biz/aQute/bnd/biz.aQute.bndlib/20150713/biz.aQute.bndlib-20150713.jar similarity index 100% rename from bundleplugin/src/repo/biz/aQute/bnd/biz.aQute.bndlib/20150713/biz.aQute.bndlib-20150713.jar rename to tools/maven-bundle-plugin/src/repo/biz/aQute/bnd/biz.aQute.bndlib/20150713/biz.aQute.bndlib-20150713.jar Binary files differ
diff --git a/bundleplugin/src/repo/biz/aQute/bnd/biz.aQute.bndlib/20150713/biz.aQute.bndlib-20150713.pom b/tools/maven-bundle-plugin/src/repo/biz/aQute/bnd/biz.aQute.bndlib/20150713/biz.aQute.bndlib-20150713.pom similarity index 100% rename from bundleplugin/src/repo/biz/aQute/bnd/biz.aQute.bndlib/20150713/biz.aQute.bndlib-20150713.pom rename to tools/maven-bundle-plugin/src/repo/biz/aQute/bnd/biz.aQute.bndlib/20150713/biz.aQute.bndlib-20150713.pom
diff --git a/bundleplugin/src/site/apt/index.apt b/tools/maven-bundle-plugin/src/site/apt/index.apt similarity index 100% rename from bundleplugin/src/site/apt/index.apt rename to tools/maven-bundle-plugin/src/site/apt/index.apt
diff --git a/bundleplugin/src/site/site.xml b/tools/maven-bundle-plugin/src/site/site.xml similarity index 100% rename from bundleplugin/src/site/site.xml rename to tools/maven-bundle-plugin/src/site/site.xml
diff --git a/bundleplugin/src/test/java/org/apache/felix/bundleplugin/AbstractBundlePluginTest.java b/tools/maven-bundle-plugin/src/test/java/org/apache/felix/bundleplugin/AbstractBundlePluginTest.java similarity index 100% rename from bundleplugin/src/test/java/org/apache/felix/bundleplugin/AbstractBundlePluginTest.java rename to tools/maven-bundle-plugin/src/test/java/org/apache/felix/bundleplugin/AbstractBundlePluginTest.java
diff --git a/bundleplugin/src/test/java/org/apache/felix/bundleplugin/ArtifactStubFactory.java b/tools/maven-bundle-plugin/src/test/java/org/apache/felix/bundleplugin/ArtifactStubFactory.java similarity index 100% rename from bundleplugin/src/test/java/org/apache/felix/bundleplugin/ArtifactStubFactory.java rename to tools/maven-bundle-plugin/src/test/java/org/apache/felix/bundleplugin/ArtifactStubFactory.java
diff --git a/bundleplugin/src/test/java/org/apache/felix/bundleplugin/BlueprintComponentTest.java b/tools/maven-bundle-plugin/src/test/java/org/apache/felix/bundleplugin/BlueprintComponentTest.java similarity index 100% rename from bundleplugin/src/test/java/org/apache/felix/bundleplugin/BlueprintComponentTest.java rename to tools/maven-bundle-plugin/src/test/java/org/apache/felix/bundleplugin/BlueprintComponentTest.java
diff --git a/bundleplugin/src/test/java/org/apache/felix/bundleplugin/BundleAllPluginTest.java b/tools/maven-bundle-plugin/src/test/java/org/apache/felix/bundleplugin/BundleAllPluginTest.java similarity index 100% rename from bundleplugin/src/test/java/org/apache/felix/bundleplugin/BundleAllPluginTest.java rename to tools/maven-bundle-plugin/src/test/java/org/apache/felix/bundleplugin/BundleAllPluginTest.java
diff --git a/bundleplugin/src/test/java/org/apache/felix/bundleplugin/BundlePluginTest.java b/tools/maven-bundle-plugin/src/test/java/org/apache/felix/bundleplugin/BundlePluginTest.java similarity index 100% rename from bundleplugin/src/test/java/org/apache/felix/bundleplugin/BundlePluginTest.java rename to tools/maven-bundle-plugin/src/test/java/org/apache/felix/bundleplugin/BundlePluginTest.java
diff --git a/bundleplugin/src/test/java/org/apache/felix/bundleplugin/ManifestWriterTest.java b/tools/maven-bundle-plugin/src/test/java/org/apache/felix/bundleplugin/ManifestWriterTest.java similarity index 100% rename from bundleplugin/src/test/java/org/apache/felix/bundleplugin/ManifestWriterTest.java rename to tools/maven-bundle-plugin/src/test/java/org/apache/felix/bundleplugin/ManifestWriterTest.java
diff --git a/bundleplugin/src/test/java/org/apache/felix/bundleplugin/packageinfo b/tools/maven-bundle-plugin/src/test/java/org/apache/felix/bundleplugin/packageinfo similarity index 100% rename from bundleplugin/src/test/java/org/apache/felix/bundleplugin/packageinfo rename to tools/maven-bundle-plugin/src/test/java/org/apache/felix/bundleplugin/packageinfo
diff --git a/bundleplugin/src/test/java/org/apache/maven/shared/osgi/Maven2OsgiConverterTest.java b/tools/maven-bundle-plugin/src/test/java/org/apache/maven/shared/osgi/Maven2OsgiConverterTest.java similarity index 100% rename from bundleplugin/src/test/java/org/apache/maven/shared/osgi/Maven2OsgiConverterTest.java rename to tools/maven-bundle-plugin/src/test/java/org/apache/maven/shared/osgi/Maven2OsgiConverterTest.java
diff --git a/bundleplugin/src/test/resources/OSGI-INF/blueprint/bp.xml b/tools/maven-bundle-plugin/src/test/resources/OSGI-INF/blueprint/bp.xml similarity index 100% rename from bundleplugin/src/test/resources/OSGI-INF/blueprint/bp.xml rename to tools/maven-bundle-plugin/src/test/resources/OSGI-INF/blueprint/bp.xml
diff --git a/bundleplugin/src/test/resources/aopalliance-1.0.jar b/tools/maven-bundle-plugin/src/test/resources/aopalliance-1.0.jar similarity index 100% rename from bundleplugin/src/test/resources/aopalliance-1.0.jar rename to tools/maven-bundle-plugin/src/test/resources/aopalliance-1.0.jar Binary files differ
diff --git a/bundleplugin/src/test/resources/commons-logging-1.1.jar b/tools/maven-bundle-plugin/src/test/resources/commons-logging-1.1.jar similarity index 100% rename from bundleplugin/src/test/resources/commons-logging-1.1.jar rename to tools/maven-bundle-plugin/src/test/resources/commons-logging-1.1.jar Binary files differ
diff --git a/bundleplugin/src/test/resources/junit-3.8.2.jar b/tools/maven-bundle-plugin/src/test/resources/junit-3.8.2.jar similarity index 100% rename from bundleplugin/src/test/resources/junit-3.8.2.jar rename to tools/maven-bundle-plugin/src/test/resources/junit-3.8.2.jar Binary files differ
diff --git a/bundleplugin/src/test/resources/org.apache.maven.maven-model_2.1.0.SNAPSHOT.jar b/tools/maven-bundle-plugin/src/test/resources/org.apache.maven.maven-model_2.1.0.SNAPSHOT.jar similarity index 100% rename from bundleplugin/src/test/resources/org.apache.maven.maven-model_2.1.0.SNAPSHOT.jar rename to tools/maven-bundle-plugin/src/test/resources/org.apache.maven.maven-model_2.1.0.SNAPSHOT.jar Binary files differ
diff --git a/bundleplugin/src/test/resources/test-1.jar b/tools/maven-bundle-plugin/src/test/resources/test-1.jar similarity index 100% rename from bundleplugin/src/test/resources/test-1.jar rename to tools/maven-bundle-plugin/src/test/resources/test-1.jar Binary files differ
diff --git a/bundleplugin/src/test/resources/test.mf b/tools/maven-bundle-plugin/src/test/resources/test.mf similarity index 100% rename from bundleplugin/src/test/resources/test.mf rename to tools/maven-bundle-plugin/src/test/resources/test.mf
diff --git a/bundleplugin/src/test/resources/test2.mf b/tools/maven-bundle-plugin/src/test/resources/test2.mf similarity index 100% rename from bundleplugin/src/test/resources/test2.mf rename to tools/maven-bundle-plugin/src/test/resources/test2.mf
diff --git a/bundleplugin/src/test/resources/xercesImpl-2.6.2.jar b/tools/maven-bundle-plugin/src/test/resources/xercesImpl-2.6.2.jar similarity index 100% rename from bundleplugin/src/test/resources/xercesImpl-2.6.2.jar rename to tools/maven-bundle-plugin/src/test/resources/xercesImpl-2.6.2.jar Binary files differ
diff --git a/bundleplugin/src/test/resources/xml-apis-1.0.b2.jar b/tools/maven-bundle-plugin/src/test/resources/xml-apis-1.0.b2.jar similarity index 100% rename from bundleplugin/src/test/resources/xml-apis-1.0.b2.jar rename to tools/maven-bundle-plugin/src/test/resources/xml-apis-1.0.b2.jar Binary files differ
diff --git a/bundleplugin/upgrade_local_poms.sh b/tools/maven-bundle-plugin/upgrade_local_poms.sh similarity index 100% rename from bundleplugin/upgrade_local_poms.sh rename to tools/maven-bundle-plugin/upgrade_local_poms.sh