You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ja...@apache.org on 2012/07/09 21:36:59 UTC
svn commit: r1359360 - in /servicemix/smx4/features/branches/features-4.4.x:
./ pom.xml
Author: janstey
Date: Mon Jul 9 19:36:59 2012
New Revision: 1359360
URL: http://svn.apache.org/viewvc?rev=1359360&view=rev
Log:
Merged revisions 1302577 via svnmerge from
https://svn.apache.org/repos/asf/servicemix/smx4/features/trunk
........
r1302577 | janstey | 2012-03-19 15:36:12 -0230 (Mon, 19 Mar 2012) | 1 line
SMX4-1115 - align jdom with Camel
........
Modified:
servicemix/smx4/features/branches/features-4.4.x/ (props changed)
servicemix/smx4/features/branches/features-4.4.x/pom.xml
Propchange: servicemix/smx4/features/branches/features-4.4.x/
------------------------------------------------------------------------------
svn:mergeinfo = /servicemix/smx4/features/trunk:1302577
Propchange: servicemix/smx4/features/branches/features-4.4.x/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Jul 9 19:36:59 2012
@@ -1 +1 @@
-/servicemix/smx4/features/trunk:1-1215210,1232811,1244513,1298713,1299584,1307720,1347872,1358015
+/servicemix/smx4/features/trunk:1-1215210,1232811,1244513,1298713,1299584,1302577,1307720,1347872,1358015
Modified: servicemix/smx4/features/branches/features-4.4.x/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/branches/features-4.4.x/pom.xml?rev=1359360&r1=1359359&r2=1359360&view=diff
==============================================================================
--- servicemix/smx4/features/branches/features-4.4.x/pom.xml (original)
+++ servicemix/smx4/features/branches/features-4.4.x/pom.xml Mon Jul 9 19:36:59 2012
@@ -149,7 +149,7 @@
<jaxb-impl.bundle.version>2.2.1.1_1</jaxb-impl.bundle.version>
<jaxp-ri.bundle.version>1.4.4_2</jaxp-ri.bundle.version>
<jdt-core.bundle.version>3.2.3_4</jdt-core.bundle.version>
- <jdom.bundle.version>1.1_3</jdom.bundle.version>
+ <jdom.bundle.version>1.1_4</jdom.bundle.version>
<jetty6.bundle.version>6.1.26_1</jetty6.bundle.version>
<jruby.bundle.version>1.1.2_3</jruby.bundle.version>
<josql.bundle.version>1.5_4</josql.bundle.version>