Repository: cxf Updated Branches: refs/heads/2.6.x-fixes f1d805e4f -> f24c03ce0
[CXF-5611][joda-time] different versions in maven and feature descriptor Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f24c03ce Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f24c03ce Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f24c03ce Branch: refs/heads/2.6.x-fixes Commit: f24c03ce0f34fddd0ec85d6063613e9416807f1e Parents: f1d805e Author: Freeman Fang <[email protected]> Authored: Mon Mar 17 19:27:45 2014 +0800 Committer: Freeman Fang <[email protected]> Committed: Mon Mar 17 19:27:45 2014 +0800 ---------------------------------------------------------------------- osgi/karaf/features/src/main/resources/features.xml | 2 +- parent/pom.xml | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/f24c03ce/osgi/karaf/features/src/main/resources/features.xml ---------------------------------------------------------------------- diff --git a/osgi/karaf/features/src/main/resources/features.xml b/osgi/karaf/features/src/main/resources/features.xml index 51138b3..cc19bfa 100644 --- a/osgi/karaf/features/src/main/resources/features.xml +++ b/osgi/karaf/features/src/main/resources/features.xml @@ -205,7 +205,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.version2}</bundle> + <bundle start-level='25' dependency="true">mvn:joda-time/joda-time/${cxf.joda.time.version}</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> http://git-wip-us.apache.org/repos/asf/cxf/blob/f24c03ce/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 2e1fec7..92b48a7 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -125,8 +125,7 @@ <cxf.jetty.osgi.version>[7.2,8.2)</cxf.jetty.osgi.version> <cxf.jetty.version>7.5.4.v20111024</cxf.jetty.version> <cxf.jibx.version>1.2.4.5</cxf.jibx.version> - <cxf.joda.time.version>1.6.2</cxf.joda.time.version> - <cxf.joda.time.version2>2.1</cxf.joda.time.version2> + <cxf.joda.time.version>2.2</cxf.joda.time.version> <cxf.junit.version>4.11</cxf.junit.version> <cxf.maven.core.version>2.2.1</cxf.maven.core.version> <cxf.msv.version>2011.1</cxf.msv.version>
