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 46577f4dd2f236620ba7078707bf4f40e218b5ff Author: Alex Heneveld <[email protected]> AuthorDate: Thu Jan 6 18:03:48 2022 +0000 slight rejigging of features add jakarta.mail, bouncycastle jdk5on main --- karaf/features/src/main/feature/feature.xml | 18 +++++++++++------- pom.xml | 1 + 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/karaf/features/src/main/feature/feature.xml b/karaf/features/src/main/feature/feature.xml index cb16631..6e59733 100644 --- a/karaf/features/src/main/feature/feature.xml +++ b/karaf/features/src/main/feature/feature.xml @@ -61,6 +61,7 @@ <feature prerequisite="true">wrap</feature> + <bundle>mvn:org.bouncycastle/bcutil-jdk15on/${bouncycastle.version}</bundle> <bundle>mvn:org.bouncycastle/bcprov-ext-jdk15on/${bouncycastle.version}</bundle> <bundle>mvn:org.bouncycastle/bcpkix-jdk15on/${bouncycastle.version}</bundle> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jzlib/${jzlib.version}</bundle> @@ -152,7 +153,8 @@ </feature> <feature name="brooklyn-core" version="${project.version}" description="Brooklyn Core"> - <feature>pax-jetty</feature> + <feature prerequisite="true">brooklyn-essential-deps</feature> + <feature>brooklyn-api</feature> <bundle>mvn:org.apache.brooklyn/brooklyn-core/${project.version}</bundle> @@ -225,12 +227,9 @@ --> <feature name="brooklyn-rest-resources-prereqs" version="${project.version}" description="Brooklyn REST Resources Prerequisites"> - <feature>brooklyn-core</feature> - <feature>brooklyn-rest-api</feature> - <feature>brooklyn-camp-brooklyn</feature> - <feature>brooklyn-camp-base</feature> - + <feature>pax-jetty</feature> <feature>cxf-jaxrs-with-optional-dependencies</feature> + <bundle dependency="true">mvn:org.apache.cxf/cxf-rt-rs-security-cors/${cxf.version}</bundle> <bundle dependency="true">mvn:org.apache.cxf/cxf-rt-frontend-jaxrs/${cxf.version}</bundle> <bundle dependency="true">mvn:org.apache.cxf.karaf/cxf-karaf-commands/${cxf.version}</bundle> @@ -244,12 +243,17 @@ <config name="org.apache.cxf.osgi"> org.apache.cxf.servlet.context = /v1 </config> + + <feature>brooklyn-core</feature> + <feature>brooklyn-rest-api</feature> + <feature>brooklyn-camp-brooklyn</feature> + <feature>brooklyn-camp-base</feature> </feature> <feature name="cxf-jaxrs-with-optional-dependencies" version="${project.version}" description="cxf-jaxrs with optional dependencies"> <feature>cxf-jaxrs</feature> - <!-- otherwise causes jackson-jaxrs-json-provider to be rewired when this optional dep is installed --> + <!-- do this here otherwise causes jackson-jaxrs-json-provider to be rewired when this optional dep is installed --> <bundle dependency="true" start-level="35">mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/${fasterxml.jackson.version}</bundle> </feature> diff --git a/pom.xml b/pom.xml index 86abc89..35a85f8 100644 --- a/pom.xml +++ b/pom.xml @@ -125,6 +125,7 @@ <jaxb-runtime.version>${jaxb-api.version}</jaxb-runtime.version> <!-- excluded --> <activator.servicemix.version>2.9.0</activator.servicemix.version> <jakarta.activation.version>1.2.2</jakarta.activation.version> + <jakarta.mail.version>1.6.5</jakarta.mail.version> <!-- used by karaf --> <!-- double-check downstream projects before changing jackson version --> <fasterxml.jackson.version>2.11.3</fasterxml.jackson.version> <cxf.version>3.4.1</cxf.version>
