SLING-1794 - ConfigInstallTest fails: Config must be removed once
authorRobert Munteanu <rombert@apache.org>
Tue, 16 Jul 2013 15:06:06 +0000 (15:06 +0000)
committerRobert Munteanu <rombert@apache.org>
Tue, 16 Jul 2013 15:06:06 +0000 (15:06 +0000)
ConfigurationAdmin restarts: Configuration is still present

Add timestamps to the IT log output to differentiate between test
failures and timing issues.

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1503745 13f79535-47bb-0310-9956-ffa450edef68

src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java

index a52f50c..a36fb5b 100644 (file)
@@ -400,10 +400,16 @@ class OsgiInstallerTestBase implements FrameworkListener {
                 ),
                 systemProperty( "org.ops4j.pax.logging.DefaultServiceLog.level" ).value(paxDebugLevel),
                 provision(
+                        mavenBundle("org.apache.sling", "org.apache.sling.commons.log", "3.0.0"),
+                        mavenBundle("org.apache.sling", "org.apache.sling.commons.logservice", "1.0.2"),
+
+                        mavenBundle("org.slf4j", "slf4j-api", "1.6.4"),
+                        mavenBundle("org.slf4j", "jcl-over-slf4j", "1.6.4"),
+                        mavenBundle("org.slf4j", "log4j-over-slf4j", "1.6.4"),
+
                            mavenBundle("org.apache.felix", "org.apache.felix.scr", "1.6.0"),
                            mavenBundle("org.apache.felix", "org.apache.felix.configadmin", "1.2.8"),
                         mavenBundle("org.apache.felix", "org.apache.felix.metatype", "1.0.2"),
-                           mavenBundle("org.apache.sling", "org.apache.sling.commons.log", "2.1.2"),
                                mavenBundle("org.apache.sling", "org.apache.sling.installer.core", POM_VERSION),
                         mavenBundle("org.apache.sling", "org.apache.sling.installer.factory.configuration", CONFIG_VERSION)
                        )