Merge pull request #522 from apache/dependabot/maven/org.apache.felix…

…-org.apache.felix.configadmin-1.9.26 Bump org.apache.felix:org.apache.felix.configadmin from 1.2.4 to 1.9.26
apache · Feb 27, 2025 · d02eafa · d02eafa
2 parents ef98222 + a14aec4
commit d02eafa
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 22 deletions.
diff --git a/application/application-itests/pom.xml b/application/application-itests/pom.xml
@@ -66,7 +66,7 @@
         <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.6</org.apache.felix.bundlerepository.version>
-        <org.apache.felix.configadmin.version>1.2.4</org.apache.felix.configadmin.version>
+        <org.apache.felix.configadmin.version>1.9.26</org.apache.felix.configadmin.version>
         <org.eclipse.osgi.version>3.8.0.v20120529-1548</org.eclipse.osgi.version>
         <pax-exam.version>4.13.5</pax-exam.version>
         <pax-logging.version>1.7.2</pax-logging.version>

diff --git a/blueprint/itests/blueprint-itests/pom.xml b/blueprint/itests/blueprint-itests/pom.xml
@@ -59,7 +59,7 @@
         <org.apache.aries.proxy.version>1.1.15-SNAPSHOT</org.apache.aries.proxy.version>
         <org.apache.aries.quiesce.api.version>1.0.1-SNAPSHOT</org.apache.aries.quiesce.api.version>
         <org.apache.aries.testsupport.unit.version>2.0.0-SNAPSHOT</org.apache.aries.testsupport.unit.version>
-        <org.apache.felix.configadmin.version>1.8.0</org.apache.felix.configadmin.version>
+        <org.apache.felix.configadmin.version>1.9.26</org.apache.felix.configadmin.version>
         <org.apache.servicemix.bundles.aopalliance.version>1.0_6</org.apache.servicemix.bundles.aopalliance.version>
         <org.apache.servicemix.bundles.spring.version>5.3.39_1</org.apache.servicemix.bundles.spring.version>
         <org.eclipse.osgi.version>3.15.300</org.eclipse.osgi.version>

diff --git a/jmx/jmx-itests/pom.xml b/jmx/jmx-itests/pom.xml
@@ -50,7 +50,7 @@
         <org.apache.aries.proxy.version>1.0.2-SNAPSHOT</org.apache.aries.proxy.version>
         <org.apache.aries.testsupport.unit.version>2.0.0-SNAPSHOT</org.apache.aries.testsupport.unit.version>
         <org.apache.aries.util.version>1.0.0</org.apache.aries.util.version>
-        <org.apache.felix.configadmin.version>1.8.0</org.apache.felix.configadmin.version>
+        <org.apache.felix.configadmin.version>1.9.26</org.apache.felix.configadmin.version>
         <org.eclipse.osgi.version>3.22.0</org.eclipse.osgi.version>
         <pax-exam.version>4.13.5</pax-exam.version>
         <pax-tinybundles.version>2.0.0</pax-tinybundles.version>
@@ -59,6 +59,11 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>org.eclipse.platform</groupId>
+            <artifactId>org.eclipse.osgi</artifactId>
+            <version>${org.eclipse.osgi.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.aries.jmx</groupId>
             <artifactId>org.apache.aries.jmx</artifactId>
@@ -219,11 +224,6 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.platform</groupId>
-            <artifactId>org.eclipse.osgi</artifactId>
-            <version>${org.eclipse.osgi.version}</version>
-        </dependency>
     </dependencies>
 
     <build>

diff --git a/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/AbstractIntegrationTest.java b/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/AbstractIntegrationTest.java
@@ -22,9 +22,6 @@
 import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
 import static org.ops4j.pax.exam.CoreOptions.provision;
 import static org.ops4j.pax.exam.CoreOptions.streamBundle;
-import static org.ops4j.pax.exam.CoreOptions.systemProperty;
-import static org.ops4j.pax.exam.CoreOptions.vmOption;
-import static org.ops4j.pax.exam.CoreOptions.when;
 import static org.ops4j.pax.tinybundles.core.TinyBundles.bundle;
 import static org.ops4j.pax.tinybundles.core.TinyBundles.withBnd;
 

diff --git a/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/PackageStateMBeanTest.java b/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/PackageStateMBeanTest.java
@@ -81,8 +81,17 @@ public void testMBeanInterface() throws IOException {
         long[] exportingBundles2 = packagaState.getExportingBundles("test", "1.0.0");
         assertNull("Shouldn't find a bundle exporting test package", exportingBundles2);
 
+        // jmx-api and jmx are exporting the package - other bundles wires to jmx as the providing one
+        long bundleIdExportingJmxFramework = -1;
+        for (long exportingBundle : exportingBundles) {
+            if (context().getBundle(exportingBundle).getSymbolicName().equals("org.apache.aries.jmx")) {
+                bundleIdExportingJmxFramework = exportingBundle;
+            }
+        }
+        assertTrue("Should find the Aries JMX bundle as exporting org.osgi.jmx.framework", bundleIdExportingJmxFramework > 0);
+
         long[] importingBundlesId = packagaState
-                .getImportingBundles("org.osgi.jmx.framework", "1.7.0", exportingBundles[0]);
+                .getImportingBundles("org.osgi.jmx.framework", "1.7.0", bundleIdExportingJmxFramework);
         assertTrue("Should find bundles importing org.osgi.jmx.framework", importingBundlesId.length > 0);
 
         TabularData table = packagaState.listPackages();
@@ -92,7 +101,7 @@ public void testMBeanInterface() throws IOException {
         assertNotNull("Collection of CompositeData shouldn't be null", colData);
         assertFalse("Collection of CompositeData should contain elements", colData.isEmpty());
 
-        boolean isRemovalPending = packagaState.isRemovalPending("org.osgi.jmx.framework", "1.7.0", exportingBundles[0]);
+        boolean isRemovalPending = packagaState.isRemovalPending("org.osgi.jmx.framework", "1.7.0", bundleIdExportingJmxFramework);
         assertFalse("Should removal pending on org.osgi.jmx.framework be false", isRemovalPending);
     }
 

diff --git a/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java b/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java
@@ -115,12 +115,7 @@ public void testBlueprintMetaDataMBean() throws Exception {
         //find the Blueprint Sample bundle's container service id
         String filter = "(&(osgi.blueprint.container.symbolicname=" // no similar one in interfaces
                 + sample.getSymbolicName() + ")(osgi.blueprint.container.version=" + sample.getVersion() + "))";
-        ServiceReference[] serviceReferences = null;
-        try {
-            serviceReferences = bundleContext.getServiceReferences(BlueprintContainer.class.getName(), filter);
-        } catch (InvalidSyntaxException e) {
-            throw new RuntimeException(e);
-        }
+        ServiceReference[] serviceReferences = bundleContext.getServiceReferences(BlueprintContainer.class.getName(), filter);
         long sampleBlueprintContainerServiceId = (Long) serviceReferences[0].getProperty(Constants.SERVICE_ID);
 
         //retrieve the proxy object

diff --git a/...src/test/java/org/apache/aries/jmx/whiteboard/integration/helper/IntegrationTestBase.java b/...src/test/java/org/apache/aries/jmx/whiteboard/integration/helper/IntegrationTestBase.java
@@ -87,7 +87,7 @@ public static Option[] configuration() {
 
                 bundle(bundleFile.toURI().toString()),
                 mavenBundle("org.ops4j.pax.tinybundles", "tinybundles", "2.0.0"),
-                mavenBundle("org.apache.felix", "org.apache.felix.configadmin", "1.2.8"),
+                mavenBundle("org.apache.felix", "org.apache.felix.configadmin", "1.9.26"),
                 mavenBundle("org.ops4j.pax.logging", "pax-logging-api", "1.7.2"),
                 mavenBundle("org.ops4j.pax.logging", "pax-logging-service", "1.7.2"));
 

diff --git a/subsystem/subsystem-itests/pom.xml b/subsystem/subsystem-itests/pom.xml
@@ -58,7 +58,7 @@
         <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>2.0.10</org.apache.felix.bundlerepository.version>
-        <org.apache.felix.configadmin.version>1.8.0</org.apache.felix.configadmin.version>
+        <org.apache.felix.configadmin.version>1.9.26</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>
         <org.osgi.service.obr.version>1.0.2</org.osgi.service.obr.version>

diff --git a/transaction/transaction-itests/pom.xml b/transaction/transaction-itests/pom.xml
@@ -59,7 +59,7 @@
         <org.apache.aries.transaction.testbundle.version>1.0.1-SNAPSHOT</org.apache.aries.transaction.testbundle.version>
         <org.apache.aries.transaction.testds.version>1.0.1-SNAPSHOT</org.apache.aries.transaction.testds.version>
         <org.apache.aries.util.version>1.1.3</org.apache.aries.util.version>
-        <org.apache.felix.configadmin.version>1.8.4</org.apache.felix.configadmin.version>
+        <org.apache.felix.configadmin.version>1.9.26</org.apache.felix.configadmin.version>
         <org.apache.felix.coordinator.version>1.0.2</org.apache.felix.coordinator.version>
         <org.apache.servicemix.bundles.javax-inject.version>1_2</org.apache.servicemix.bundles.javax-inject.version>
         <org.eclipse.osgi.version>3.22.0</org.eclipse.osgi.version>