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 17:59:31 UTC
camel git commit: Polish
Repository: camel
Updated Branches:
refs/heads/master 758c28e5a -> 2f611c7ad
Polish
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2f611c7a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2f611c7a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2f611c7a
Branch: refs/heads/master
Commit: 2f611c7ad366e573f4fc909535b197cb307b6d61
Parents: 758c28e
Author: Babak Vahdat <bv...@apache.org>
Authored: Tue Dec 29 17:59:15 2015 +0100
Committer: Babak Vahdat <bv...@apache.org>
Committed: Tue Dec 29 17:59:15 2015 +0100
----------------------------------------------------------------------
tests/camel-itest-osgi/pom.xml | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/2f611c7a/tests/camel-itest-osgi/pom.xml
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/pom.xml b/tests/camel-itest-osgi/pom.xml
index 28e332b..df2f8be 100644
--- a/tests/camel-itest-osgi/pom.xml
+++ b/tests/camel-itest-osgi/pom.xml
@@ -250,16 +250,16 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.jvnet.mock-javamail</groupId>
- <artifactId>mock-javamail</artifactId>
- <version>${mock-javamail-version}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- </exclusion>
- </exclusions>
- <scope>test</scope>
+ <groupId>org.jvnet.mock-javamail</groupId>
+ <artifactId>mock-javamail</artifactId>
+ <version>${mock-javamail-version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ </exclusion>
+ </exclusions>
+ <scope>test</scope>
</dependency>
<!-- cxf -->
@@ -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>