You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ks...@apache.org on 2015/05/12 18:44:53 UTC
servicemix git commit: SM-2551: Drools6ExamplesTest fails on Jenkins
Repository: servicemix
Updated Branches:
refs/heads/master ef790ff99 -> 72f16e176
SM-2551: Drools6ExamplesTest fails on Jenkins
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/72f16e17
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/72f16e17
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/72f16e17
Branch: refs/heads/master
Commit: 72f16e1768e336dbd6d70b96b9089c76e6d848cb
Parents: ef790ff
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Mon May 11 21:06:32 2015 +0200
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Tue May 12 18:29:37 2015 +0200
----------------------------------------------------------------------
itests/pom.xml | 30 ++++++++++++++++++--
.../itests/IntegrationTestConfigurations.scala | 5 +++-
2 files changed, 32 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/72f16e17/itests/pom.xml
----------------------------------------------------------------------
diff --git a/itests/pom.xml b/itests/pom.xml
index 870e06f..2b5ebea 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -133,9 +133,8 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
- <argLine>-Dorg.ops4j.pax.url.mvn.localRepository=${settings.localRepository}</argLine>
<systemPropertyVariables>
- <org.ops4j.pax.logging.DefaultServiceLog.level>INFO</org.ops4j.pax.logging.DefaultServiceLog.level>
+ <org.ops4j.pax.logging.DefaultServiceLog.level>INFO</org.ops4j.pax.logging.DefaultServiceLog.level>
</systemPropertyVariables>
</configuration>
</plugin>
@@ -156,4 +155,31 @@
</build>
+ <profiles>
+ <profile>
+ <id>ci-build-profile</id>
+ <activation>
+ <property>
+ <name>maven.repo.local</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <!-- when the local repo location has been specified, we need to pass on this information to PAX mvn url -->
+ <argLine>-Dorg.ops4j.pax.url.mvn.localRepository=${maven.repo.local}</argLine>
+ <systemPropertyVariables>
+ <org.ops4j.pax.logging.DefaultServiceLog.level>INFO</org.ops4j.pax.logging.DefaultServiceLog.level>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/72f16e17/itests/src/test/scala/org/apache/servicemix/itests/IntegrationTestConfigurations.scala
----------------------------------------------------------------------
diff --git a/itests/src/test/scala/org/apache/servicemix/itests/IntegrationTestConfigurations.scala b/itests/src/test/scala/org/apache/servicemix/itests/IntegrationTestConfigurations.scala
index fce31d0..d1ac100 100644
--- a/itests/src/test/scala/org/apache/servicemix/itests/IntegrationTestConfigurations.scala
+++ b/itests/src/test/scala/org/apache/servicemix/itests/IntegrationTestConfigurations.scala
@@ -55,7 +55,10 @@ trait IntegrationTestConfigurations {
unpackDirectory(new File(s"target/pax-exam/${artifact}")).
useDeployFolder(false),
keepRuntimeFolder(),
- systemProperty("org.ops4j.pax.url.mvn.localRepository").value(LOCAL_REPOSITORY),
+ when(LOCAL_REPOSITORY.length() > 0).useOptions(
+ //systemProperty("org.ops4j.pax.url.mvn.localRepository").value(LOCAL_REPOSITORY)
+ editConfigurationFilePut("etc/org.ops4j.pax.url.mvn.cfg", "org.ops4j.pax.url.mvn.localRepository", LOCAL_REPOSITORY)
+ ),
// TODO: investigate why we need this to get Pax Logging going again
editConfigurationFilePut("etc/org.ops4j.pax.logging.cfg", "log4j.rootLogger", "DEBUG,stdout,osgi:*"))
}