Repository: servicemix Updated Branches: refs/heads/servicemix-5.2.x 02647ca6e -> 80921b33a refs/heads/servicemix-5.3.x 1c8eb4e4d -> b9ff0016e refs/heads/servicemix-5.4.x a13c1b3d7 -> b8580c2be refs/heads/servicemix-5.5.x 34360e9dd -> 07d353b71
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/07d353b7 Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/07d353b7 Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/07d353b7 Branch: refs/heads/servicemix-5.5.x Commit: 07d353b71ea202b9ee60d18386d22a230f1fd008 Parents: 34360e9 Author: Krzysztof Sobkowiak <[email protected]> Authored: Mon May 11 21:06:32 2015 +0200 Committer: Krzysztof Sobkowiak <[email protected]> Committed: Tue May 12 18:49:49 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/07d353b7/itests/pom.xml ---------------------------------------------------------------------- diff --git a/itests/pom.xml b/itests/pom.xml index f282334..47cd5e4 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/07d353b7/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 660dc23..8512053 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:*")) }
