Author: davsclaus Date: Wed Jan 2 06:30:38 2013 New Revision: 1427669 URL: http://svn.apache.org/viewvc?rev=1427669&view=rev Log: Fixed upgrade to junit 4.11
Modified: camel/trunk/components/camel-quickfix/pom.xml Modified: camel/trunk/components/camel-quickfix/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-quickfix/pom.xml?rev=1427669&r1=1427668&r2=1427669&view=diff ============================================================================== --- camel/trunk/components/camel-quickfix/pom.xml (original) +++ camel/trunk/components/camel-quickfix/pom.xml Wed Jan 2 06:30:38 2013 @@ -78,6 +78,13 @@ <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> <scope>test</scope> + <exclusions> + <!-- exclude hamcrest as we use the version from junit dependency --> + <exclusion> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-core</artifactId> + </exclusion> + </exclusions> </dependency> </dependencies>