Author: rombert
Date: Tue Jul 16 15:06:06 2013
New Revision: 1503745
URL: http://svn.apache.org/r1503745
Log:
SLING-1794 - ConfigInstallTest fails: Config must be removed once
ConfigurationAdmin restarts: Configuration is still present
Add timestamps to the IT log output to differentiate between test
failures and timing issues.
Modified:
sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java
Modified:
sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java
URL:
http://svn.apache.org/viewvc/sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java?rev=1503745&r1=1503744&r2=1503745&view=diff
==============================================================================
---
sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java
(original)
+++
sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java
Tue Jul 16 15:06:06 2013
@@ -400,10 +400,16 @@ class OsgiInstallerTestBase implements F
),
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)
)
