Repository: karaf
Updated Branches:
  refs/heads/karaf-3.0.x d48097de1 -> 905520399


[KARAF-2874] Fix the features about xbean-asm*-shaded


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/90552039
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/90552039
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/90552039

Branch: refs/heads/karaf-3.0.x
Commit: 905520399d94b00683b6ca0eca436b7495ed884b
Parents: d48097d
Author: Jean-Baptiste Onofré <[email protected]>
Authored: Mon Apr 7 11:17:15 2014 +0200
Committer: Jean-Baptiste Onofré <[email protected]>
Committed: Mon Apr 7 11:17:15 2014 +0200

----------------------------------------------------------------------
 assemblies/features/enterprise/src/main/feature/feature.xml | 2 +-
 assemblies/features/standard/src/main/feature/feature.xml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/90552039/assemblies/features/enterprise/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/enterprise/src/main/feature/feature.xml 
b/assemblies/features/enterprise/src/main/feature/feature.xml
index 06905e4..1cd8073 100644
--- a/assemblies/features/enterprise/src/main/feature/feature.xml
+++ b/assemblies/features/enterprise/src/main/feature/feature.xml
@@ -80,7 +80,7 @@
         <bundle 
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/1.7.0_6</bundle>
         <bundle 
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.serp/${serp.bundle.version}</bundle>
         <bundle 
dependency="true">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.jms-spec.version}</bundle>
-        <bundle 
dependency="true">mvn:org.apache.xbean/xbean-asm4-shaded/${xbean.version}</bundle>
+        <bundle 
dependency="true">mvn:org.apache.xbean/xbean-asm4-shaded/3.16</bundle>
         <bundle start-level="29">mvn:org.apache.openjpa/openjpa/2.3.0</bundle>
         <feature>jpa</feature>
     </feature>

http://git-wip-us.apache.org/repos/asf/karaf/blob/90552039/assemblies/features/standard/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/standard/src/main/feature/feature.xml 
b/assemblies/features/standard/src/main/feature/feature.xml
index a785feb..bf84152 100644
--- a/assemblies/features/standard/src/main/feature/feature.xml
+++ b/assemblies/features/standard/src/main/feature/feature.xml
@@ -53,7 +53,7 @@
         <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 dependency="true" 
start-level="20">mvn:org.apache.xbean/xbean-bundleutils/${xbean.version}</bundle>
-        <bundle dependency="true" 
start-level="20">mvn:org.apache.xbean/xbean-asm4-shaded/${xbean.version}</bundle>
+        <bundle dependency="true" 
start-level="20">mvn:org.apache.xbean/xbean-asm5-shaded/${xbean.version}</bundle>
         <bundle dependency="true" 
start-level="20">mvn:org.apache.xbean/xbean-reflect/${xbean.version}</bundle>
         <bundle dependency="true" 
start-level="20">mvn:org.apache.xbean/xbean-finder-shaded/${xbean.version}</bundle>
         <bundle 
start-level="20">mvn:org.apache.aries.blueprint/org.apache.aries.blueprint.annotation.api/${aries.blueprint.annotation.api.version}</bundle>

Reply via email to