Repository: karaf Updated Branches: refs/heads/karaf-3.0.x 34ebeee88 -> 31ace2b75
[KARAF-2874] Upgrade to XBean 3.18 Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/ca2feb25 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/ca2feb25 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/ca2feb25 Branch: refs/heads/karaf-3.0.x Commit: ca2feb2571da5f3e60093cfe71c4a43c9c8e8605 Parents: 34ebeee Author: Jean-Baptiste Onofré <[email protected]> Authored: Sun Aug 24 08:47:22 2014 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Sun Aug 24 08:47:22 2014 +0200 ---------------------------------------------------------------------- assemblies/features/enterprise/src/main/feature/feature.xml | 2 +- assemblies/features/standard/src/main/feature/feature.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/ca2feb25/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 d867813..6d9260c 100644 --- a/assemblies/features/enterprise/src/main/feature/feature.xml +++ b/assemblies/features/enterprise/src/main/feature/feature.xml @@ -138,7 +138,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/ca2feb25/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 1129023..cf846b4 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> http://git-wip-us.apache.org/repos/asf/karaf/blob/ca2feb25/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 210a1b8..80e3bb8 100644 --- a/pom.xml +++ b/pom.xml @@ -243,7 +243,7 @@ <directory-version>2.0.0-M16</directory-version> <sshd.version>0.12.0</sshd.version> <struts.bundle.version>1.3.10_1</struts.bundle.version> - <xbean.version>3.16</xbean.version> + <xbean.version>3.18</xbean.version> <xerces.version>2.11.0</xerces.version> <javax.mail.version>1.4.5</javax.mail.version> <weld.version>2.1.1.Final</weld.version>
