Author: gertv Date: Fri Jun 1 12:46:45 2012 New Revision: 1345135 URL: http://svn.apache.org/viewvc?rev=1345135&view=rev Log: Merged revisions 1345131 via svnmerge from https://svn.apache.org/repos/asf/camel/branches/camel-2.9.x
........ r1345131 | gertv | 2012-06-01 14:40:50 +0200 (Fri, 01 Jun 2012) | 1 line CAMEL-5322: Upgrade to Hadoop bundle version 0.20.203.0_2 ........ Modified: camel/branches/camel-2.8.x/ (props changed) camel/branches/camel-2.8.x/platforms/karaf/features/pom.xml Propchange: camel/branches/camel-2.8.x/ ------------------------------------------------------------------------------ Merged /camel/branches/camel-2.9.x:r1345131 Propchange: camel/branches/camel-2.8.x/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. 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=1345135&r1=1345134&r2=1345135&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 Jun 1 12:46:45 2012 @@ -70,7 +70,7 @@ <gernimo-annotation-spec-version>1.1.1</gernimo-annotation-spec-version> <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> + <hadoop-bundle-version>0.20.203.0_2</hadoop-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>