From 1cf2636299e803b0b4f64b2e6247ed97ac02cb6d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 21 Jan 2025 17:35:37 +0000
Subject: [PATCH 1/2] Bump org.apache.felix:org.apache.felix.bundlerepository

Bumps org.apache.felix:org.apache.felix.bundlerepository from 1.6.4 to 2.0.10.

---
updated-dependencies:
- dependency-name: org.apache.felix:org.apache.felix.bundlerepository
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 application/application-itests/pom.xml                       | 2 +-
 application/application-obr-resolver/pom.xml                 | 2 +-
 application/application-tooling-repository-generator/pom.xml | 2 +-
 samples/pom.xml                                              | 2 +-
 subsystem/subsystem-itests/pom.xml                           | 2 +-
 subsystem/subsystem-obr/pom.xml                              | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/application/application-itests/pom.xml b/application/application-itests/pom.xml
index 145ea5b16c..777916d1f9 100644
--- a/application/application-itests/pom.xml
+++ b/application/application-itests/pom.xml
@@ -65,7 +65,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>2.0.10</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.2.0</url.version>
diff --git a/application/application-obr-resolver/pom.xml b/application/application-obr-resolver/pom.xml
index bec93da60e..7656b49edb 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>2.0.10</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 6ec9bcd9f3..6b3eeb6b1a 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>2.0.10</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 4343254fd4..ad5aa05414 100644
--- a/subsystem/subsystem-itests/pom.xml
+++ b/subsystem/subsystem-itests/pom.xml
@@ -55,7 +55,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.10.0.v20140606-1445</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>

From e00671db13f1a3891e26b882fadc4ec12a102b82 Mon Sep 17 00:00:00 2001
From: Dominik Przybysz <alien11689@gmail.com>
Date: Tue, 21 Jan 2025 21:20:12 +0100
Subject: [PATCH 2/2] Implement missing methods

---
 .../util/felix/OsgiCapabilityAdapter.java          |  9 +++++++--
 .../util/felix/OsgiRequirementAdapter.java         | 14 +++++++++++++-
 2 files changed, 20 insertions(+), 3 deletions(-)

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());
 	}