Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Framework build compatible with JDK 9 (tests running against java.base module)

Browse Source 
Issue: SPR-13344
This commit is contained in:
Juergen Hoeller
2016-07-19 19:37:34 +02:00
parent d07381e862
commit 88fcd0a2ed
11 changed files with 233 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-oxm/oxm.gradle
View File

@@ -5,10 +5,12 @@ configurations {
}
dependencies {
castor "org.codehaus.castor:castor-anttasks:1.4.1"
castor "org.apache.velocity:velocity:1.7"
xjc "com.sun.xml.bind:jaxb-xjc:2.1.17"
jibx "org.jibx:jibx-bind:1.2.6"
jibx "bcel:bcel:5.1"
xjc 'com.sun.xml.bind:jaxb-xjc:2.2.11'
xjc 'javax.xml.bind:jaxb-api:2.2.11'
xjc 'com.sun.xml.bind:jaxb-core:2.2.11'
xjc 'com.sun.xml.bind:jaxb-impl:2.2.11'
xjc 'javax.activation:activation:1.1.1'
}
ext.genSourcesDir = "${buildDir}/generated-sources"

18
spring-oxm/src/test/java/org/springframework/oxm/castor/CastorMarshallerTests.java
View File

@@ -20,28 +20,25 @@ import java.io.StringWriter;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
import javax.xml.transform.sax.SAXResult;
import javax.xml.transform.stream.StreamResult;
import org.castor.xml.XMLProperties;
import org.custommonkey.xmlunit.NamespaceContext;
import org.custommonkey.xmlunit.SimpleNamespaceContext;
import org.custommonkey.xmlunit.XMLUnit;
import org.custommonkey.xmlunit.XpathEngine;
import org.exolab.castor.xml.XercesXMLSerializerFactory;
import org.junit.Test;
import org.mockito.InOrder;
import org.w3c.dom.Document;
import org.w3c.dom.NodeList;
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
import org.springframework.core.io.ClassPathResource;
import org.springframework.oxm.AbstractMarshallerTests;
import org.w3c.dom.Document;
import org.w3c.dom.NodeList;
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
import static org.custommonkey.xmlunit.XMLAssert.*;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -117,6 +114,9 @@ public class CastorMarshallerTests extends AbstractMarshallerTests<CastorMarshal
CastorMarshaller marshaller = new CastorMarshaller();
ClassPathResource mappingLocation = new ClassPathResource("mapping.xml", CastorMarshaller.class);
marshaller.setMappingLocation(mappingLocation);
Map<String, String> props = new HashMap<>(1);
props.put(XMLProperties.SERIALIZER_FACTORY, XercesXMLSerializerFactory.class.getName());
marshaller.setCastorProperties(props);
marshaller.afterPropertiesSet();
return marshaller;
}