Skip to content

Commit f2f355e

Browse files
Arjen Poutsmaunknown
authored andcommitted
Improved StAX<->SAX bridge
Improved the SAX to StAX (and vice-versa) bridge exposed via StaxUtils. The old integration had some issues with namespace declaration attributes, brought to light in a XMLUnit upgrade. Issue: SPR-11549
1 parent a2f1169 commit f2f355e

File tree

19 files changed

+850
-625
lines changed

19 files changed

+850
-625
lines changed

build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ project("spring-core") {
242242
optional("org.aspectj:aspectjweaver:${aspectjVersion}")
243243
optional("net.sf.jopt-simple:jopt-simple:4.6")
244244
optional("log4j:log4j:1.2.17")
245-
testCompile("xmlunit:xmlunit:1.3")
245+
testCompile("xmlunit:xmlunit:1.5")
246246
testCompile("org.codehaus.woodstox:wstx-asl:3.2.7") {
247247
exclude group: "stax", module: "stax-api"
248248
}
@@ -460,7 +460,7 @@ project("spring-oxm") {
460460
optional("org.codehaus.castor:castor-xml:1.3.2")
461461
testCompile(project(":spring-context"))
462462
testCompile("org.codehaus.jettison:jettison:1.0.1")
463-
testCompile("xmlunit:xmlunit:1.3")
463+
testCompile("xmlunit:xmlunit:1.5")
464464
testCompile("xmlpull:xmlpull:1.1.3.4a")
465465
testCompile(files(genCastor.classesDir).builtBy(genCastor))
466466
testCompile(files(genJaxb.classesDir).builtBy(genJaxb))
@@ -567,7 +567,7 @@ project("spring-web") {
567567
}
568568
optional("log4j:log4j:1.2.17")
569569
testCompile(project(":spring-context-support")) // for JafMediaTypeFactory
570-
testCompile("xmlunit:xmlunit:1.3")
570+
testCompile("xmlunit:xmlunit:1.5")
571571
testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
572572
}
573573

@@ -703,7 +703,7 @@ project("spring-webmvc") {
703703
}
704704
testCompile(project(":spring-aop"))
705705
testCompile("rhino:js:1.7R1")
706-
testCompile("xmlunit:xmlunit:1.3")
706+
testCompile("xmlunit:xmlunit:1.5")
707707
testCompile("dom4j:dom4j:1.6.1") {
708708
exclude group: "xml-apis", module: "xml-apis"
709709
}
@@ -806,7 +806,7 @@ project("spring-test") {
806806
optional("org.aspectj:aspectjweaver:${aspectjVersion}")
807807
optional("org.hamcrest:hamcrest-core:1.3")
808808
optional("com.jayway.jsonpath:json-path:0.9.0")
809-
optional("xmlunit:xmlunit:1.3")
809+
optional("xmlunit:xmlunit:1.5")
810810
testCompile(project(":spring-context-support"))
811811
testCompile(project(":spring-oxm"))
812812
testCompile(project(":spring-webmvc-tiles3"))

spring-core/src/main/java/org/springframework/util/xml/AbstractStaxContentHandler.java

Lines changed: 0 additions & 185 deletions
This file was deleted.

0 commit comments

Comments
 (0)