Author: djencks
Date: Tue Apr 5 07:08:36 2011
New Revision: 1088910
URL: http://svn.apache.org/viewvc?rev=1088910&view=rev
Log:
KARAF-510 fix provided scope of several dependencies to avoid including
dependencies that are already bundeled into karaf jars. Also make the bundles
in the framework kar match the minimal assembly (although including some
apparently missing jars)
Modified:
karaf/trunk/admin/core/pom.xml
karaf/trunk/assemblies/features/framework/pom.xml
karaf/trunk/assemblies/features/framework/src/main/feature/feature.xml
karaf/trunk/demos/branding/shell/pom.xml
karaf/trunk/deployer/spring/pom.xml
karaf/trunk/jaas/modules/pom.xml
karaf/trunk/shell/commands/pom.xml
karaf/trunk/shell/config/pom.xml
karaf/trunk/shell/dev/pom.xml
karaf/trunk/shell/osgi/pom.xml
karaf/trunk/webconsole/console/pom.xml
Modified: karaf/trunk/admin/core/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/admin/core/pom.xml?rev=1088910&r1=1088909&r2=1088910&view=diff
==============================================================================
--- karaf/trunk/admin/core/pom.xml (original)
+++ karaf/trunk/admin/core/pom.xml Tue Apr 5 07:08:36 2011
@@ -63,6 +63,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.utils</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
Modified: karaf/trunk/assemblies/features/framework/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/pom.xml?rev=1088910&r1=1088909&r2=1088910&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/pom.xml (original)
+++ karaf/trunk/assemblies/features/framework/pom.xml Tue Apr 5 07:08:36 2011
@@ -99,26 +99,6 @@
<!-- to be added automatically to feature.xml -->
<dependency>
- <groupId>org.apache.karaf.deployer</groupId>
- <artifactId>org.apache.karaf.deployer.spring</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.karaf.deployer</groupId>
- <artifactId>org.apache.karaf.deployer.blueprint</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.karaf.deployer</groupId>
- <artifactId>org.apache.karaf.deployer.features</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.karaf.deployer</groupId>
- <artifactId>org.apache.karaf.deployer.kar</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.karaf.deployer</groupId>
- <artifactId>org.apache.karaf.deployer.wrap</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.karaf.features</groupId>
<artifactId>org.apache.karaf.features.core</artifactId>
</dependency>
@@ -131,10 +111,6 @@
<artifactId>org.apache.karaf.features.management</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.karaf.features</groupId>
- <artifactId>org.apache.karaf.features.obr</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.karaf.diagnostic</groupId>
<artifactId>org.apache.karaf.diagnostic.core</artifactId>
</dependency>
@@ -151,27 +127,11 @@
<artifactId>org.apache.karaf.diagnostic.management</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.karaf.admin</groupId>
- <artifactId>org.apache.karaf.admin.core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.karaf.admin</groupId>
- <artifactId>org.apache.karaf.admin.command</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.karaf.admin</groupId>
- <artifactId>org.apache.karaf.admin.management</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.karaf.shell</groupId>
<artifactId>org.apache.karaf.shell.console</artifactId>
</dependency>
<dependency>
<groupId>org.apache.karaf.shell</groupId>
- <artifactId>org.apache.karaf.shell.obr</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.karaf.shell</groupId>
<artifactId>org.apache.karaf.shell.osgi</artifactId>
</dependency>
<dependency>
@@ -216,19 +176,41 @@
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.bundlerepository</artifactId>
+ <artifactId>org.apache.felix.fileinstall</artifactId>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.fileinstall</artifactId>
+ <artifactId>org.apache.felix.configadmin</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.mina</groupId>
- <artifactId>mina-core</artifactId>
+ <groupId>org.apache.aries.blueprint</groupId>
+ <artifactId>org.apache.aries.blueprint</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.proxy</groupId>
+ <artifactId>org.apache.aries.proxy</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>org.apache.aries.util</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.jmx</groupId>
+ <artifactId>org.apache.aries.jmx</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.aries.jmx</groupId>
+ <artifactId>org.apache.aries.jmx.blueprint</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.asm</artifactId>
+ </dependency>
+
+<!--
+ <dependency>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.configadmin</artifactId>
+ <artifactId>org.apache.felix.bundlerepository</artifactId>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -239,33 +221,54 @@
<artifactId>org.apache.felix.metatype</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.sshd</groupId>
- <artifactId>sshd-core</artifactId>
+ <groupId>org.apache.karaf.admin</groupId>
+ <artifactId>org.apache.karaf.admin.core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.aries.blueprint</groupId>
- <artifactId>org.apache.aries.blueprint</artifactId>
+ <groupId>org.apache.karaf.admin</groupId>
+ <artifactId>org.apache.karaf.admin.command</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.aries.proxy</groupId>
- <artifactId>org.apache.aries.proxy</artifactId>
+ <groupId>org.apache.karaf.admin</groupId>
+ <artifactId>org.apache.karaf.admin.management</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.aries</groupId>
- <artifactId>org.apache.aries.util</artifactId>
+ <groupId>org.apache.karaf.deployer</groupId>
+ <artifactId>org.apache.karaf.deployer.spring</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.aries.jmx</groupId>
- <artifactId>org.apache.aries.jmx</artifactId>
+ <groupId>org.apache.karaf.deployer</groupId>
+ <artifactId>org.apache.karaf.deployer.blueprint</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.aries.jmx</groupId>
- <artifactId>org.apache.aries.jmx.blueprint</artifactId>
+ <groupId>org.apache.karaf.deployer</groupId>
+ <artifactId>org.apache.karaf.deployer.features</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.asm</artifactId>
+ <groupId>org.apache.karaf.deployer</groupId>
+ <artifactId>org.apache.karaf.deployer.kar</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf.deployer</groupId>
+ <artifactId>org.apache.karaf.deployer.wrap</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf.features</groupId>
+ <artifactId>org.apache.karaf.features.obr</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf.shell</groupId>
+ <artifactId>org.apache.karaf.shell.obr</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.mina</groupId>
+ <artifactId>mina-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sshd</groupId>
+ <artifactId>sshd-core</artifactId>
</dependency>
+-->
</dependencies>
<build>
<resources>
Modified: 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=1088910&r1=1088909&r2=1088910&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/src/main/feature/feature.xml
(original)
+++ karaf/trunk/assemblies/features/framework/src/main/feature/feature.xml Tue
Apr 5 07:08:36 2011
@@ -11,49 +11,5 @@
<bundle dependency="false" start="true"
start-level="20">mvn:org.apache.aries/org.apache.aries.util/${aries.util.version}</bundle>
<bundle dependency="false" start="true"
start-level="20">mvn:org.apache.aries.proxy/org.apache.aries.proxy/${aries.proxy.version}</bundle>
<bundle dependency="false" start="true"
start-level="20">mvn:org.apache.aries.blueprint/org.apache.aries.blueprint/${aries.blueprint.version}</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>
Modified: karaf/trunk/demos/branding/shell/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/demos/branding/shell/pom.xml?rev=1088910&r1=1088909&r2=1088910&view=diff
==============================================================================
--- karaf/trunk/demos/branding/shell/pom.xml (original)
+++ karaf/trunk/demos/branding/shell/pom.xml Tue Apr 5 07:08:36 2011
@@ -34,7 +34,7 @@
<build>
<resources>
<resource>
- <directory>${pom.basedir}/src/main/resources</directory>
+ <directory>${project.basedir}/src/main/resources</directory>
<filtering>true</filtering>
<includes>
<include>**/*</include>
Modified: karaf/trunk/deployer/spring/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/deployer/spring/pom.xml?rev=1088910&r1=1088909&r2=1088910&view=diff
==============================================================================
--- karaf/trunk/deployer/spring/pom.xml (original)
+++ karaf/trunk/deployer/spring/pom.xml Tue Apr 5 07:08:36 2011
@@ -41,6 +41,7 @@
<dependency>
<groupId>org.apache.karaf</groupId>
<artifactId>org.apache.karaf.util</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Modified: karaf/trunk/jaas/modules/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/jaas/modules/pom.xml?rev=1088910&r1=1088909&r2=1088910&view=diff
==============================================================================
--- karaf/trunk/jaas/modules/pom.xml (original)
+++ karaf/trunk/jaas/modules/pom.xml Tue Apr 5 07:08:36 2011
@@ -50,6 +50,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.utils</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
Modified: karaf/trunk/shell/commands/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/shell/commands/pom.xml?rev=1088910&r1=1088909&r2=1088910&view=diff
==============================================================================
--- karaf/trunk/shell/commands/pom.xml (original)
+++ karaf/trunk/shell/commands/pom.xml Tue Apr 5 07:08:36 2011
@@ -49,6 +49,7 @@
<dependency>
<groupId>org.apache.karaf</groupId>
<artifactId>org.apache.karaf.util</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
Modified: karaf/trunk/shell/config/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/shell/config/pom.xml?rev=1088910&r1=1088909&r2=1088910&view=diff
==============================================================================
--- karaf/trunk/shell/config/pom.xml (original)
+++ karaf/trunk/shell/config/pom.xml Tue Apr 5 07:08:36 2011
@@ -45,6 +45,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.utils</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
Modified: karaf/trunk/shell/dev/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/shell/dev/pom.xml?rev=1088910&r1=1088909&r2=1088910&view=diff
==============================================================================
--- karaf/trunk/shell/dev/pom.xml (original)
+++ karaf/trunk/shell/dev/pom.xml Tue Apr 5 07:08:36 2011
@@ -39,11 +39,6 @@
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.utils</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-wrap</artifactId>
<scope>provided</scope>
Modified: karaf/trunk/shell/osgi/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/shell/osgi/pom.xml?rev=1088910&r1=1088909&r2=1088910&view=diff
==============================================================================
--- karaf/trunk/shell/osgi/pom.xml (original)
+++ karaf/trunk/shell/osgi/pom.xml Tue Apr 5 07:08:36 2011
@@ -44,6 +44,7 @@
<dependency>
<groupId>org.apache.karaf</groupId>
<artifactId>org.apache.karaf.util</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
Modified: karaf/trunk/webconsole/console/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/webconsole/console/pom.xml?rev=1088910&r1=1088909&r2=1088910&view=diff
==============================================================================
--- karaf/trunk/webconsole/console/pom.xml (original)
+++ karaf/trunk/webconsole/console/pom.xml Tue Apr 5 07:08:36 2011
@@ -34,7 +34,7 @@
related changed.</description>
<properties>
-
<appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
+
<appendedResourcesDirectory>${project.basedir}/../../etc/appended-resources</appendedResourcesDirectory>
</properties>
<dependencies>
@@ -108,7 +108,7 @@
<configuration>
<instructions>
<Bundle-SymbolicName>
- ${artifactId}
+ ${project.artifactId}
</Bundle-SymbolicName>
<Bundle-Vendor>
The Apache Software Foundation
