This is an automated email from the ASF dual-hosted git repository. heneveld pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
commit b857f21b65db363578679404ecd7cf53955b0bdf Author: Alex Heneveld <[email protected]> AuthorDate: Tue Nov 9 17:27:12 2021 +0000 force all projects to use 1.2.0 or later of javax.annotation to prevent servicemix jsr305 jar from being used for that, while allowing it to provide meta, etc also remove repeated supportedProjectTypes --- api/pom.xml | 2 +- core/pom.xml | 3 --- parent/pom.xml | 12 +++++++++++- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index 48b2361..c3a67e4 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -70,5 +70,5 @@ <artifactId>geronimo-ws-metadata_2.0_spec</artifactId> </dependency> </dependencies> - + </project> diff --git a/core/pom.xml b/core/pom.xml index c03c64f..49dd7e1 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -298,9 +298,6 @@ <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> <configuration> - <supportedProjectTypes> - <supportedProjectType>jar</supportedProjectType> - </supportedProjectTypes> <instructions> <!-- Requires an explicit "Export-Package" because otherwise the packages with "internal" diff --git a/parent/pom.xml b/parent/pom.xml index 937e0d2..7f453db 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1480,7 +1480,17 @@ In time we should minimize our export lists to what is really needed. --> - <Export-Package>brooklyn.*,org.apache.brooklyn.*</Export-Package> + <Export-Package> + brooklyn.*, + org.apache.brooklyn.* + </Export-Package> + <!-- By default import automatically, but constrain some versions which confuse karaf at runtime --> + <Import-Package> + <!-- force this version to exclude servicemix which provides this at 1.1; but which we need as it provides others eg .meta --> + javax.annotation;version="[1.2,2)", + * + </Import-Package> + <Implementation-SHA-1>${buildNumber}</Implementation-SHA-1> <Implementation-Branch>${scmBranch}</Implementation-Branch> <Brooklyn-Catalog-Force-Remove-Bundles>*</Brooklyn-Catalog-Force-Remove-Bundles>
