You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2012/01/30 16:07:08 UTC
svn commit: r1237700 - /karaf/trunk/assemblies/features/framework/pom.xml
Author: jbonofre
Date: Mon Jan 30 15:07:08 2012
New Revision: 1237700
URL: http://svn.apache.org/viewvc?rev=1237700&view=rev
Log:
Exclude slf4j from the framework feature
Modified:
karaf/trunk/assemblies/features/framework/pom.xml
Modified: karaf/trunk/assemblies/features/framework/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/pom.xml?rev=1237700&r1=1237699&r2=1237700&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/pom.xml (original)
+++ karaf/trunk/assemblies/features/framework/pom.xml Mon Jan 30 15:07:08 2012
@@ -69,17 +69,17 @@
<artifactId>org.apache.felix.framework</artifactId>
<scope>runtime</scope>
</dependency>
- <!-- ???? -->
- <!--<dependency>-->
- <!--<groupId>org.bundles</groupId>-->
- <!--<artifactId>org.bundles.compendium</artifactId>-->
- <!--<scope>provided</scope>-->
- <!--</dependency>-->
<!-- listed in source feature.xml with explicit startlevel -->
<dependency>
<groupId>biz.aQute</groupId>
<artifactId>bndlib</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.ops4j.pax.logging</groupId>
@@ -101,49 +101,38 @@
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-maven-commons</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-wrap</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.ops4j.pax.swissbox</groupId>
<artifactId>pax-swissbox-bnd</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
-
- <!-- to be added automatically to feature.xml -->
- <!-- features.core needs to be started before start level 30 -->
- <!--<dependency>-->
- <!--<groupId>org.apache.karaf.features</groupId>-->
- <!--<artifactId>org.apache.karaf.features.core</artifactId>-->
- <!--</dependency>-->
-
<dependency>
<groupId>org.apache.karaf.features</groupId>
<artifactId>org.apache.karaf.features.command</artifactId>
</dependency>
- <!--<dependency>-->
- <!--<groupId>org.apache.karaf.features</groupId>-->
- <!--<artifactId>org.apache.karaf.features.management</artifactId>-->
- <!--</dependency>-->
- <!--<dependency>-->
- <!--<groupId>org.apache.karaf.diagnostic</groupId>-->
- <!--<artifactId>org.apache.karaf.diagnostic.core</artifactId>-->
- <!--</dependency>-->
- <!--<dependency>-->
- <!--<groupId>org.apache.karaf.diagnostic</groupId>-->
- <!--<artifactId>org.apache.karaf.diagnostic.common</artifactId>-->
- <!--</dependency>-->
- <!--<dependency>-->
- <!--<groupId>org.apache.karaf.diagnostic</groupId>-->
- <!--<artifactId>org.apache.karaf.diagnostic.command</artifactId>-->
- <!--</dependency>-->
- <!--<dependency>-->
- <!--<groupId>org.apache.karaf.diagnostic</groupId>-->
- <!--<artifactId>org.apache.karaf.diagnostic.management</artifactId>-->
- <!--</dependency>-->
+
<dependency>
<groupId>org.apache.karaf.shell</groupId>
<artifactId>org.apache.karaf.shell.console</artifactId>
@@ -164,34 +153,10 @@
<groupId>org.apache.karaf.system</groupId>
<artifactId>org.apache.karaf.system.commands</artifactId>
</dependency>
- <!--<dependency>-->
- <!--<groupId>org.apache.karaf.shell</groupId>-->
- <!--<artifactId>org.apache.karaf.shell.log</artifactId>-->
- <!--</dependency>-->
- <!--<dependency>-->
- <!--<groupId>org.apache.karaf.shell</groupId>-->
- <!--<artifactId>org.apache.karaf.shell.packages</artifactId>-->
- <!--</dependency>-->
<dependency>
<groupId>org.apache.karaf.shell</groupId>
<artifactId>org.apache.karaf.shell.commands</artifactId>
</dependency>
- <!--<dependency>-->
- <!--<groupId>org.apache.karaf.shell</groupId>-->
- <!--<artifactId>org.apache.karaf.shell.dev</artifactId>-->
- <!--</dependency>-->
- <!--<dependency>-->
- <!--<groupId>org.apache.karaf.jaas</groupId>-->
- <!--<artifactId>org.apache.karaf.jaas.config</artifactId>-->
- <!--</dependency>-->
- <!--<dependency>-->
- <!--<groupId>org.apache.karaf.jaas</groupId>-->
- <!--<artifactId>org.apache.karaf.jaas.modules</artifactId>-->
- <!--</dependency>-->
- <!--<dependency>-->
- <!--<groupId>org.apache.karaf.jaas</groupId>-->
- <!--<artifactId>org.apache.karaf.jaas.command</artifactId>-->
- <!--</dependency>-->
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.fileinstall</artifactId>
@@ -234,24 +199,13 @@
<artifactId>org.apache.servicemix.bundles.junit</artifactId>
<version>${junit3.bundle.version}</version>
</dependency>
- <!--
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.asm</artifactId>
- </dependency>
- -->
- <!--
- <dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>region</artifactId>
- <version>1.0.0.v20110506</version>
- </dependency>
- -->
+
<dependency>
<groupId>org.apache.karaf.region</groupId>
<artifactId>org.apache.karaf.region.core</artifactId>
</dependency>
</dependencies>
+
<build>
<resources>
<resource>