You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bv...@apache.org on 2015/12/29 18:59:09 UTC
camel git commit: undo the comment formatting to what it was before
Repository: camel
Updated Branches:
refs/heads/master 41c2d6ca9 -> 7e290781d
undo the comment formatting to what it was before
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7e290781
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7e290781
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7e290781
Branch: refs/heads/master
Commit: 7e290781d6abbdbf2f7df532af1bb2e115ecbbc7
Parents: 41c2d6c
Author: Babak Vahdat <bv...@apache.org>
Authored: Tue Dec 29 18:59:03 2015 +0100
Committer: Babak Vahdat <bv...@apache.org>
Committed: Tue Dec 29 18:59:03 2015 +0100
----------------------------------------------------------------------
tests/camel-itest-osgi/pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/7e290781/tests/camel-itest-osgi/pom.xml
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/pom.xml b/tests/camel-itest-osgi/pom.xml
index df2f8be..9ab198d 100644
--- a/tests/camel-itest-osgi/pom.xml
+++ b/tests/camel-itest-osgi/pom.xml
@@ -608,15 +608,15 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds>
- <!-- when the local repo location has been specified, we need
- to pass on this information to PAX mvn url -->
+ <!-- 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>
<includes>
<include>**/*Test.*</include>
</includes>
<excludes>
- <!--There are some conflicts of the JAXB OSGi bundle and
- Hudson System jar so I comment out these JAXB related tests -->
+ <!--There are some conflicts of the JAXB OSGi bundle and Hudson System
+ jar so I comment out these JAXB related tests -->
<exclude>**/OSGiIntegrationSpringTest.*</exclude>
<exclude>**/JaxbFallbackConverterTest.*</exclude>
<exclude>**/FtpConsumeTest.*</exclude>