diff --git a/application/application-itests/pom.xml b/application/application-itests/pom.xml index ce13d04c3a..32ea39feb9 100644 --- a/application/application-itests/pom.xml +++ b/application/application-itests/pom.xml @@ -66,7 +66,7 @@ 1.0.0 1.0.0 1.6.6 - 1.2.4 + 1.9.26 3.8.0.v20120529-1548 4.13.5 1.7.2 diff --git a/blueprint/itests/blueprint-itests/pom.xml b/blueprint/itests/blueprint-itests/pom.xml index 879221fd72..0fe3194775 100644 --- a/blueprint/itests/blueprint-itests/pom.xml +++ b/blueprint/itests/blueprint-itests/pom.xml @@ -59,7 +59,7 @@ 1.1.15-SNAPSHOT 1.0.1-SNAPSHOT 2.0.0-SNAPSHOT - 1.8.0 + 1.9.26 1.0_6 5.3.39_1 3.15.300 diff --git a/jmx/jmx-itests/pom.xml b/jmx/jmx-itests/pom.xml index 363afd7733..a18b617218 100644 --- a/jmx/jmx-itests/pom.xml +++ b/jmx/jmx-itests/pom.xml @@ -50,7 +50,7 @@ 1.0.2-SNAPSHOT 2.0.0-SNAPSHOT 1.0.0 - 1.8.0 + 1.9.26 3.22.0 4.13.5 2.0.0 @@ -59,6 +59,11 @@ + + org.eclipse.platform + org.eclipse.osgi + ${org.eclipse.osgi.version} + org.apache.aries.jmx org.apache.aries.jmx @@ -219,11 +224,6 @@ junit test - - org.eclipse.platform - org.eclipse.osgi - ${org.eclipse.osgi.version} - 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 index 48f2493c39..f6f3f3e893 100644 --- 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 index bc0a9203ad..5415e63431 100644 --- 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 index 7b606204d4..1b0dd9193d 100644 --- 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/jmx/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/helper/IntegrationTestBase.java b/jmx/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/helper/IntegrationTestBase.java index 18a14e1d3d..56668c9d03 100644 --- a/jmx/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/helper/IntegrationTestBase.java +++ b/jmx/jmx-whiteboard/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 index 42936e0bc0..599af21582 100644 --- a/subsystem/subsystem-itests/pom.xml +++ b/subsystem/subsystem-itests/pom.xml @@ -58,7 +58,7 @@ 2.0.0-SNAPSHOT 1.1.0 2.0.10 - 1.8.0 + 1.9.26 1.2.200.v20120522-2049 3.11.3 1.0.2 diff --git a/transaction/transaction-itests/pom.xml b/transaction/transaction-itests/pom.xml index 825285e1c9..e29ba5aaa0 100644 --- a/transaction/transaction-itests/pom.xml +++ b/transaction/transaction-itests/pom.xml @@ -59,7 +59,7 @@ 1.0.1-SNAPSHOT 1.0.1-SNAPSHOT 1.1.3 - 1.8.4 + 1.9.26 1.0.2 1_2 3.22.0