SLING-5779 : Packaged OSGi config intermittently do not get installed before bundle...
authorCarsten Ziegeler <cziegeler@apache.org>
Mon, 31 Oct 2016 09:31:35 +0000 (09:31 +0000)
committerCarsten Ziegeler <cziegeler@apache.org>
Mon, 31 Oct 2016 09:31:35 +0000 (09:31 +0000)
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1767231 13f79535-47bb-0310-9956-ffa450edef68

pom.xml
src/test/java/org/apache/sling/installer/it/ConfigInstallTest.java
src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java

diff --git a/pom.xml b/pom.xml
index 37942da..b6e8a1f 100644 (file)
--- a/pom.xml
+++ b/pom.xml
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.framework</artifactId>
-            <version>5.6.0</version>
+            <version>5.6.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
index 97a56b9..a7d89b3 100644 (file)
@@ -71,6 +71,7 @@ public class ConfigInstallTest extends OsgiInstallerTestBase implements Configur
         serviceRegistrations.add(bundleContext.registerService(ConfigurationListener.class.getName(), this, null));
 
         final InstallationListener il = new InstallationListener() {
+            @Override
             public void onEvent(InstallationEvent event) {
                 installationEvents++;
             }
@@ -95,6 +96,7 @@ public class ConfigInstallTest extends OsgiInstallerTestBase implements Configur
     /**
      * @see org.osgi.service.cm.ConfigurationListener#configurationEvent(org.osgi.service.cm.ConfigurationEvent)
      */
+    @Override
     public void configurationEvent(final ConfigurationEvent e) {
         if ( e.getType() == ConfigurationEvent.CM_DELETED || e.getType() == ConfigurationEvent.CM_UPDATED) {
             synchronized ( events ) {
@@ -452,14 +454,17 @@ public class ConfigInstallTest extends OsgiInstallerTestBase implements Configur
         final ServiceTracker st = new ServiceTracker(bundleContext,
                 ResourceTransformer.class.getName(), new ServiceTrackerCustomizer() {
 
+            @Override
             public void removedService(ServiceReference reference, Object service) {
                 bundleContext.ungetService(reference);
                 transformerCount.decrementAndGet();
             }
 
+            @Override
             public void modifiedService(ServiceReference reference, Object service) {
             }
 
+            @Override
             public Object addingService(ServiceReference reference) {
                 transformerCount.incrementAndGet();
                 return bundleContext.getService(reference);
index 3b6c7e2..03cd016 100644 (file)
@@ -512,7 +512,7 @@ public class OsgiInstallerTestBase implements FrameworkListener {
                         mavenBundle("org.slf4j", "log4j-over-slf4j", "1.7.5"),
 
                            mavenBundle("org.apache.felix", "org.apache.felix.scr", "2.0.6"),
-                           mavenBundle("org.apache.felix", "org.apache.felix.configadmin", "1.8.10"),
+                           mavenBundle("org.apache.felix", "org.apache.felix.configadmin", "1.8.12"),
                         mavenBundle("org.apache.felix", "org.apache.felix.metatype", "1.1.2"),
                                mavenBundle("org.apache.sling", "org.apache.sling.installer.core", POM_VERSION).startLevel(5),
                         mavenBundle("org.apache.sling", "org.apache.sling.installer.factory.configuration", CONFIG_VERSION).startLevel(5)