use packaging jar instead of bundle, and bump maven-bundle-plugin version to match behaviour of server; checked changes in resulting JARs are negligible except for inclusion of extra brooklyn metadata (and this now does output the JARs)
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/109606fc Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/109606fc Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/109606fc Branch: refs/heads/master Commit: 109606fc2f883707e82d7af4f4648027814779ec Parents: f6b8808 Author: Alex Heneveld <alex.henev...@cloudsoftcorp.com> Authored: Fri Aug 3 12:30:06 2018 +0100 Committer: Alex Heneveld <alex.henev...@cloudsoftcorp.com> Committed: Fri Aug 3 12:30:06 2018 +0100 ---------------------------------------------------------------------- modularity-server/external-modules/pom.xml | 2 +- modularity-server/metadata-registry/pom.xml | 2 +- modularity-server/module-api/pom.xml | 2 +- modularity-server/module-registry/pom.xml | 2 +- modularity-server/proxy/pom.xml | 2 +- pom.xml | 6 ------ 6 files changed, 5 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/109606fc/modularity-server/external-modules/pom.xml ---------------------------------------------------------------------- diff --git a/modularity-server/external-modules/pom.xml b/modularity-server/external-modules/pom.xml index 1ca9927..fa3ecf6 100644 --- a/modularity-server/external-modules/pom.xml +++ b/modularity-server/external-modules/pom.xml @@ -30,7 +30,7 @@ <artifactId>brooklyn-ui-external-modules</artifactId> <name>Brooklyn UI :: Modularity Server :: External UI Modules Registration Hooks</name> - <packaging>bundle</packaging> + <packaging>jar</packaging> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/109606fc/modularity-server/metadata-registry/pom.xml ---------------------------------------------------------------------- diff --git a/modularity-server/metadata-registry/pom.xml b/modularity-server/metadata-registry/pom.xml index 7005802..008f1a3 100644 --- a/modularity-server/metadata-registry/pom.xml +++ b/modularity-server/metadata-registry/pom.xml @@ -30,7 +30,7 @@ <artifactId>brooklyn-ui-metadata-registry</artifactId> <name>Brooklyn UI :: Modularity Server :: UI Metadata Registry</name> - <packaging>bundle</packaging> + <packaging>jar</packaging> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/109606fc/modularity-server/module-api/pom.xml ---------------------------------------------------------------------- diff --git a/modularity-server/module-api/pom.xml b/modularity-server/module-api/pom.xml index 5ae263c..a68286a 100644 --- a/modularity-server/module-api/pom.xml +++ b/modularity-server/module-api/pom.xml @@ -30,7 +30,7 @@ <artifactId>brooklyn-ui-module-api</artifactId> <name>Brooklyn UI :: Modularity Server :: UI Module API</name> - <packaging>bundle</packaging> + <packaging>jar</packaging> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/109606fc/modularity-server/module-registry/pom.xml ---------------------------------------------------------------------- diff --git a/modularity-server/module-registry/pom.xml b/modularity-server/module-registry/pom.xml index 58857e2..c5ff577 100644 --- a/modularity-server/module-registry/pom.xml +++ b/modularity-server/module-registry/pom.xml @@ -30,7 +30,7 @@ <artifactId>brooklyn-ui-module-registry</artifactId> <name>Brooklyn UI :: Modularity Server :: UI Module Registry</name> - <packaging>bundle</packaging> + <packaging>jar</packaging> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/109606fc/modularity-server/proxy/pom.xml ---------------------------------------------------------------------- diff --git a/modularity-server/proxy/pom.xml b/modularity-server/proxy/pom.xml index 111b323..76ff414 100644 --- a/modularity-server/proxy/pom.xml +++ b/modularity-server/proxy/pom.xml @@ -30,7 +30,7 @@ <artifactId>brooklyn-ui-proxy</artifactId> <name>Brooklyn UI :: Modularity Server :: UI Proxy</name> - <packaging>bundle</packaging> + <packaging>jar</packaging> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/109606fc/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 242cd77..257fbfa 100644 --- a/pom.xml +++ b/pom.xml @@ -93,7 +93,6 @@ <servlet-api.version>${javax-servlet.version}</servlet-api.version> <!-- build tools, versions not declared in brooklyn-server but they are here --> - <maven-bundle-plugin.version>3.0.1</maven-bundle-plugin.version> <build-helper-maven-plugin.version>1.10</build-helper-maven-plugin.version> <maven-clean-plugin.version>3.0.0</maven-clean-plugin.version> <maven-compiler-plugin.version>3.5.1</maven-compiler-plugin.version> @@ -112,11 +111,6 @@ <pluginManagement> <plugins> <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <version>${maven-bundle-plugin.version}</version> - </plugin> - <plugin> <groupId>org.apache.karaf.tooling</groupId> <artifactId>karaf-maven-plugin</artifactId> <version>${karaf.version}</version>
