[BROOKLYN-183] Fix OSGi imports for brooklyn-camp New unrelated code added an unwanted dependency towards jython, that causes the karaf assembly to break. Ignoring this dependency for now, until winrm work and its jython dependency gets isolated in a proper bundle.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/f86e2da0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/f86e2da0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/f86e2da0 Branch: refs/heads/master Commit: f86e2da0ce5ce5c02c65119aa9d29e9cd7176775 Parents: 74d890d Author: Ciprian Ciubotariu <[email protected]> Authored: Mon Nov 23 18:35:13 2015 +0200 Committer: Ciprian Ciubotariu <[email protected]> Committed: Mon Nov 23 18:42:28 2015 +0200 ---------------------------------------------------------------------- usage/camp/pom.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f86e2da0/usage/camp/pom.xml ---------------------------------------------------------------------- diff --git a/usage/camp/pom.xml b/usage/camp/pom.xml index 35ceca2..d04eef6 100644 --- a/usage/camp/pom.xml +++ b/usage/camp/pom.xml @@ -186,6 +186,23 @@ <build> <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <configuration> + <supportedProjectTypes> + <supportedProjectType>jar</supportedProjectType> + </supportedProjectTypes> + <instructions> + <Export-Package>org.apache.brooklyn.*</Export-Package> + <Import-Package> + !org.python.google.common.collect + * + </Import-Package> + </instructions> + </configuration> + </plugin> + <!-- if you want to build a WAR, full or skinny: <plugin> <groupId>org.apache.maven.plugins</groupId>
