camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r1209383 - in /camel/branches/camel-2.8.x: ./ components/camel-guice/pom.xml parent/pom.xml platforms/karaf/features/pom.xml
Date Fri, 02 Dec 2011 08:09:36 GMT
Author: davsclaus
Date: Fri Dec  2 08:09:34 2011
New Revision: 1209383

URL: http://svn.apache.org/viewvc?rev=1209383&view=rev
Log:
CAMEL-4674: Use hamcrest 1.1 which is in central repo. Only used by camel-guice for testing.

Modified:
    camel/branches/camel-2.8.x/   (props changed)
    camel/branches/camel-2.8.x/components/camel-guice/pom.xml
    camel/branches/camel-2.8.x/parent/pom.xml
    camel/branches/camel-2.8.x/platforms/karaf/features/pom.xml

Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  2 08:09:34 2011
@@ -1 +1 @@
-/camel/trunk:1202148,1202167,1202204-1202206,1202215,1202223,1202659,1202685,1203879,1203978,1204338,1205124,1205372,1205412,1205429,1205431,1205713,1206116,1206414,1207743,1207784,1208301,1208930,1208964-1208965,1209006-1209007
+/camel/trunk:1202148,1202167,1202204-1202206,1202215,1202223,1202659,1202685,1203879,1203978,1204338,1205124,1205372,1205412,1205429,1205431,1205713,1206116,1206414,1207743,1207784,1208301,1208930,1208964-1208965,1209006-1209007,1209382

Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: camel/branches/camel-2.8.x/components/camel-guice/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-guice/pom.xml?rev=1209383&r1=1209382&r2=1209383&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-guice/pom.xml (original)
+++ camel/branches/camel-2.8.x/components/camel-guice/pom.xml Fri Dec  2 08:09:34 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/branches/camel-2.8.x/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/parent/pom.xml?rev=1209383&r1=1209382&r2=1209383&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/parent/pom.xml (original)
+++ camel/branches/camel-2.8.x/parent/pom.xml Fri Dec  2 08:09:34 2011
@@ -1280,11 +1280,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/branches/camel-2.8.x/platforms/karaf/features/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/platforms/karaf/features/pom.xml?rev=1209383&r1=1209382&r2=1209383&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/platforms/karaf/features/pom.xml (original)
+++ camel/branches/camel-2.8.x/platforms/karaf/features/pom.xml Fri Dec  2 08:09:34 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>
       <httpcore-bundle-version>4.0-alpha6_1</httpcore-bundle-version>



Mime
View raw message