From 0ba73d88020200df8a96e2bfe81fe8e547f61e51 Mon Sep 17 00:00:00 2001 From: Stevo Slavic Date: Tue, 20 Mar 2012 19:08:52 +0100 Subject: [PATCH 1/2] Fix JibxMarshallerTests failing on Windows Before this change JibxMarshallerTests would fail on Windows with error message explaining that JiBX compiler generated classes are not found on classpath for binding with name 'binding'. Tests would execute well on Linux. Actual root cause of this bug is found to be in JiBX 1.1.5 release that is used to build Spring. Binding name can be explicitly specified in JiBX binding file. If omitted, when generating classes JiBX compiler as fall-back mechanism tries to derive binding name from binding file name. That logic had bug which gets manifested when configured binding file path has mixed Windows and Linux style file separators, as in case when mentioned JibxMarshallerTests are executed on Windows platform. This change introduces one of the two possible solutions - binding name is specified explicitly in binding.xml file so JiBX doesn't have to use the fall-back mechanism. Issue: SPR-8360 --- .../src/test/resources/org/springframework/oxm/jibx/binding.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-oxm/src/test/resources/org/springframework/oxm/jibx/binding.xml b/spring-oxm/src/test/resources/org/springframework/oxm/jibx/binding.xml index 2f8cc0ad9240..880d759258c9 100644 --- a/spring-oxm/src/test/resources/org/springframework/oxm/jibx/binding.xml +++ b/spring-oxm/src/test/resources/org/springframework/oxm/jibx/binding.xml @@ -1,5 +1,5 @@ - + From 86eba9075a6fb7b83833bbdc2420b4b4355518ce Mon Sep 17 00:00:00 2001 From: Stevo Slavic Date: Tue, 20 Mar 2012 19:14:00 +0100 Subject: [PATCH 2/2] Fix JibxMarshallerTests failing on Windows Before this change JibxMarshallerTests would fail on Windows with error message explaining that JiBX compiler generated classes are not found on classpath for binding with name 'binding'. Tests would execute well on Linux. Actual root cause of this bug is found to be in JiBX 1.1.5 release that is used to build Spring. Binding name can be explicitly specified in JiBX binding file. If omitted, when generating classes JiBX compiler as fall-back mechanism tries to derive binding name from binding file name. That logic had bug which gets manifested when configured binding file path has mixed Windows and Linux style file separators, as in case when mentioned JibxMarshallerTests are executed on Windows platform. This change introduces one of the two possible solutions - since this bug was fixed in JiBX 1.2 (see JIBX-441 for more details), dependency to JiBX is upgraded from 1.1.5 to the latest 1.2.3 release. For build to pass with this change, public access to 1.2.3 version of JiBX has to be granted on SpringSource libs-release repository (http://repo.springsource.org/libs-release). Issue: SPR-8360 --- build.gradle | 2 +- spring-oxm/oxm.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index d8160986e821..48c004f0e240 100644 --- a/build.gradle +++ b/build.gradle @@ -241,7 +241,7 @@ project('spring-oxm') { compile "commons-lang:commons-lang:2.5" compile("com.thoughtworks.xstream:xstream:1.3.1", optional) compile("com.sun.xml.bind:jaxb-impl:2.1.7", optional) - compile("org.jibx:jibx-run:1.1.5", optional) + compile("org.jibx:jibx-run:1.2.3", optional) compile("org.apache.xmlbeans:xmlbeans:2.4.0", optional) compile("org.codehaus.castor:castor-xml:1.3.2", optional) testCompile "org.codehaus.jettison:jettison:1.0.1" diff --git a/spring-oxm/oxm.gradle b/spring-oxm/oxm.gradle index c8dceea4a342..de25fab16e15 100644 --- a/spring-oxm/oxm.gradle +++ b/spring-oxm/oxm.gradle @@ -9,7 +9,7 @@ dependencies { castor "velocity:velocity:1.5" xjc "com.sun.xml:com.springsource.com.sun.tools.xjc:2.1.7" xmlbeans "org.apache.xmlbeans:com.springsource.org.apache.xmlbeans:2.4.0" - jibx "org.jibx:jibx-bind:1.1.5" + jibx "org.jibx:jibx-bind:1.2.3" jibx "bcel:bcel:5.1" }