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 2013/01/02 21:09:56 UTC
svn commit: r1427990 - in /camel/branches/camel-2.10.x: ./
components/camel-spring-batch/pom.xml
components/camel-spring-batch/src/test/resources/log4j.properties
Author: bvahdat
Date: Wed Jan 2 20:09:56 2013
New Revision: 1427990
URL: http://svn.apache.org/viewvc?rev=1427990&view=rev
Log:
Merged revisions 1427989 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1427989 | bvahdat | 2013-01-02 21:06:34 +0100 (Mi, 02 Jan 2013) | 1 line
Fixed the tests by camel-spring-batch to log properly (the slf4j static initialization used to fail). Also removed 2 obsolete dependencies from it's pom.
........
Added:
camel/branches/camel-2.10.x/components/camel-spring-batch/src/test/resources/log4j.properties
- copied unchanged from r1427989, camel/trunk/components/camel-spring-batch/src/test/resources/log4j.properties
Modified:
camel/branches/camel-2.10.x/ (props changed)
camel/branches/camel-2.10.x/components/camel-spring-batch/pom.xml
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1427989
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.10.x/components/camel-spring-batch/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-spring-batch/pom.xml?rev=1427990&r1=1427989&r2=1427990&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-spring-batch/pom.xml (original)
+++ camel/branches/camel-2.10.x/components/camel-spring-batch/pom.xml Wed Jan 2 20:09:56 2013
@@ -50,14 +50,14 @@
<!-- Tests -->
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>${commons-lang-version}</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>${commons-lang-version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -72,11 +72,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-core-xml</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-spring</artifactId>
<scope>test</scope>
</dependency>