Return-Path: 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 01CCA9580 for ; Thu, 5 Jan 2012 19:38:05 +0000 (UTC) Received: (qmail 6865 invoked by uid 500); 5 Jan 2012 19:38:05 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 6795 invoked by uid 500); 5 Jan 2012 19:38:05 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 6787 invoked by uid 99); 5 Jan 2012 19:38:04 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Jan 2012 19:38:04 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Jan 2012 19:38:02 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 749EF2388993 for ; Thu, 5 Jan 2012 19:37:41 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1227781 - in /cxf/branches/2.3.x-fixes: ./ parent/pom.xml rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JSONProviderTest.java Date: Thu, 05 Jan 2012 19:37:41 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120105193741.749EF2388993@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Thu Jan 5 19:37:40 2012 New Revision: 1227781 URL: http://svn.apache.org/viewvc?rev=1227781&view=rev Log: Merged revisions 1225495 via svnmerge from https://svn.us.apache.org/repos/asf/cxf/branches/2.4.x-fixes ................ r1225495 | sergeyb | 2011-12-29 06:19:33 -0500 (Thu, 29 Dec 2011) | 9 lines Merged revisions 1225494 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1225494 | sergeyb | 2011-12-29 11:17:14 +0000 (Thu, 29 Dec 2011) | 1 line [CXF-3999] Update to Jettison 1.3.1 ........ ................ Modified: cxf/branches/2.3.x-fixes/ (props changed) cxf/branches/2.3.x-fixes/parent/pom.xml cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JSONProviderTest.java Propchange: cxf/branches/2.3.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.3.x-fixes/parent/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/parent/pom.xml?rev=1227781&r1=1227780&r2=1227781&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/parent/pom.xml (original) +++ cxf/branches/2.3.x-fixes/parent/pom.xml Thu Jan 5 19:37:40 2012 @@ -531,7 +531,7 @@ org.codehaus.jettison jettison - 1.3 + 1.3.1 stax Modified: cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JSONProviderTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JSONProviderTest.java?rev=1227781&r1=1227780&r2=1227781&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JSONProviderTest.java (original) +++ cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JSONProviderTest.java Thu Jan 5 19:37:40 2012 @@ -529,7 +529,6 @@ public class JSONProviderTest extends As } @Test - @Ignore("Enable once http://jira.codehaus.org/browse/JETTISON-75 gets fixed") public void testWriteMixedContent() throws Exception { doTestMixedContent("{\"Book\":{\"name\":\"CXF\",\"id\":125}}", false, "book.xml");