Return-Path: 
 <commits-return-31424-apmail-cxf-commits-archive=cxf.apache.org@cxf.apache.org>
X-Original-To: apmail-cxf-commits-archive@www.apache.org
Delivered-To: apmail-cxf-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 213C2C450
	for <apmail-cxf-commits-archive@www.apache.org>;
 Mon, 17 Mar 2014 13:23:51 +0000 (UTC)
Received: (qmail 53163 invoked by uid 500); 17 Mar 2014 13:23:49 -0000
Delivered-To: apmail-cxf-commits-archive@cxf.apache.org
Received: (qmail 53124 invoked by uid 500); 17 Mar 2014 13:23:48 -0000
Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cxf.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cxf.apache.org>
List-Post: <mailto:commits@cxf.apache.org>
List-Id: <commits.cxf.apache.org>
Reply-To: dev@cxf.apache.org
Delivered-To: mailing list commits@cxf.apache.org
Received: (qmail 53117 invoked by uid 99); 17 Mar 2014 13:23:47 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Mar 2014 13:23:47 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 0A555945C14; Mon, 17 Mar 2014 13:23:47 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: ffang@apache.org
To: commits@cxf.apache.org
Message-Id: <cf3b37c9665c4981894ea5d960f5316d@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: git commit: [CXF-5611][joda-time] different versions in maven and
 feature descriptor
Date: Mon, 17 Mar 2014 13:23:47 +0000 (UTC)

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 <freeman.fang@gmail.com>
Authored: Mon Mar 17 19:27:45 2014 +0800
Committer: Freeman Fang <freeman.fang@gmail.com>
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>