Repository: karaf Updated Branches: refs/heads/karaf-2.x f992b0565 -> e7703516b
[KARAF-2602] Support for JDK8 [KARAF-2861] Upgrade to ASM 5.0.3 [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/e7703516 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/e7703516 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/e7703516 Branch: refs/heads/karaf-2.x Commit: e7703516b57fd5ba5cc73ea3efb167cf50baae45 Parents: f992b05 Author: Guillaume Nodet <gno...@gmail.com> Authored: Mon Jun 16 08:25:07 2014 +0200 Committer: Guillaume Nodet <gno...@gmail.com> Committed: Mon Jun 16 08:25:21 2014 +0200 ---------------------------------------------------------------------- .../src/main/filtered-resources/etc/config.properties | 2 ++ pom.xml | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/e7703516/assemblies/apache-karaf/src/main/filtered-resources/etc/config.properties ---------------------------------------------------------------------- diff --git a/assemblies/apache-karaf/src/main/filtered-resources/etc/config.properties b/assemblies/apache-karaf/src/main/filtered-resources/etc/config.properties index e311e0d..688404f 100644 --- a/assemblies/apache-karaf/src/main/filtered-resources/etc/config.properties +++ b/assemblies/apache-karaf/src/main/filtered-resources/etc/config.properties @@ -130,6 +130,8 @@ org.osgi.framework.system.capabilities= \ services-felix= \ service-reference;effective:=active;objectClass=org.apache.felix.framework.monitor.MonitoringService +eecap-1.8= osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0,1.1,1.2", \ + osgi.ee; osgi.ee="JavaSE"; version:List<Version>="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8" eecap-1.7= osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0,1.1,1.2", \ osgi.ee; osgi.ee="JavaSE"; version:List<Version>="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7" eecap-1.6= osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0,1.1,1.2", \ http://git-wip-us.apache.org/repos/asf/karaf/blob/e7703516/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index fdb6865..bf7f8cf 100644 --- a/pom.xml +++ b/pom.xml @@ -109,7 +109,7 @@ <aopalliance.bundle.version>1.0_6</aopalliance.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.3</asm.version> <asm.springsource.version>1.5.3</asm.springsource.version> <aspectj.bundle.version>1.7.4_1</aspectj.bundle.version> <bndlib.version>2.2.0</bndlib.version> @@ -181,7 +181,7 @@ <aries.jpa.blueprint.version>1.0.1</aries.jpa.blueprint.version> <aries.jndi.version>1.0.0</aries.jndi.version> <aries.jndi.api.version>1.0.0</aries.jndi.api.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.transaction.version>1.0.1</aries.transaction.version> <aries.transaction.manager.version>1.1.0</aries.transaction.manager.version>
