Repository: karaf Updated Branches: refs/heads/master e164271c4 -> 46eb321a3
[KARAF-2861] Upgrade to ASM 5.0.2 [KARAF-2874] Upgrade to XBean 3.18 [KARAF-2945] Upgrade to Aries Proxy Impl 1.0.3-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/46eb321a Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/46eb321a Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/46eb321a Branch: refs/heads/master Commit: 46eb321a39402c4010542bd36021bbb6d8293d9b Parents: e164271 Author: Jean-Baptiste Onofré <[email protected]> Authored: Mon Jun 9 21:20:06 2014 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Mon Jun 9 21:20:06 2014 +0200 ---------------------------------------------------------------------- assemblies/features/enterprise/src/main/feature/feature.xml | 2 +- assemblies/features/standard/src/main/feature/feature.xml | 2 +- pom.xml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/46eb321a/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 6c21fe3..566564c 100644 --- a/assemblies/features/enterprise/src/main/feature/feature.xml +++ b/assemblies/features/enterprise/src/main/feature/feature.xml @@ -87,7 +87,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> <requirement>osgi.ee;filter:="(&(osgi.ee=JavaSE)(!(version>=1.8)))"</requirement> http://git-wip-us.apache.org/repos/asf/karaf/blob/46eb321a/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 b60c9e3..b21c2ae 100644 --- a/assemblies/features/standard/src/main/feature/feature.xml +++ b/assemblies/features/standard/src/main/feature/feature.xml @@ -60,7 +60,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/46eb321a/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 3a7747e..caec74a 100644 --- a/pom.xml +++ b/pom.xml @@ -125,7 +125,7 @@ <aspectj.bundle.version>1.7.4_1</aspectj.bundle.version> <ant.bundle.version>1.8.2_2</ant.bundle.version> <antlr.bundle.version>2.7.7_5</antlr.bundle.version> - <asm.version>4.1</asm.version> + <asm.version>5.0.2</asm.version> <asm.springsource.version>1.5.3</asm.springsource.version> <cglib.bundle.version>3.0_1</cglib.bundle.version> <cglib2.version>2.2.0</cglib2.version> @@ -200,7 +200,7 @@ <aries.jndi.version>1.0.0</aries.jndi.version> <aries.jndi.api.version>1.0.0</aries.jndi.api.version> <aries.jndi.url.version>1.1.0-SNAPSHOT</aries.jndi.url.version> - <aries.proxy.version>1.0.2</aries.proxy.version> + <aries.proxy.version>1.0.3-SNAPSHOT</aries.proxy.version> <aries.proxy.api.version>1.0.0</aries.proxy.api.version> <aries.subsystem.version>1.0.1-SNAPSHOT</aries.subsystem.version> <aries.transaction.version>1.0.1</aries.transaction.version> @@ -252,7 +252,7 @@ <derby-version>10.10.1.1</derby-version> <directory-version>2.0.0-M16</directory-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>
