Repository: karaf Updated Branches: refs/heads/karaf-3.0.x d4e6a47cf -> 19b909e38
[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/f335477c Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/f335477c Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/f335477c Branch: refs/heads/karaf-3.0.x Commit: f335477cc3fcd47d1c508d1d1d2f2bc45111ec7b Parents: d4e6a47 Author: Guillaume Nodet <gno...@gmail.com> Authored: Wed Jul 9 16:13:26 2014 +0200 Committer: Guillaume Nodet <gno...@gmail.com> Committed: Wed Jul 9 16:13:26 2014 +0200 ---------------------------------------------------------------------- .../main/filtered-resources/resources/etc/config.properties | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/f335477c/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 4452247..c51277a 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,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.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"
