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/02/29 15:40:41 UTC
svn commit: r1295135 - in /karaf/trunk: ./ assemblies/features/framework/
assemblies/features/framework/src/main/feature/
assemblies/features/standard/src/main/feature/
itests/tests/src/test/resources/org/apache/karaf/testing/
Author: jbonofre
Date: Wed Feb 29 14:40:39 2012
New Revision: 1295135
URL: http://svn.apache.org/viewvc?rev=1295135&view=rev
Log:
[KARAF-1209] Introduce asm bundle as a workaround to Aries Blueprint issue
Modified:
karaf/trunk/assemblies/features/framework/pom.xml
karaf/trunk/assemblies/features/framework/src/main/feature/feature.xml
karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml
karaf/trunk/itests/tests/src/test/resources/org/apache/karaf/testing/startup.properties
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=1295135&r1=1295134&r2=1295135&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/pom.xml (original)
+++ karaf/trunk/assemblies/features/framework/pom.xml Wed Feb 29 14:40:39 2012
@@ -165,6 +165,12 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.configadmin</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-all</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.api</artifactId>
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=1295135&r1=1295134&r2=1295135&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/src/main/feature/feature.xml (original)
+++ karaf/trunk/assemblies/features/framework/src/main/feature/feature.xml Wed Feb 29 14:40:39 2012
@@ -32,6 +32,7 @@
<bundle start="true" start-level="8">mvn:org.ops4j.pax.logging/pax-logging-service/${pax.logging.version}</bundle>
<bundle start="true" start-level="10">mvn:org.apache.felix/org.apache.felix.configadmin/${felix.configadmin.version}</bundle>
<bundle start="true" start-level="11">mvn:org.apache.felix/org.apache.felix.fileinstall/${felix.fileinstall.version}</bundle>
+ <bundle start="true" start-level="12">mvn:org.ow2.asm/asm-all/${asm.version}</bundle>
<bundle start="true" start-level="20">mvn:org.apache.aries/org.apache.aries.util/${aries.util.version}</bundle>
<bundle start="true" start-level="20">mvn:org.apache.aries.proxy/org.apache.aries.proxy.api/${aries.proxy.api.version}</bundle>
<bundle start="true" start-level="20">mvn:org.apache.aries.proxy/org.apache.aries.proxy.impl/${aries.proxy.impl.version}</bundle>
Modified: karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml?rev=1295135&r1=1295134&r2=1295135&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml (original)
+++ karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml Wed Feb 29 14:40:39 2012
@@ -19,8 +19,8 @@
<features name="standard-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.0.0">
<feature name="aries-annotation" description="Aries Annotations" version="${project.version}">
- <bundle start-level="20">mvn:org.apache.commons/commons-jexl/${commons-jexl.version}</bundle>
- <bundle start-level="20">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.asm/${asm.bundle.version}</bundle>
+ <bundle dependency="true" start-level="20">mvn:org.apache.commons/commons-jexl/${commons-jexl.version}</bundle>
+ <bundle dependency="true" start-level="20">mvn:org.ow2.asm/asm-all/${asm.version}</bundle>
<bundle start-level="20">mvn:org.apache.aries.blueprint/org.apache.aries.blueprint.annotation.api/${aries.blueprint.annotation.api.version}</bundle>
<bundle start-level="20">mvn:org.apache.aries.blueprint/org.apache.aries.blueprint.annotation.impl/${aries.blueprint.annotation.impl.version}</bundle>
<bundle start-level="20">mvn:org.apache.aries.blueprint/org.apache.aries.blueprint.jexl.evaluator/${aries.blueprint.jexl.evaluator.version}</bundle>
Modified: karaf/trunk/itests/tests/src/test/resources/org/apache/karaf/testing/startup.properties
URL: http://svn.apache.org/viewvc/karaf/trunk/itests/tests/src/test/resources/org/apache/karaf/testing/startup.properties?rev=1295135&r1=1295134&r2=1295135&view=diff
==============================================================================
--- karaf/trunk/itests/tests/src/test/resources/org/apache/karaf/testing/startup.properties (original)
+++ karaf/trunk/itests/tests/src/test/resources/org/apache/karaf/testing/startup.properties Wed Feb 29 14:40:39 2012
@@ -1,20 +1,36 @@
# Testing startup.properties
-mvn\:org.ops4j.pax.url/pax-url-aether/1.3.5 = 5
-mvn\:org.ops4j.pax.url/pax-url-wrap/1.3.5 = 5
-mvn\:org.ops4j.pax.logging/pax-logging-api/1.6.3 = 8
-mvn\:org.ops4j.pax.logging/pax-logging-service/1.6.3 = 8
+mvn\:org.ops4j.base/ops4j-base-lang/1.3.0 = 5
+mvn\:org.apache.servicemix.bundles/org.apache.servicemix.bundles.junit/3.8.2_4 = 5
+mvn\:biz.aQute/bndlib/1.50.0 = 5
+mvn\:org.ops4j.pax.swissbox/pax-swissbox-bnd/1.5.0 = 5
+mvn\:org.ops4j.pax.url/pax-url-aether/1.4.0.RC1 = 5
+mvn\:org.ops4j.pax.url/pax-url-wrap/1.4.0.RC1 = 5
+mvn\:org.ops4j.pax.logging/pax-logging-api/1.6.5 = 8
+mvn\:org.ops4j.pax.logging/pax-logging-service/1.6.5 = 8
mvn\:org.apache.felix/org.apache.felix.configadmin/1.2.8 = 10
mvn\:org.apache.felix/org.apache.felix.fileinstall/3.1.10 = 11
-mvn\:org.apache.servicemix.bundles/org.apache.servicemix.bundles.asm/3.3_2 = 20
-mvn\:org.apache.aries/org.apache.aries.util/0.4-SNAPSHOT = 20
-mvn\:org.apache.aries.proxy/org.apache.aries.proxy/0.4 = 20
-mvn\:org.apache.aries.blueprint/org.apache.aries.blueprint/0.4 = 20
+mvn\:org.ow2.asm/asm-all/4.0 = 12
+mvn\:org.apache.aries/org.apache.aries.util/0.5-SNAPSHOT = 20
+mvn\:org.apache.aries.proxy/org.apache.aries.proxy.api/0.4 = 20
+mvn\:org.apache.aries.proxy/org.apache.aries.proxy.impl/0.4.1-SNAPSHOT = 20
+mvn\:org.apache.aries.blueprint/org.apache.aries.blueprint.api/0.3.1 = 20
+mvn\:org.apache.aries.blueprint/org.apache.aries.blueprint.cm/0.3.3-SNAPSHOT = 20
+mvn\:org.apache.aries.blueprint/org.apache.aries.blueprint.core.compatibility/0.4.1-SNAPSHOT = 20
+mvn\:org.apache.aries.blueprint/org.apache.aries.blueprint.core/0.4.1-SNAPSHOT = 20
+mvn\:org.apache.karaf.region/org.apache.karaf.region.core/3.0.0-SNAPSHOT = 25
mvn\:org.apache.karaf.features/org.apache.karaf.features.core/3.0.0-SNAPSHOT = 25
+mvn\:org.ops4j.pax.url/pax-url-commons/1.4.0.RC1 = 30
+mvn\:org.ops4j.pax.swissbox/pax-swissbox-property/1.5.0 = 30
+mvn\:org.ops4j.base/ops4j-base-util-property/1.3.0 = 30
+mvn\:org.ops4j.base/ops4j-base-net/1.3.0 = 30
+mvn\:org.ops4j.base/ops4j-base-monitors/1.3.0 = 30
+mvn\:org.apache.karaf.features/org.apache.karaf.features.command/3.0.0-SNAPSHOT = 30
mvn\:org.apache.karaf.shell/org.apache.karaf.shell.console/3.0.0-SNAPSHOT = 30
mvn\:org.apache.karaf.jaas/org.apache.karaf.jaas.modules/3.0.0-SNAPSHOT = 30
mvn\:org.apache.karaf.jaas/org.apache.karaf.jaas.config/3.0.0-SNAPSHOT = 30
mvn\:org.apache.karaf.shell/org.apache.karaf.shell.bundles/3.0.0-SNAPSHOT = 30
mvn\:org.apache.karaf.shell/org.apache.karaf.shell.services/3.0.0-SNAPSHOT = 30
-mvn\:org.apache.karaf.shell/org.apache.karaf.shell.system/3.0.0-SNAPSHOT = 30
+mvn\:org.apache.karaf.system/org.apache.karaf.system.core/3.0.0-SNAPSHOT = 30
+mvn\:org.apache.karaf.system/org.apache.karaf.system.commands/3.0.0-SNAPSHOT = 30
mvn\:org.apache.karaf.shell/org.apache.karaf.shell.commands/3.0.0-SNAPSHOT = 30
-mvn\:org.apache.karaf.shell/org.apache.karaf.shell.log/3.0.0-SNAPSHOT = 30
\ No newline at end of file
+mvn\:org.apache.aries.quiesce/org.apache.aries.quiesce.api/0.3 = 30
\ No newline at end of file
Modified: karaf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1295135&r1=1295134&r2=1295135&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Wed Feb 29 14:40:39 2012
@@ -109,9 +109,8 @@
</prerequisites>
<properties>
- <!-- Apache ServiceMix Bundles -->
<aopalliance.bundle.version>1.0_5</aopalliance.bundle.version>
- <asm.bundle.version>3.3.1_1</asm.bundle.version>
+ <asm.version>4.0</asm.version>
<cglib.bundle.version>2.1_3_7</cglib.bundle.version>
<commons-beanutils.version>1.8.3</commons-beanutils.version>
<commons-codec.version>1.6</commons-codec.version>
@@ -823,6 +822,13 @@
<artifactId>org.apache.felix.scr</artifactId>
<version>${felix.scr.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-all</artifactId>
+ <version>${asm.version}</version>
+ </dependency>
+
<dependency>
<groupId>biz.aQute</groupId>
<artifactId>bndlib</artifactId>
@@ -978,11 +984,6 @@
<version>${geronimo.jaspic-spec.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.asm</artifactId>
- <version>${asm.bundle.version}</version>
- </dependency>
- <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>${log4j.version}</version>