Author: dkulp
Date: Fri Jun 29 14:34:06 2012
New Revision: 1355411
URL: http://svn.apache.org/viewvc?rev=1355411&view=rev
Log:
Merged revisions 1353650 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1353650 | dkulp | 2012-06-25 12:51:00 -0400 (Mon, 25 Jun 2012) | 2 lines
Latest version of JIBX uses newer yoda-time
........
Modified:
cxf/branches/2.6.x-fixes/osgi/karaf/features/src/main/resources/features.xml
cxf/branches/2.6.x-fixes/parent/pom.xml
Modified:
cxf/branches/2.6.x-fixes/osgi/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/osgi/karaf/features/src/main/resources/features.xml?rev=1355411&r1=1355410&r2=1355411&view=diff
==============================================================================
---
cxf/branches/2.6.x-fixes/osgi/karaf/features/src/main/resources/features.xml
(original)
+++
cxf/branches/2.6.x-fixes/osgi/karaf/features/src/main/resources/features.xml
Fri Jun 29 14:34:06 2012
@@ -211,7 +211,7 @@
<feature name="cxf-databinding-jibx" version="${project.version}"
resolver='(obr)'>
<feature version="${project.version}">cxf-core</feature>
<feature version="${project.version}">cxf-tools</feature>
- <bundle start-level='25'
dependency="true">mvn:joda-time/joda-time/${cxf.joda.time.version}</bundle>
+ <bundle start-level='25'
dependency="true">mvn:joda-time/joda-time/${cxf.joda.time.version2}</bundle>
<bundle start-level='40'
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/${cxf.xpp3.bundle.version}</bundle>
<bundle start-level='40'
dependency='true'>mvn:org.jibx/jibx-run/${cxf.jibx.version}</bundle>
<bundle start-level='40'
dependency='true'>mvn:org.jibx/jibx-bind/${cxf.jibx.version}</bundle>
Modified: cxf/branches/2.6.x-fixes/parent/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/parent/pom.xml?rev=1355411&r1=1355410&r2=1355411&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.6.x-fixes/parent/pom.xml Fri Jun 29 14:34:06 2012
@@ -132,6 +132,7 @@
<cxf.jettison.version>1.3.1</cxf.jettison.version>
<cxf.wss4j.version>1.6.7-SNAPSHOT</cxf.wss4j.version>
<cxf.joda.time.version>1.6.2</cxf.joda.time.version>
+ <cxf.joda.time.version2>2.1</cxf.joda.time.version2>
<cxf.opensaml.version>2.5.1</cxf.opensaml.version>
<cxf.opensamlws.version>1.4.2-1</cxf.opensamlws.version>
<cxf.opensaml.osgi.version>2.5.1_2</cxf.opensaml.osgi.version>
