cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1225495 - in /cxf/branches/2.4.x-fixes: ./ parent/pom.xml rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JSONProviderTest.java
Date Thu, 29 Dec 2011 11:19:34 GMT
Author: sergeyb
Date: Thu Dec 29 11:19:33 2011
New Revision: 1225495

URL: http://svn.apache.org/viewvc?rev=1225495&view=rev
Log:
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.4.x-fixes/   (props changed)
    cxf/branches/2.4.x-fixes/parent/pom.xml
    cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JSONProviderTest.java

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 29 11:19:33 2011
@@ -1 +1 @@
-/cxf/trunk:1225217
+/cxf/trunk:1225217,1225494

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.4.x-fixes/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/parent/pom.xml?rev=1225495&r1=1225494&r2=1225495&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/parent/pom.xml Thu Dec 29 11:19:33 2011
@@ -97,7 +97,7 @@
         <cxf.xmlschema.version>2.0.1</cxf.xmlschema.version>
         <cxf.jibx.version>1.2.3</cxf.jibx.version>
         <cxf.axiom.version>1.2.10</cxf.axiom.version>
-        <cxf.jettison.version>1.3</cxf.jettison.version>
+        <cxf.jettison.version>1.3.1</cxf.jettison.version>
         <cxf.wss4j.version>1.6.4</cxf.wss4j.version>
         <cxf.joda.time.version>1.6.2</cxf.joda.time.version>
         <cxf.opensaml.version>2.5.1</cxf.opensaml.version>

Modified: cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JSONProviderTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JSONProviderTest.java?rev=1225495&r1=1225494&r2=1225495&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JSONProviderTest.java
(original)
+++ cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JSONProviderTest.java
Thu Dec 29 11:19:33 2011
@@ -575,7 +575,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");



Mime
View raw message