Author: jbonofre
Date: Mon Jan 30 14:32:38 2012
New Revision: 1237680
URL: http://svn.apache.org/viewvc?rev=1237680&view=rev
Log:
Fix missing bundles in the framework feature
Modified:
karaf/trunk/assemblies/features/framework/pom.xml
karaf/trunk/assemblies/features/framework/src/main/feature/feature.xml
karaf/trunk/pom.xml
Modified: karaf/trunk/assemblies/features/framework/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/pom.xml?rev=1237680&r1=1237679&r2=1237680&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/pom.xml (original)
+++ karaf/trunk/assemblies/features/framework/pom.xml Mon Jan 30 14:32:38 2012
@@ -78,6 +78,10 @@
<!-- listed in source feature.xml with explicit startlevel -->
<dependency>
+ <groupId>biz.aQute</groupId>
+ <artifactId>bndlib</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.ops4j.pax.logging</groupId>
<artifactId>pax-logging-api</artifactId>
</dependency>
@@ -86,6 +90,10 @@
<artifactId>pax-logging-service</artifactId>
</dependency>
<dependency>
+ <groupId>org.ops4j.base</groupId>
+ <artifactId>ops4j-base-lang</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-aether</artifactId>
<exclusions>
@@ -99,6 +107,10 @@
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-wrap</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.swissbox</groupId>
+ <artifactId>pax-swissbox-bnd</artifactId>
+ </dependency>
<!-- to be added automatically to feature.xml -->
@@ -216,6 +228,12 @@
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.junit</artifactId>
+ <version>${junit3.bundle.version}</version>
+ </dependency>
<!--
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
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=1237680&r1=1237679&r2=1237680&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/src/main/feature/feature.xml
(original)
+++ karaf/trunk/assemblies/features/framework/src/main/feature/feature.xml Mon
Jan 30 14:32:38 2012
@@ -22,6 +22,10 @@
including the correct start-level for the generation of the
startup.propertie file -->
<feature version="${project.version}" description="Karaf core feature"
name="framework">
+ <bundle start="true"
start-level="5">mvn:org.ops4j.base/ops4j-base-lang/${pax.base.version}</bundle>
+ <bundle start="true"
start-level="5">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.junit/${junit3.bundle.version}</bundle>
+ <bundle start="true"
start-level="5">mvn:biz.aQute/bndlib/${bndlib.version}</bundle>
+ <bundle start="true"
start-level="5">mvn:org.ops4j.pax.swissbox/pax-swissbox-bnd/${pax.swissbox.version}</bundle>
<bundle start="true"
start-level="5">mvn:org.ops4j.pax.url/pax-url-aether/${pax.url.version}</bundle>
<bundle start="true"
start-level="5">mvn:org.ops4j.pax.url/pax-url-wrap/${pax.url.version}</bundle>
<bundle start="true"
start-level="8">mvn:org.ops4j.pax.logging/pax-logging-api/${pax.logging.version}</bundle>
Modified: karaf/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1237680&r1=1237679&r2=1237680&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Mon Jan 30 14:32:38 2012
@@ -123,6 +123,7 @@
<commons-lang.version>2.6</commons-lang.version>
<jasypt.bundle.version>1.8_1</jasypt.bundle.version>
<jetty.version>7.5.4.v20111024</jetty.version>
+ <junit3.bundle.version>3.8.2_4</junit3.bundle.version>
<junit.bundle.version>4.7_3</junit.bundle.version>
<junit.version>4.7</junit.version>
<injection.bundle.version>1.0</injection.bundle.version>
@@ -180,10 +181,10 @@
<pax.exam.version>2.3.0</pax.exam.version>
<pax.logging.version>1.6.4</pax.logging.version>
<pax.runner.version>1.7.5</pax.runner.version>
- <pax.base.version>1.2.3</pax.base.version>
+ <pax.base.version>1.3.0-SNAPSHOT</pax.base.version>
<pax.url.version>1.4-SNAPSHOT</pax.url.version>
<pax.web.version>1.1.2-SNAPSHOT</pax.web.version>
- <pax.tinybundles.version>1.3.0</pax.tinybundles.version>
+ <pax.swissbox.version>1.5.0-SNAPSHOT</pax.swissbox.version>
<servlet.api.version>2.5</servlet.api.version>
<slf4j.version>1.6.1</slf4j.version>
<servicemix.specs.version>1.9.0</servicemix.specs.version>
@@ -1230,8 +1231,13 @@
</dependency>
<dependency>
<groupId>org.ops4j.pax.swissbox</groupId>
+ <artifactId>pax-swissbox-bnd</artifactId>
+ <version>${pax.swissbox.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.swissbox</groupId>
<artifactId>pax-swissbox-tinybundles</artifactId>
- <version>${pax.tinybundles.version}</version>
+ <version>${pax.swissbox.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse</groupId>
