Skip to content

Commit 623e6ad

Browse files
committed
Merge branch '2.11'
2 parents 1e3427c + 0bd3c3a commit 623e6ad

File tree

3 files changed

+19
-5
lines changed

3 files changed

+19
-5
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ Some data-binding types overridden as well (ObjectMapper sub-classed as XmlMappe
8383
<dependency>
8484
<groupId>com.fasterxml.woodstox</groupId>
8585
<artifactId>woodstox-core</artifactId>
86-
<version>6.0.1</version>
86+
<version>6.0.2</version>
8787
<exclusions>
8888
<exclusion>
8989
<groupId>javax.xml.stream</groupId>

release-notes/VERSION-2.x

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,14 @@ Project: jackson-dataformat-xml
44
= Releases
55
------------------------------------------------------------------------
66

7+
2.11.0 (not yet released)
8+
9+
-
10+
11+
2.10.1 (not yet released)
12+
13+
- Upgrade Woodstox dependency to 6.0.2
14+
715
2.10.0 (26-Sep-2019)
816

917
#242: Deserialization of class inheritance depends on attributes order

src/test/java/com/fasterxml/jackson/dataformat/xml/misc/FailingNamespace326Test.java

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.fasterxml.jackson.dataformat.xml.misc;
22

3+
import java.io.StringWriter;
4+
35
import javax.xml.stream.*;
46

57
import com.ctc.wstx.stax.WstxInputFactory;
@@ -46,7 +48,7 @@ public String getName() {
4648
}
4749
}
4850

49-
public void testIssue311() throws Exception {
51+
public void testIssue326() throws Exception {
5052
XMLOutputFactory xmlOutputFactory = new WstxOutputFactory();
5153

5254
/* Setting this to true makes the application run but does not write namespace */
@@ -61,12 +63,16 @@ public void testIssue311() throws Exception {
6163
.enable(SerializationFeature.INDENT_OUTPUT)
6264
.build();
6365

64-
XMLStreamWriter writer = xmlOutputFactory.createXMLStreamWriter(System.out);
65-
66+
StringWriter sw = new StringWriter();
67+
68+
XMLStreamWriter writer = xmlOutputFactory.createXMLStreamWriter(sw);
6669
startDocument(writer);
67-
Bean bean=new Bean(1, "Dude");
70+
Bean bean = new Bean(1, "Dude");
6871
mapper.writeValue(writer, bean);
6972
endDocument(writer);
73+
74+
final String xml = sw.toString();
75+
assertNotNull(xml); // just to remove IDE Warning of unused...
7076
}
7177

7278
protected void startDocument(XMLStreamWriter writer) throws XMLStreamException {

0 commit comments

Comments
 (0)