Repository: karaf Updated Branches: refs/heads/master f514bcd47 -> aa9c0acff
[KARAF-3096] Karaf doesn't start with Equinox 3.9.1 Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/aa9c0acf Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/aa9c0acf Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/aa9c0acf Branch: refs/heads/master Commit: aa9c0acff56d526fad52bd459ca488b6605065f3 Parents: f514bcd Author: Guillaume Nodet <gno...@gmail.com> Authored: Wed Jul 9 16:15:25 2014 +0200 Committer: Guillaume Nodet <gno...@gmail.com> Committed: Wed Jul 9 16:15:25 2014 +0200 ---------------------------------------------------------------------- .../src/main/filtered-resources/resources/etc/config.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/aa9c0acf/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties ---------------------------------------------------------------------- diff --git a/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties b/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties index 241ebc7..4a08f73 100644 --- a/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties +++ b/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties @@ -124,7 +124,7 @@ org.osgi.framework.system.capabilities= \ ${eecap-${java.specification.version}}, \ osgi.service;effective:=active;objectClass=org.osgi.service.packageadmin.PackageAdmin, \ osgi.service;effective:=active;objectClass=org.osgi.service.startlevel.StartLevel, \ - ${services-${karaf.framework}} + osgi.service;effective:=active;objectClass=org.osgi.service.url.URLHandlers 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"
