You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2016/03/04 15:29:57 UTC

karaf git commit: [KARAF-4129] Installing a feature with a fragment that attaches to pax-logging-api fails

Repository: karaf
Updated Branches:
  refs/heads/master 2031ca365 -> 5c9f502a9


[KARAF-4129] Installing a feature with a fragment that attaches to pax-logging-api fails


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/5c9f502a
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/5c9f502a
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/5c9f502a

Branch: refs/heads/master
Commit: 5c9f502a917cf0d1d79ee91b818925ae154a0854
Parents: 2031ca3
Author: Guillaume Nodet <gn...@apache.org>
Authored: Fri Mar 4 15:29:17 2016 +0100
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Fri Mar 4 15:29:43 2016 +0100

----------------------------------------------------------------------
 assemblies/apache-karaf-minimal/pom.xml | 8 ++++++++
 assemblies/apache-karaf/pom.xml         | 8 ++++++++
 pom.xml                                 | 7 +++++++
 3 files changed, 23 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/5c9f502a/assemblies/apache-karaf-minimal/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/apache-karaf-minimal/pom.xml b/assemblies/apache-karaf-minimal/pom.xml
index 1368acc..93b021b 100644
--- a/assemblies/apache-karaf-minimal/pom.xml
+++ b/assemblies/apache-karaf-minimal/pom.xml
@@ -45,6 +45,13 @@
         </dependency>
         <dependency>
             <groupId>org.apache.karaf.features</groupId>
+            <artifactId>framework</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
             <artifactId>standard</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
@@ -115,6 +122,7 @@
                         <feature>wrapper</feature>
                     </installedFeatures>
                     <bootFeatures>
+                        <feature>framework</feature>
                         <feature>jaas</feature>
                         <feature>shell</feature>
                         <feature>feature</feature>

http://git-wip-us.apache.org/repos/asf/karaf/blob/5c9f502a/assemblies/apache-karaf/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/apache-karaf/pom.xml b/assemblies/apache-karaf/pom.xml
index 1196eba..707d79f 100644
--- a/assemblies/apache-karaf/pom.xml
+++ b/assemblies/apache-karaf/pom.xml
@@ -45,6 +45,13 @@
         </dependency>
         <dependency>
             <groupId>org.apache.karaf.features</groupId>
+            <artifactId>framework</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
             <artifactId>standard</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
@@ -162,6 +169,7 @@
                         <feature>eventadmin</feature>
                     </startupFeatures>
                     <bootFeatures>
+                        <feature>framework</feature>
                         <feature>wrap</feature>
                         <feature>aries-blueprint</feature>
                         <feature>shell</feature>

http://git-wip-us.apache.org/repos/asf/karaf/blob/5c9f502a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a2fde7d..c9df720 100644
--- a/pom.xml
+++ b/pom.xml
@@ -821,6 +821,13 @@
             </dependency>
             <dependency>
               <groupId>org.apache.karaf.features</groupId>
+              <artifactId>framework</artifactId>
+              <classifier>features</classifier>
+              <type>xml</type>
+              <version>${project.version}</version>
+            </dependency>
+            <dependency>
+              <groupId>org.apache.karaf.features</groupId>
               <artifactId>static</artifactId>
               <type>kar</type>
               <version>${project.version}</version>