Author: davsclaus
Date: Fri Dec 2 08:06:29 2011
New Revision: 1209382
URL: http://svn.apache.org/viewvc?rev=1209382&view=rev
Log:
CAMEL-4674: Use hamcrest 1.1 which is in central repo. Only used by camel-guice
for testing.
Modified:
camel/trunk/components/camel-guice/pom.xml
camel/trunk/parent/pom.xml
camel/trunk/platforms/karaf/features/pom.xml
Modified: camel/trunk/components/camel-guice/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-guice/pom.xml?rev=1209382&r1=1209381&r2=1209382&view=diff
==============================================================================
--- camel/trunk/components/camel-guice/pom.xml (original)
+++ camel/trunk/components/camel-guice/pom.xml Fri Dec 2 08:06:29 2011
@@ -65,6 +65,7 @@
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-all</artifactId>
+ <version>${hamcrest-version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1209382&r1=1209381&r2=1209382&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Fri Dec 2 08:06:29 2011
@@ -81,7 +81,7 @@
<guiceyfruit-version>2.0</guiceyfruit-version>
<h2-version>1.3.161</h2-version>
<hadoop-version>0.20.203.0</hadoop-version>
- <hamcrest-version>1.2-dev1</hamcrest-version>
+ <hamcrest-version>1.1</hamcrest-version>
<hapi-version>1.2</hapi-version>
<hawtbuf-version>1.6</hawtbuf-version>
<hawtdb-version>1.6</hawtdb-version>
@@ -1312,11 +1312,6 @@
<version>${testng-version}</version>
</dependency>
<dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-all</artifactId>
- <version>${hamcrest-version}</version>
- </dependency>
- <dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>${easymock-version}</version>
Modified: camel/trunk/platforms/karaf/features/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=1209382&r1=1209381&r2=1209382&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Fri Dec 2 08:06:29 2011
@@ -71,7 +71,6 @@
<gernimo-jaxws22-spec-version>1.1</gernimo-jaxws22-spec-version>
<guice-bundle-version>2.0_2</guice-bundle-version>
<hadoop-bundle-version>0.20.203.0_1</hadoop-bundle-version>
- <hamcrest-bundle-version>1.2-dev2_4</hamcrest-bundle-version>
<hapi-bundle-version>0.5.1_5</hapi-bundle-version>
<hibernate-validator-bundle-version>4.1.0.Final_2</hibernate-validator-bundle-version>
<ibatis-bundle-version>2.3.4.726_2</ibatis-bundle-version>
