svn commit: r1427718 - in /camel/trunk: components/camel-guice/pom.xml parent/pom.xml

[da...@apache.org]

Author: davsclaus
Date: Wed Jan  2 09:10:24 2013
New Revision: 1427718

URL: http://svn.apache.org/viewvc?rev=1427718&view=rev
Log:
CAMEL-5903: Various JAR upgrades.

Modified:
    camel/trunk/components/camel-guice/pom.xml
    camel/trunk/parent/pom.xml

Modified: camel/trunk/components/camel-guice/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-guice/pom.xml?rev=1427718&r1=1427717&r2=1427718&view=diff
==============================================================================
--- camel/trunk/components/camel-guice/pom.xml (original)
+++ camel/trunk/components/camel-guice/pom.xml Wed Jan  2 09:10:24 2013
@@ -66,10 +66,11 @@
       <artifactId>slf4j-log4j12</artifactId>
       <scope>test</scope>
     </dependency>
+    <!-- must use older 1.1 version of hamcrest -->
     <dependency>
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest-all</artifactId>
-      <version>${hamcrest-version}</version>
+      <version>1.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>

Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1427718&r1=1427717&r2=1427718&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Wed Jan  2 09:10:24 2013
@@ -54,9 +54,9 @@
     <atomikos-transactions-version>3.8.0</atomikos-transactions-version>
     <avalon-bundle-version>4.3.1_1</avalon-bundle-version>
     <avro-version>1.7.2</avro-version>
-    <avro-bundle-version>1.7.1_1</avro-bundle-version>
-    <aws-java-sdk-bundle-version>1.3.14_1</aws-java-sdk-bundle-version>
-    <aws-java-sdk-version>1.3.25</aws-java-sdk-version>
+    <avro-bundle-version>1.7.2_1</avro-bundle-version>
+    <aws-java-sdk-bundle-version>1.3.26_1</aws-java-sdk-bundle-version>
+    <aws-java-sdk-version>1.3.26</aws-java-sdk-version>
     <!--we must use axiom 1.2.10 with abdera 1.1.2, CAMEL-5109 has more details-->
     <axiom-version>1.2.10</axiom-version>
     <bcel-bundle-version>5.2_4</bcel-bundle-version>
@@ -104,7 +104,7 @@
     <dozer-version>5.3.2</dozer-version>
     <easymock-version>3.1</easymock-version>
     <eclipse-equinox-common-version>3.3.0-v20070426</eclipse-equinox-common-version>
-    <ehcache-bundle-version>2.6.0_1</ehcache-bundle-version>
+    <ehcache-bundle-version>2.6.2_1</ehcache-bundle-version>
     <elasticsearch-bundle-version>0.19.10_1</elasticsearch-bundle-version>
     <elasticsearch-version>0.19.10</elasticsearch-version>
     <el-api-1.0-version>1.0.1</el-api-1.0-version>
@@ -142,9 +142,9 @@
     <gson-version>2.2.2</gson-version>
     <guice-bundle-version>2.0_2</guice-bundle-version>
     <guiceyfruit-version>2.0</guiceyfruit-version>
-    <hadoop-bundle-version>1.0.3_1</hadoop-bundle-version>
-    <hadoop-version>1.0.3</hadoop-version>
-    <hamcrest-version>1.1</hamcrest-version>
+    <hadoop-bundle-version>1.0.4_1</hadoop-bundle-version>
+    <hadoop-version>1.0.4</hadoop-version>
+    <hamcrest-version>1.3</hamcrest-version>
     <hapi-version>2.0</hapi-version>
     <hawtbuf-version>1.9</hawtbuf-version>
     <hawtdb-version>1.6</hawtdb-version>
@@ -201,8 +201,8 @@
     <jruby-version>1.7.1</jruby-version>
     <jsendnsca-version>1.3.1</jsendnsca-version>
     <jsmpp-version>2.1.0_4</jsmpp-version>
-    <jsch-bundle-version>0.1.48_1</jsch-bundle-version>
-    <jsch-version>0.1.48</jsch-version>
+    <jsch-bundle-version>0.1.49_1</jsch-bundle-version>
+    <jsch-version>0.1.49</jsch-version>
     <jsendnsca-bundle-version>1.3.1_3</jsendnsca-bundle-version>
     <jsonlib-bundle-version>2.4_1</jsonlib-bundle-version>
     <jsonlib-version>2.4</jsonlib-version>
@@ -212,7 +212,7 @@
     <jt400-bundle-version>6.7_1</jt400-bundle-version>
     <juel-bundle-version>2.1.2_2</juel-bundle-version> <!-- FIXME cmueller: not in sync! -->
     <juel-version>2.1.3</juel-version>
-    <junit-bundle-version>4.10_1</junit-bundle-version>
+    <junit-bundle-version>4.11_1</junit-bundle-version>
     <junit-version>4.11</junit-version>
     <jython-engine-version>20080611</jython-engine-version>
     <jython-version>2.2.1</jython-version>
@@ -247,7 +247,7 @@
     <ode-version>1.3.4</ode-version>
     <!-- should be in-sync with deltaspike -->
     <openwebbeans-version>1.1.5</openwebbeans-version>
-    <ognl-version>3.0.5_1</ognl-version>
+    <ognl-version>3.0.6_1</ognl-version>
     <openejb-version>3.1.4</openejb-version>
     <openjpa-version>2.2.1</openjpa-version>
     <opensaml-version>2.5.1_2</opensaml-version>
@@ -266,7 +266,7 @@
     <pojosr-version>0.2.1</pojosr-version>
     <protobuf-java-bundle-version>2.3.0_3</protobuf-java-bundle-version>
     <protobuf-version>2.3.0</protobuf-version>
-    <qpid-bundle-version>0.16_1</qpid-bundle-version> <!-- FIXME cmueller: not in sync! -->
+    <qpid-bundle-version>0.18_1</qpid-bundle-version>
     <qpid-version>0.18</qpid-version>
     <quartz-bundle-version>1.8.6_1</quartz-bundle-version>
     <quartz-version>1.8.6</quartz-version>
@@ -286,7 +286,7 @@
     <scala-version>2.9.2</scala-version>
     <scala-maven-plugin-version>3.1.0</scala-maven-plugin-version>
     <scriptengines-version>1.1</scriptengines-version>
-    <serp-bundle-version>1.13.1_4</serp-bundle-version>
+    <serp-bundle-version>1.14.1_1</serp-bundle-version>
     <servicemix-specs-version>1.9.0</servicemix-specs-version>
     <servlet-api-2.5-version>1.1.2</servlet-api-2.5-version>
     <shiro-version>1.2.1</shiro-version>