You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by sv...@apache.org on 2017/03/07 21:10:17 UTC
[5/6] brooklyn-server git commit: core/pom.xml: karaf
import/export-package comments
core/pom.xml: karaf import/export-package comments
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/07e1bc82
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/07e1bc82
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/07e1bc82
Branch: refs/heads/master
Commit: 07e1bc82deaafcb62116bc0407e97239b36f42ab
Parents: 438e745
Author: Aled Sage <al...@gmail.com>
Authored: Tue Jan 31 16:32:51 2017 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Fri Feb 3 20:57:14 2017 +0000
----------------------------------------------------------------------
core/pom.xml | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/07e1bc82/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 71f911e..7719aa6 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -292,11 +292,17 @@
<supportedProjectType>jar</supportedProjectType>
</supportedProjectTypes>
<instructions>
+ <!--
+ Requires an explicit "Export-Package" because otherwise the packages with "internal"
+ in the name will not be exported.
+ -->
<Export-Package>brooklyn.*,org.apache.brooklyn.*</Export-Package>
<!--
- org.apache.brooklyn.rt.felix and org.apache.felix.framework are not used by code paths when working in Karaf
- javax.annotation;version=[1.2,2) is needed to force wiring the Brooklyn class space to javax.annotation-api.
- Avoids rewiring down the line when brooklyn-rest-resources is loaded.
+ The excluded imports are for things used only for brooklyn-classic, rather than in karaf.
+ Without the explicit javax.annotation version range, it binds to 1.1 and then rewires when
+ jclouds bundles are added (even though we have explicitly added the java.annotation-api:1.2.0 bundle).
+ This is because bundle org.apache.felix.framework exports the package javax.annotation;version=1.0.0,
+ so we bind to that.
-->
<Import-Package>
!org.apache.brooklyn.rt.felix,