FELIX-1062: upgrade to latest felix framework version (1.6.0 atm)
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@769544 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/karaf/etc/config.properties b/karaf/etc/config.properties
index 3146515..dfe0abb 100644
--- a/karaf/etc/config.properties
+++ b/karaf/etc/config.properties
@@ -36,7 +36,7 @@
felix.auto.start=startup.properties
#felix.auto.start=all
-org.osgi.framework.startlevel=100
+org.osgi.framework.startlevel.beginning=100
felix.startlevel.bundle=60
#framework.service.urlhandlers=false
diff --git a/karaf/pom.xml b/karaf/pom.xml
index 2f50401..88b19d7 100644
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -78,7 +78,7 @@
<easymock.version>2.4</easymock.version>
<felix.configadmin.version>1.0.4</felix.configadmin.version>
<felix.plugin.version>1.4.3</felix.plugin.version>
- <felix.framework.version>1.5.0-r752991</felix.framework.version>
+ <felix.framework.version>1.6.0</felix.framework.version>
<felix.osgi.version>1.2.0</felix.osgi.version>
<felix.compendium.version>1.2.0</felix.compendium.version>
<felix.bundlerepository.version>1.2.1</felix.bundlerepository.version>