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 @@ <dependency> <groupId>org.codehaus.jettison</groupId> <artifactId>jettison</artifactId> - <version>1.3</version> + <version>1.3.1</version> <exclusions> <exclusion> <groupId>stax</groupId> 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");
