Author: ffang
Date: Thu Jun 20 06:27:25 2013
New Revision: 1494864
URL: http://svn.apache.org/r1494864
Log:
[SM-2203]Intermittent itest failures
Modified:
servicemix/smx5/trunk/itests/src/test/scala/org/apache/servicemix/itests/IntegrationTestConfigurations.scala
servicemix/smx5/trunk/itests/src/test/scala/org/apache/servicemix/itests/IntegrationTestSupport.scala
servicemix/smx5/trunk/parent/pom.xml
Modified:
servicemix/smx5/trunk/itests/src/test/scala/org/apache/servicemix/itests/IntegrationTestConfigurations.scala
URL:
http://svn.apache.org/viewvc/servicemix/smx5/trunk/itests/src/test/scala/org/apache/servicemix/itests/IntegrationTestConfigurations.scala?rev=1494864&r1=1494863&r2=1494864&view=diff
==============================================================================
---
servicemix/smx5/trunk/itests/src/test/scala/org/apache/servicemix/itests/IntegrationTestConfigurations.scala
(original)
+++
servicemix/smx5/trunk/itests/src/test/scala/org/apache/servicemix/itests/IntegrationTestConfigurations.scala
Thu Jun 20 06:27:25 2013
@@ -38,7 +38,7 @@ trait IntegrationTestConfigurations {
* Add support for Scala-based integration tests
*/
def scalaTestConfiguration =
- Array(mavenBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.scala-library").versionAsInProject())
+ Array(mavenBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.scala-library").versionAsInProject().start())
/**
* Add an Apache ServiceMix container configuration
Modified:
servicemix/smx5/trunk/itests/src/test/scala/org/apache/servicemix/itests/IntegrationTestSupport.scala
URL:
http://svn.apache.org/viewvc/servicemix/smx5/trunk/itests/src/test/scala/org/apache/servicemix/itests/IntegrationTestSupport.scala?rev=1494864&r1=1494863&r2=1494864&view=diff
==============================================================================
---
servicemix/smx5/trunk/itests/src/test/scala/org/apache/servicemix/itests/IntegrationTestSupport.scala
(original)
+++
servicemix/smx5/trunk/itests/src/test/scala/org/apache/servicemix/itests/IntegrationTestSupport.scala
Thu Jun 20 06:27:25 2013
@@ -47,7 +47,7 @@ abstract class IntegrationTestSupport ex
*/
val registrations = ArrayBuffer.empty[ServiceRegistration[_]]
- @After
+ @Before
def clearLogging = logging.clear
/*
Modified: servicemix/smx5/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx5/trunk/parent/pom.xml?rev=1494864&r1=1494863&r2=1494864&view=diff
==============================================================================
--- servicemix/smx5/trunk/parent/pom.xml (original)
+++ servicemix/smx5/trunk/parent/pom.xml Thu Jun 20 06:27:25 2013
@@ -44,7 +44,7 @@
<felix.obr.version>1.6.6</felix.obr.version>
- <karaf.version>2.3.1</karaf.version>
+ <karaf.version>2.3.2-SNAPSHOT</karaf.version>
<aries.version>1.0.0</aries.version>
<aries.transaction.version>1.0.1</aries.transaction.version>
<pax.logging.version>1.7.0</pax.logging.version>
