This is an automated email from the ASF dual-hosted git repository.

jcabrerizo pushed a commit to branch feature/bump-karaf
in repository https://gitbox.apache.org/repos/asf/brooklyn-dist.git

commit 544655a11431ec7a4ce6ad005bf6cf5b729282d8
Author: Juan Cabrerizo <j...@cloudsoft.io>
AuthorDate: Mon Dec 14 11:05:39 2020 +0000

    WIP compiling bit not starting
---
 karaf/features/src/main/feature/feature.xml | 3 +++
 karaf/itest/pom.xml                         | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/karaf/features/src/main/feature/feature.xml 
b/karaf/features/src/main/feature/feature.xml
index 07d2ed5..f59d4dc 100644
--- a/karaf/features/src/main/feature/feature.xml
+++ b/karaf/features/src/main/feature/feature.xml
@@ -53,6 +53,9 @@
     </feature>
 
     <feature name="brooklyn-startup-features" version="${project.version}" 
description="Bundles to add to startup.properties">
+        <!--        <bundle 
dependency="true">mvn:org.apache.servicemix.specs.activation-api-1.1</bundle>-->
+<!--        <bundle 
dependency="true">mvn:org.apache.servicemix.specs.activation-api-1.1/2.9.0</bundle>-->
+        <bundle 
dependency='true'>wrap:mvn:javax.activation/activation/1.1</bundle>
         <!-- Register javax.mail along with pax-logging-service so it doesn't 
get refreshed later -->
         <bundle>mvn:javax.mail/mail/${javax.mail.version}</bundle>
     </feature>
diff --git a/karaf/itest/pom.xml b/karaf/itest/pom.xml
index 3564bd6..cbdfe28 100644
--- a/karaf/itest/pom.xml
+++ b/karaf/itest/pom.xml
@@ -111,7 +111,7 @@
 
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
+            <artifactId>osgi.core</artifactId>
             <version>${org.osgi.core.version}</version>
             <scope>provided</scope>
         </dependency>

Reply via email to