Author: janstey
Date: Fri Nov 4 16:26:23 2011
New Revision: 1197629
URL: http://svn.apache.org/viewvc?rev=1197629&view=rev
Log:
Merged revisions 1196210 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1196210 | davsclaus | 2011-11-01 16:32:57 -0230 (Tue, 01 Nov 2011) | 1 line
CAMEL-4585: Upgraded quickfix, cometd and netty osgi versions.
........
Modified:
camel/branches/camel-2.8.x/ (props changed)
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 Nov 4 16:26:23 2011
@@ -1 +1 @@
-/camel/trunk:1186106,1186625,1186772,1187221,1187485,1187882,1187893,1188070-1188085,1188642,1188674,1188879,1188881,1189139,1189600,1189681,1189693,1189737,1190212-1190213,1190246,1190303,1195317,1195616,1197450
+/camel/trunk:1186106,1186625,1186772,1187221,1187485,1187882,1187893,1188070-1188085,1188642,1188674,1188879,1188881,1189139,1189600,1189681,1189693,1189737,1190212-1190213,1190246,1190303,1195317,1195616,1196210,1197450
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
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=1197629&r1=1197628&r2=1197629&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/parent/pom.xml (original)
+++ camel/branches/camel-2.8.x/parent/pom.xml Fri Nov 4 16:26:23 2011
@@ -118,7 +118,7 @@
<mockito-version>1.8.5</mockito-version>
<mvel-version>2.0.18</mvel-version>
<mybatis-version>3.0.4</mybatis-version>
- <netty-bundle-version>3.2.5.Final_1</netty-bundle-version>
+ <netty-bundle-version>3.2.6.Final_1</netty-bundle-version>
<ode-version>1.3.3</ode-version>
<ognl-version>2.7.3_3</ognl-version>
<osgi-version>4.2.0</osgi-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=1197629&r1=1197628&r2=1197629&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 Nov 4
16:26:23 2011
@@ -41,7 +41,7 @@
<aws-java-sdk-bundle-version>1.1.1_1</aws-java-sdk-bundle-version>
<bcel-bundle-version>5.2_3</bcel-bundle-version>
<cglib-version>2.1_3_6</cglib-version>
-
<cometd-java-server-bundle-version>2.3.1_1-SNAPSHOT</cometd-java-server-bundle-version>
+
<cometd-java-server-bundle-version>2.3.1_1</cometd-java-server-bundle-version>
<commons-beanutils-bundle-version>1.7.0_3</commons-beanutils-bundle-version>
<commons-csv-version>1.0-r706899_3</commons-csv-version>
<commons-codec-version>${commons-code}</commons-codec-version>
@@ -116,7 +116,7 @@
<pax.web.version>0.7.2</pax.web.version>
<quartz-bundle-version>1.8.3_2</quartz-bundle-version>
<qpid-bundle-version>0.5.0_2</qpid-bundle-version>
- <quickfix-bundle-version>1.5.1_1-SNAPSHOT</quickfix-bundle-version>
+ <quickfix-bundle-version>1.5.1_1</quickfix-bundle-version>
<regexp-bundle-version>1.3_1</regexp-bundle-version>
<rome-bundle-version>1.0_1</rome-bundle-version>
<saxon-bundle-version>9.1.0.8_1</saxon-bundle-version>
