Repository: karaf Updated Branches: refs/heads/karaf-2.x d1303d973 -> 7ba6261d8
[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/7ba6261d Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/7ba6261d Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/7ba6261d Branch: refs/heads/karaf-2.x Commit: 7ba6261d80219d6a2ba72224eb760978ebd25c43 Parents: d1303d9 Author: Guillaume Nodet <[email protected]> Authored: Wed Jul 9 16:12:05 2014 +0200 Committer: Guillaume Nodet <[email protected]> Committed: Wed Jul 9 16:12:05 2014 +0200 ---------------------------------------------------------------------- .../src/main/filtered-resources/etc/config.properties | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/7ba6261d/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 688404f..79df6e4 100644 --- a/assemblies/apache-karaf/src/main/filtered-resources/etc/config.properties +++ b/assemblies/apache-karaf/src/main/filtered-resources/etc/config.properties @@ -124,11 +124,7 @@ org.osgi.framework.system.capabilities= \ ${eecap-${java.specification.version}}, \ service-reference;effective:=active;objectClass=org.osgi.service.packageadmin.PackageAdmin, \ service-reference;effective:=active;objectClass=org.osgi.service.startlevel.StartLevel, \ - service-reference;effective:=active;objectClass=org.osgi.service.url.URLHandlers, \ - ${services-${karaf.framework}} - -services-felix= \ - service-reference;effective:=active;objectClass=org.apache.felix.framework.monitor.MonitoringService + service-reference;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"
