Repository: karaf Updated Branches: refs/heads/karaf-3.0.x c3a4605b1 -> c68145b69
Revert "[KARAF-2874] Fix the features about xbean-asm*-shaded" This reverts commit 905520399d94b00683b6ca0eca436b7495ed884b. Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/c651e50f Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/c651e50f Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/c651e50f Branch: refs/heads/karaf-3.0.x Commit: c651e50f5dbed54ff7fe18eb497e5cb4b289081c Parents: c3a4605 Author: Jean-Baptiste Onofré <[email protected]> Authored: Wed Apr 9 12:06:20 2014 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Wed Apr 9 12:06:20 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/c651e50f/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 1cd8073..06905e4 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/3.16</bundle> + <bundle dependency="true">mvn:org.apache.xbean/xbean-asm4-shaded/${xbean.version}</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/c651e50f/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 bf84152..a785feb 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-asm5-shaded/${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-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>
