diff --git a/application/application-itests/pom.xml b/application/application-itests/pom.xml
index 397118f48c..c7a717301b 100644
--- a/application/application-itests/pom.xml
+++ b/application/application-itests/pom.xml
@@ -66,7 +66,7 @@
 <!--        <org.apache.aries.testsupport.unit.version>2.0.0-SNAPSHOT</org.apache.aries.testsupport.unit.version>-->
         <org.apache.aries.transaction.blueprint.version>1.0.0</org.apache.aries.transaction.blueprint.version>
         <org.apache.aries.util.version>1.0.0</org.apache.aries.util.version>
-        <org.apache.felix.bundlerepository.version>1.6.4</org.apache.felix.bundlerepository.version>
+        <org.apache.felix.bundlerepository.version>1.6.6</org.apache.felix.bundlerepository.version>
         <org.apache.felix.configadmin.version>1.2.4</org.apache.felix.configadmin.version>
         <org.eclipse.osgi.version>3.8.0.v20120529-1548</org.eclipse.osgi.version>
         <url.version>2.5.3</url.version>
diff --git a/application/application-obr-resolver/pom.xml b/application/application-obr-resolver/pom.xml
index bec93da60e..30fdfe3631 100644
--- a/application/application-obr-resolver/pom.xml
+++ b/application/application-obr-resolver/pom.xml
@@ -64,7 +64,7 @@
         <org.apache.aries.application.api.version>1.0.0</org.apache.aries.application.api.version>
         <org.apache.aries.application.utils.version>1.0.0</org.apache.aries.application.utils.version>
         <org.apache.aries.testsupport.unit.version>1.0.0</org.apache.aries.testsupport.unit.version>
-        <org.apache.felix.bundlerepository.version>1.6.4</org.apache.felix.bundlerepository.version>
+        <org.apache.felix.bundlerepository.version>1.6.6</org.apache.felix.bundlerepository.version>
     </properties>
 
     <dependencies>
diff --git a/application/application-tooling-repository-generator/pom.xml b/application/application-tooling-repository-generator/pom.xml
index 8afe80b77e..6bdf0f868a 100644
--- a/application/application-tooling-repository-generator/pom.xml
+++ b/application/application-tooling-repository-generator/pom.xml
@@ -67,7 +67,7 @@
         <org.apache.aries.transaction.manager.version>1.0.0</org.apache.aries.transaction.manager.version>
         <org.apache.aries.transaction.wrappers.version>1.0.0</org.apache.aries.transaction.wrappers.version>
         <org.apache.aries.util.version>1.0.0</org.apache.aries.util.version>
-        <org.apache.felix.bundlerepository.version>1.6.4</org.apache.felix.bundlerepository.version>
+        <org.apache.felix.bundlerepository.version>1.6.6</org.apache.felix.bundlerepository.version>
         <org.eclipse.osgi.version>3.8.0.v20120529-1548</org.eclipse.osgi.version>
         <services.version>3.1.200-v20070605</services.version>
     </properties>
diff --git a/samples/pom.xml b/samples/pom.xml
index bca6cf6a56..321ce36454 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -155,7 +155,7 @@
         <felixShellVersion>1.4.2</felixShellVersion>
         <felixShellTuiVersion>1.4.1</felixShellTuiVersion>
         <felixEventadminVersion>1.2.2</felixEventadminVersion>
-        <felixBundlerepositoryVersion>1.6.4</felixBundlerepositoryVersion>
+        <felixBundlerepositoryVersion>2.0.10</felixBundlerepositoryVersion>
         <felixConfigadminVersion>1.2.4</felixConfigadminVersion>
         <serpVersion>1.13.1</serpVersion>
         <javaxServletVersion>1.2</javaxServletVersion>
diff --git a/subsystem/subsystem-itests/pom.xml b/subsystem/subsystem-itests/pom.xml
index d7d3caa41b..e7ba99fb74 100644
--- a/subsystem/subsystem-itests/pom.xml
+++ b/subsystem/subsystem-itests/pom.xml
@@ -58,7 +58,7 @@
         <org.apache.aries.subsystem.obr.version>1.0.5-SNAPSHOT</org.apache.aries.subsystem.obr.version>
         <org.apache.aries.testsupport.unit.version>2.0.0-SNAPSHOT</org.apache.aries.testsupport.unit.version>
         <org.apache.aries.util.version>1.1.0</org.apache.aries.util.version>
-        <org.apache.felix.bundlerepository.version>1.6.6</org.apache.felix.bundlerepository.version>
+        <org.apache.felix.bundlerepository.version>2.0.10</org.apache.felix.bundlerepository.version>
         <org.apache.felix.configadmin.version>1.8.0</org.apache.felix.configadmin.version>
         <org.eclipse.equinox.event.version>1.2.200.v20120522-2049</org.eclipse.equinox.event.version>
         <org.eclipse.osgi.version>3.11.3</org.eclipse.osgi.version>
diff --git a/subsystem/subsystem-obr/pom.xml b/subsystem/subsystem-obr/pom.xml
index b36f4b22f5..64b5ea4d6a 100644
--- a/subsystem/subsystem-obr/pom.xml
+++ b/subsystem/subsystem-obr/pom.xml
@@ -54,7 +54,7 @@
         <lastReleaseVersion>1.0.0</lastReleaseVersion>
 
         <org.apache.aries.application.utils.version>1.0.0</org.apache.aries.application.utils.version>
-        <org.apache.felix.bundlerepository.version>1.6.4</org.apache.felix.bundlerepository.version>
+        <org.apache.felix.bundlerepository.version>2.0.10</org.apache.felix.bundlerepository.version>
         <org.osgi.core.version>6.0.0</org.osgi.core.version>
         <org.osgi.enterprise.version>5.0.0</org.osgi.enterprise.version>
     </properties>
diff --git a/subsystem/subsystem-obr/src/main/java/org/apache/aries/subsystem/util/felix/OsgiCapabilityAdapter.java b/subsystem/subsystem-obr/src/main/java/org/apache/aries/subsystem/util/felix/OsgiCapabilityAdapter.java
index 7d7b273371..818b90bd70 100644
--- a/subsystem/subsystem-obr/src/main/java/org/apache/aries/subsystem/util/felix/OsgiCapabilityAdapter.java
+++ b/subsystem/subsystem-obr/src/main/java/org/apache/aries/subsystem/util/felix/OsgiCapabilityAdapter.java
@@ -59,8 +59,13 @@ public Map getPropertiesAsMap() {
 		result.put(getName(), result.get(capability.getNamespace()));
 		return result;
 	}
-	
-	@Override
+
+    @Override
+    public Map<String, String> getDirectives() {
+        return capability.getDirectives();
+    }
+
+    @Override
 	public int hashCode() {
 		return capability.hashCode();
 	}
diff --git a/subsystem/subsystem-obr/src/main/java/org/apache/aries/subsystem/util/felix/OsgiRequirementAdapter.java b/subsystem/subsystem-obr/src/main/java/org/apache/aries/subsystem/util/felix/OsgiRequirementAdapter.java
index 4857a3dc68..f99998f9e6 100644
--- a/subsystem/subsystem-obr/src/main/java/org/apache/aries/subsystem/util/felix/OsgiRequirementAdapter.java
+++ b/subsystem/subsystem-obr/src/main/java/org/apache/aries/subsystem/util/felix/OsgiRequirementAdapter.java
@@ -25,6 +25,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Map;
+
 public class OsgiRequirementAdapter implements Requirement {
 	private static final Logger logger = LoggerFactory.getLogger(OsgiRequirementAdapter.class);
 	
@@ -44,7 +46,17 @@ public String getFilter() {
 		return requirement.getDirectives().get(Constants.FILTER_DIRECTIVE);
 	}
 
-	public String getName() {
+    @Override
+    public Map<String, Object> getAttributes() {
+        return requirement.getAttributes();
+    }
+
+    @Override
+    public Map<String, String> getDirectives() {
+        return requirement.getDirectives();
+    }
+
+    public String getName() {
 		return NamespaceTranslator.translate(requirement.getNamespace());
 	}