You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by dj...@apache.org on 2011/03/22 23:01:51 UTC
svn commit: r1084373 - in /karaf/trunk: ./ admin/core/ assemblies/features/
assemblies/features/framework/
assemblies/features/framework/src/main/feature/ client/ deployer/kar/
features/core/ jaas/command/ jaas/modules/ shell/commands/ shell/console/
s...
Author: djencks
Date: Tue Mar 22 22:01:50 2011
New Revision: 1084373
URL: http://svn.apache.org/viewvc?rev=1084373&view=rev
Log:
KARAF-510 mark dependencies provided and use exclusions to make maven dependency tree match what we want to include in karaf
Added:
karaf/trunk/assemblies/features/framework/src/main/feature/
karaf/trunk/assemblies/features/framework/src/main/feature/feature.xml (with props)
Modified:
karaf/trunk/admin/core/pom.xml
karaf/trunk/assemblies/features/framework/pom.xml
karaf/trunk/assemblies/features/pom.xml
karaf/trunk/client/pom.xml
karaf/trunk/deployer/kar/pom.xml
karaf/trunk/features/core/pom.xml
karaf/trunk/jaas/command/pom.xml
karaf/trunk/jaas/modules/pom.xml
karaf/trunk/pom.xml
karaf/trunk/shell/commands/pom.xml
karaf/trunk/shell/console/pom.xml
karaf/trunk/shell/dev/pom.xml
karaf/trunk/shell/osgi/pom.xml
karaf/trunk/shell/ssh/pom.xml
karaf/trunk/webconsole/admin/pom.xml
karaf/trunk/webconsole/features/pom.xml
karaf/trunk/webconsole/gogo/pom.xml
Modified: karaf/trunk/admin/core/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/admin/core/pom.xml?rev=1084373&r1=1084372&r2=1084373&view=diff
==============================================================================
--- karaf/trunk/admin/core/pom.xml (original)
+++ karaf/trunk/admin/core/pom.xml Tue Mar 22 22:01:50 2011
@@ -50,6 +50,12 @@
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.bundlerepository</artifactId>
</dependency>
Modified: karaf/trunk/assemblies/features/framework/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/pom.xml?rev=1084373&r1=1084372&r2=1084373&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/pom.xml (original)
+++ karaf/trunk/assemblies/features/framework/pom.xml Tue Mar 22 22:01:50 2011
@@ -40,16 +40,65 @@
<dependency>
<groupId>org.apache.karaf</groupId>
<artifactId>org.apache.karaf.main</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.karaf</groupId>
<artifactId>org.apache.karaf.exception</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.karaf</groupId>
<artifactId>org.apache.karaf.client</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.apache.karaf.jaas</groupId>
+ <artifactId>org.apache.karaf.jaas.boot</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse</groupId>
+ <artifactId>osgi</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.framework</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <!-- ???? -->
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- listed in source feature.xml with explicit startlevel -->
+ <dependency>
+ <groupId>org.ops4j.pax.logging</groupId>
+ <artifactId>pax-logging-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.logging</groupId>
+ <artifactId>pax-logging-service</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.url</groupId>
+ <artifactId>pax-url-mvn</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.url</groupId>
+ <artifactId>pax-url-wrap</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+
+ <!-- to be added automatically to feature.xml -->
+ <dependency>
<groupId>org.apache.karaf.deployer</groupId>
<artifactId>org.apache.karaf.deployer.spring</artifactId>
</dependency>
@@ -151,10 +200,6 @@
</dependency>
<dependency>
<groupId>org.apache.karaf.jaas</groupId>
- <artifactId>org.apache.karaf.jaas.boot</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.karaf.jaas</groupId>
<artifactId>org.apache.karaf.jaas.config</artifactId>
</dependency>
<dependency>
@@ -182,10 +227,6 @@
<artifactId>mina-core</artifactId>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.configadmin</artifactId>
</dependency>
@@ -198,34 +239,10 @@
<artifactId>org.apache.felix.metatype</artifactId>
</dependency>
<dependency>
- <groupId>org.ops4j.pax.logging</groupId>
- <artifactId>pax-logging-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.logging</groupId>
- <artifactId>pax-logging-service</artifactId>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.url</groupId>
- <artifactId>pax-url-mvn</artifactId>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.url</groupId>
- <artifactId>pax-url-wrap</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-core</artifactId>
</dependency>
<dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>osgi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint</artifactId>
</dependency>
@@ -317,6 +334,24 @@
<outputDirectory>target/classes/resources/lib</outputDirectory>
<destFileName>karaf-jaas-boot.jar</destFileName>
</artifactItem>
+ <artifactItem>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.exception</artifactId>
+ <outputDirectory>target/classes/resources/lib/endorsed</outputDirectory>
+ <!--<destFileName>karaf-jaas-boot.jar</destFileName>-->
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.eclipse</groupId>
+ <artifactId>osgi</artifactId>
+ <outputDirectory>target/classes/resources/system/org/eclipse/osgi/${equinox.version}</outputDirectory>
+ <!--<destFileName>karaf-jaas-boot.jar</destFileName>-->
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.framework</artifactId>
+ <outputDirectory>target/classes/resources/system/org/apache/felix/org.apache.felix.framework/${felix.framework.version}</outputDirectory>
+ <!--<destFileName>karaf-jaas-boot.jar</destFileName>-->
+ </artifactItem>
</artifactItems>
</configuration>
</execution>
@@ -328,7 +363,11 @@
<version>${project.version}</version>
<!--<extensions>true</extensions>-->
<configuration>
- <repositoryPath>resources/system/</repositoryPath>
+ <startLevel>30</startLevel>
+ <checkDependencyChange>true</checkDependencyChange>
+ <overwriteChangedDependencies>true</overwriteChangedDependencies>
+ <warnOnDependencyChange>true</warnOnDependencyChange>
+ <!--<repositoryPath>resources/system/</repositoryPath>-->
</configuration>
<executions>
<execution>
Added: karaf/trunk/assemblies/features/framework/src/main/feature/feature.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/feature/feature.xml?rev=1084373&view=auto
==============================================================================
--- karaf/trunk/assemblies/features/framework/src/main/feature/feature.xml (added)
+++ karaf/trunk/assemblies/features/framework/src/main/feature/feature.xml Tue Mar 22 22:01:50 2011
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.0.0" name="<unnamed>">
+ <feature version="2.99.99-SNAPSHOT" name="karaf-framework">
+ <bundle dependency="false" start="true" start-level="5">mvn:org.ops4j.pax.url/pax-url-mvn/1.2.5</bundle>
+ <bundle dependency="false" start="true" start-level="5">mvn:org.ops4j.pax.url/pax-url-wrap/1.2.5</bundle>
+ <bundle dependency="false" start="true" start-level="8">mvn:org.ops4j.pax.logging/pax-logging-api/1.6.1</bundle>
+ <bundle dependency="false" start="true" start-level="8">mvn:org.ops4j.pax.logging/pax-logging-service/1.6.1</bundle>
+ <bundle dependency="false" start="true" start-level="10">mvn:org.apache.felix/org.apache.felix.configadmin/1.2.8</bundle>
+ <bundle dependency="false" start="true" start-level="11">mvn:org.apache.felix/org.apache.felix.fileinstall/3.1.10</bundle>
+ <bundle dependency="false" start="true" start-level="20">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.asm/3.3_1</bundle>
+ <bundle dependency="false" start="true" start-level="20">mvn:org.apache.aries/org.apache.aries.util/0.3</bundle>
+ <bundle dependency="false" start="true" start-level="20">mvn:org.apache.aries.proxy/org.apache.aries.proxy/0.3</bundle>
+ <bundle dependency="false" start="true" start-level="20">mvn:org.apache.aries.blueprint/org.apache.aries.blueprint/0.3</bundle>
+
+
+<!--
+ <bundle dependency="false" start="true" start-level="10">mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.spring/2.99.99-SNAPSHOT</bundle>
+ <bundle dependency="false" start="true" start-level="10">mvn:org.apache.karaf/org.apache.karaf.util/2.99.99-SNAPSHOT</bundle>
+ <bundle dependency="false" start="true" start-level="10">mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.blueprint/2.99.99-SNAPSHOT</bundle>
+ <bundle dependency="false" start="true" start-level="10">mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.features/2.99.99-SNAPSHOT</bundle>
+ <bundle dependency="false" start="true" start-level="10">mvn:org.apache.karaf.features/org.apache.karaf.features.core/2.99.99-SNAPSHOT</bundle>
+ <bundle dependency="false" start="true" start-level="10">mvn:org.apache.felix/org.apache.felix.bundlerepository/1.6.4</bundle>
+ <bundle dependency="false" start="true" start-level="10">mvn:org.apache.karaf.shell/org.apache.karaf.shell.console/2.99.99-SNAPSHOT</bundle>
+ <bundle dependency="false" start="true" start-level="10">mvn:org.apache.karaf.jaas/org.apache.karaf.jaas.modules/2.99.99-SNAPSHOT</bundle>
+ <bundle dependency="false" start="true" start-level="10">mvn:org.apache.karaf.jaas/org.apache.karaf.jaas.config/2.99.99-SNAPSHOT</bundle>
+ <bundle dependency="false" start="true" start-level="10">mvn:org.apache.felix/org.apache.felix.utils/1.1.0</bundle>
+ <bundle dependency="false" start="true" start-level="10">mvn:org.apache.karaf.shell/org.apache.karaf.shell.obr/2.99.99-SNAPSHOT</bundle>
+ <bundle dependency="false" start="true" start-level="10">mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.kar/2.99.99-SNAPSHOT</bundle>
+ <bundle dependency="false" start="true" start-level="10">mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.wrap/2.99.99-SNAPSHOT</bundle>
+ <bundle dependency="false" start="true" start-level="10">mvn:org.apache.karaf.features/org.apache.karaf.features.command/2.99.99-SNAPSHOT</bundle>
+ <bundle dependency="false" start="true" start-level="10">mvn:org.apache.karaf.features/org.apache.karaf.features.management/2.99.99-SNAPSHOT</bundle>
+ <bundle dependency="false" start="true" start-level="10">mvn:org.apache.karaf/org.apache.karaf.management/2.99.99-SNAPSHOT</bundle>
+ <bundle dependency="false" start="true" start-level="10">mvn:org.apache.karaf.features/org.apache.karaf.features.obr/2.99.99-SNAPSHOT</bundle>
+ <bundle dependency="false" start="true" start-level="10">mvn:org.apache.karaf.diagnostic/org.apache.karaf.diagnostic.core/2.99.99-SNAPSHOT</bundle>
+ <bundle dependency="false" start="true" start-level="10">mvn:org.apache.karaf.diagnostic/org.apache.karaf.diagnostic.common/2.99.99-SNAPSHOT</bundle>
+ <bundle dependency="false" start="true" start-level="10">mvn:org.apache.karaf.diagnostic/org.apache.karaf.diagnostic.command/2.99.99-SNAPSHOT</bundle>
+ <bundle dependency="false" start="true" start-level="10">mvn:org.apache.karaf.diagnostic/org.apache.karaf.diagnostic.management/2.99.99-SNAPSHOT</bundle>
+ <bundle dependency="false" start="true" start-level="10">mvn:org.apache.karaf.admin/org.apache.karaf.admin.core/2.99.99-SNAPSHOT</bundle>
+ <bundle dependency="false" start="true" start-level="10">mvn:org.apache.karaf.admin/org.apache.karaf.admin.command/2.99.99-SNAPSHOT</bundle>
+ <bundle dependency="false" start="true" start-level="10">mvn:org.apache.karaf.admin/org.apache.karaf.admin.management/2.99.99-SNAPSHOT</bundle>
+ <bundle dependency="false" start="true" start-level="10">mvn:org.apache.karaf.shell/org.apache.karaf.shell.osgi/2.99.99-SNAPSHOT</bundle>
+ <bundle dependency="false" start="true" start-level="10">mvn:org.apache.karaf.shell/org.apache.karaf.shell.log/2.99.99-SNAPSHOT</bundle>
+ <bundle dependency="false" start="true" start-level="10">mvn:org.apache.karaf.shell/org.apache.karaf.shell.config/2.99.99-SNAPSHOT</bundle>
+ <bundle dependency="false" start="true" start-level="10">mvn:org.apache.karaf.shell/org.apache.karaf.shell.packages/2.99.99-SNAPSHOT</bundle>
+ <bundle dependency="false" start="true" start-level="10">mvn:org.apache.karaf.shell/org.apache.karaf.shell.commands/2.99.99-SNAPSHOT</bundle>
+ <bundle dependency="false" start="true" start-level="10">mvn:org.apache.felix/org.apache.felix.gogo.runtime/0.6.1</bundle>
+ <bundle dependency="false" start="true" start-level="10">mvn:org.apache.karaf.shell/org.apache.karaf.shell.ssh/2.99.99-SNAPSHOT</bundle>
+ <bundle dependency="false" start="true" start-level="10">mvn:org.apache.sshd/sshd-core/0.5.0</bundle>
+ <bundle dependency="false" start="true" start-level="10">mvn:org.apache.mina/mina-core/2.0.1</bundle>
+ <bundle dependency="false" start="true" start-level="10">mvn:org.apache.karaf.shell/org.apache.karaf.shell.dev/2.99.99-SNAPSHOT</bundle>
+ <bundle dependency="false" start="true" start-level="10">mvn:org.apache.karaf.jaas/org.apache.karaf.jaas.command/2.99.99-SNAPSHOT</bundle>
+ <bundle dependency="false" start="true" start-level="10">mvn:org.apache.karaf.jaas/org.apache.karaf.jaas.boot/2.99.99-SNAPSHOT</bundle>
+ <bundle dependency="false" start="true" start-level="10">mvn:org.apache.felix/org.apache.felix.eventadmin/1.2.10</bundle>
+ <bundle dependency="false" start="true" start-level="10">mvn:org.apache.felix/org.apache.felix.metatype/1.0.4</bundle>
+ <bundle dependency="false" start="true" start-level="10">mvn:org.apache.aries.jmx/org.apache.aries.jmx/0.3</bundle>
+ <bundle dependency="false" start="true" start-level="10">mvn:org.apache.aries.jmx/org.apache.aries.jmx.blueprint/0.3</bundle>
+-->
+ </feature>
+</features>
Propchange: karaf/trunk/assemblies/features/framework/src/main/feature/feature.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: karaf/trunk/assemblies/features/framework/src/main/feature/feature.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: karaf/trunk/assemblies/features/framework/src/main/feature/feature.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: karaf/trunk/assemblies/features/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/pom.xml?rev=1084373&r1=1084372&r2=1084373&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/pom.xml (original)
+++ karaf/trunk/assemblies/features/pom.xml Tue Mar 22 22:01:50 2011
@@ -33,18 +33,9 @@
<name>Apache Karaf :: Assemblies :: Features</name>
<modules>
+ <module>framework</module>
<module>standard</module>
<module>enterprise</module>
- <module>framework</module>
</modules>
- <profiles>
- <profile>
- <id>full</id>
- <modules>
- <module>framework</module>
- </modules>
- </profile>
- </profiles>
-
</project>
\ No newline at end of file
Modified: karaf/trunk/client/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/client/pom.xml?rev=1084373&r1=1084372&r2=1084373&view=diff
==============================================================================
--- karaf/trunk/client/pom.xml (original)
+++ karaf/trunk/client/pom.xml Tue Mar 22 22:01:50 2011
@@ -48,10 +48,12 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
+ <scope>provided</scope>
</dependency>
</dependencies>
Modified: karaf/trunk/deployer/kar/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/deployer/kar/pom.xml?rev=1084373&r1=1084372&r2=1084373&view=diff
==============================================================================
--- karaf/trunk/deployer/kar/pom.xml (original)
+++ karaf/trunk/deployer/kar/pom.xml Tue Mar 22 22:01:50 2011
@@ -49,6 +49,12 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.karaf.features</groupId>
<artifactId>org.apache.karaf.features.core</artifactId>
</dependency>
Modified: karaf/trunk/features/core/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/features/core/pom.xml?rev=1084373&r1=1084372&r2=1084373&view=diff
==============================================================================
--- karaf/trunk/features/core/pom.xml (original)
+++ karaf/trunk/features/core/pom.xml Tue Mar 22 22:01:50 2011
@@ -55,6 +55,11 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.bundlerepository</artifactId>
</dependency>
Modified: karaf/trunk/jaas/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/command/pom.xml?rev=1084373&r1=1084372&r2=1084373&view=diff
==============================================================================
--- karaf/trunk/jaas/command/pom.xml (original)
+++ karaf/trunk/jaas/command/pom.xml Tue Mar 22 22:01:50 2011
@@ -46,6 +46,7 @@
<groupId>org.apache.karaf.jaas</groupId>
<artifactId>org.apache.karaf.jaas.boot</artifactId>
<version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.karaf.jaas</groupId>
Modified: karaf/trunk/jaas/modules/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/modules/pom.xml?rev=1084373&r1=1084372&r2=1084373&view=diff
==============================================================================
--- karaf/trunk/jaas/modules/pom.xml (original)
+++ karaf/trunk/jaas/modules/pom.xml Tue Mar 22 22:01:50 2011
@@ -44,6 +44,7 @@
<dependency>
<groupId>org.apache.karaf.jaas</groupId>
<artifactId>org.apache.karaf.jaas.boot</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
Modified: karaf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1084373&r1=1084372&r2=1084373&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Tue Mar 22 22:01:50 2011
@@ -531,6 +531,14 @@
<groupId>net.sf.kxml</groupId>
<artifactId>kxml2</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -546,6 +554,10 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.compendium</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>net.sf.kxml</groupId>
+ <artifactId>kxml2</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -577,12 +589,30 @@
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.eventadmin</artifactId>
<version>${felix.eventadmin.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>concurrent</groupId>
+ <artifactId>concurrent</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -781,6 +811,10 @@
<groupId>org.easymock</groupId>
<artifactId>easymockclassextension</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -893,12 +927,34 @@
<groupId>org.apache.felix</groupId>
<artifactId>javax.servlet</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.aries.testsupport</groupId>
+ <artifactId>org.apache.aries.testsupport.unit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.aries.proxy</groupId>
+ <artifactId>org.apache.aries.proxy.api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.aries.proxy</groupId>
<artifactId>org.apache.aries.proxy</artifactId>
<version>${aries.proxy.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.aries.proxy</groupId>
+ <artifactId>org.apache.aries.proxy.api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.aries.proxy</groupId>
+ <artifactId>org.apache.aries.proxy.impl</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.aries</groupId>
@@ -914,6 +970,12 @@
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.blueprint</artifactId>
<version>${aries.jmx.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.aries.jndi</groupId>
Modified: karaf/trunk/shell/commands/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/commands/pom.xml?rev=1084373&r1=1084372&r2=1084373&view=diff
==============================================================================
--- karaf/trunk/shell/commands/pom.xml (original)
+++ karaf/trunk/shell/commands/pom.xml Tue Mar 22 22:01:50 2011
@@ -44,6 +44,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.gogo.runtime</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.karaf</groupId>
@@ -61,6 +62,11 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<scope>test</scope>
</dependency>
Modified: karaf/trunk/shell/console/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/pom.xml?rev=1084373&r1=1084372&r2=1084373&view=diff
==============================================================================
--- karaf/trunk/shell/console/pom.xml (original)
+++ karaf/trunk/shell/console/pom.xml Tue Mar 22 22:01:50 2011
@@ -61,10 +61,12 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.karaf.jaas</groupId>
Modified: karaf/trunk/shell/dev/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/dev/pom.xml?rev=1084373&r1=1084372&r2=1084373&view=diff
==============================================================================
--- karaf/trunk/shell/dev/pom.xml (original)
+++ karaf/trunk/shell/dev/pom.xml Tue Mar 22 22:01:50 2011
@@ -68,6 +68,12 @@
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.utils</artifactId>
<scope>provided</scope>
Modified: karaf/trunk/shell/osgi/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/osgi/pom.xml?rev=1084373&r1=1084372&r2=1084373&view=diff
==============================================================================
--- karaf/trunk/shell/osgi/pom.xml (original)
+++ karaf/trunk/shell/osgi/pom.xml Tue Mar 22 22:01:50 2011
@@ -52,6 +52,11 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.utils</artifactId>
<scope>provided</scope>
Modified: karaf/trunk/shell/ssh/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/ssh/pom.xml?rev=1084373&r1=1084372&r2=1084373&view=diff
==============================================================================
--- karaf/trunk/shell/ssh/pom.xml (original)
+++ karaf/trunk/shell/ssh/pom.xml Tue Mar 22 22:01:50 2011
@@ -55,6 +55,12 @@
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.junit</artifactId>
<scope>test</scope>
Modified: karaf/trunk/webconsole/admin/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/admin/pom.xml?rev=1084373&r1=1084372&r2=1084373&view=diff
==============================================================================
--- karaf/trunk/webconsole/admin/pom.xml (original)
+++ karaf/trunk/webconsole/admin/pom.xml Tue Mar 22 22:01:50 2011
@@ -48,6 +48,11 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.webconsole</artifactId>
<scope>provided</scope>
@@ -60,7 +65,6 @@
<dependency>
<groupId>org.apache.karaf.admin</groupId>
<artifactId>org.apache.karaf.admin.core</artifactId>
- <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: karaf/trunk/webconsole/features/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/features/pom.xml?rev=1084373&r1=1084372&r2=1084373&view=diff
==============================================================================
--- karaf/trunk/webconsole/features/pom.xml (original)
+++ karaf/trunk/webconsole/features/pom.xml Tue Mar 22 22:01:50 2011
@@ -48,6 +48,11 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.webconsole</artifactId>
<scope>provided</scope>
Modified: karaf/trunk/webconsole/gogo/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/gogo/pom.xml?rev=1084373&r1=1084372&r2=1084373&view=diff
==============================================================================
--- karaf/trunk/webconsole/gogo/pom.xml (original)
+++ karaf/trunk/webconsole/gogo/pom.xml Tue Mar 22 22:01:50 2011
@@ -48,6 +48,11 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.webconsole</artifactId>
<scope>provided</scope>