Skip to content

Bump org.apache.felix:org.apache.felix.bundlerepository from 1.6.4 to 2.0.10 or 1.6.6 #368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alien11689 merged 3 commits into from
Feb 10, 2025
Merged

Bump org.apache.felix:org.apache.felix.bundlerepository from 1.6.4 to 2.0.10 or 1.6.6 #368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4b5da87
Bump org.apache.felix:org.apache.felix.bundlerepository
dependabot[bot] Jan 21, 2025
9c21f94
Implement missing methods
alien11689 Jan 21, 2025
7ca216f
[MAINTENANCE] Bump org.apache.felix.bundlerepository to the highest 1…
alien11689 Feb 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion application/application-itests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion application/application-obr-resolver/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion application/application-tooling-repository-generator/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion samples/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion subsystem/subsystem-itests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion subsystem/subsystem-obr/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
9 changes: 7 additions & 2 deletions ...system-obr/src/main/java/org/apache/aries/subsystem/util/felix/OsgiCapabilityAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down
14 changes: 13 additions & 1 deletion ...ystem-obr/src/main/java/org/apache/aries/subsystem/util/felix/OsgiRequirementAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

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

Expand Down