Skip to content

Commit d0aa607

Browse files
committed
Remove XMLBeans support
Issue: SPR-13796
1 parent 770f0c0 commit d0aa607

File tree

11 files changed

+8
-879
lines changed

11 files changed

+8
-879
lines changed

spring-oxm/oxm.gradle

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
configurations {
22
castor
33
xjc
4-
xmlbeans
54
jibx
65
}
76
dependencies {
87
castor "org.codehaus.castor:castor-anttasks:1.4.1"
98
castor "org.apache.velocity:velocity:1.7"
109
xjc "com.sun.xml.bind:jaxb-xjc:2.1.17"
11-
xmlbeans "org.apache.xmlbeans:xmlbeans:2.6.0"
1210
jibx "org.jibx:jibx-bind:1.2.6"
1311
jibx "bcel:bcel:5.1"
1412
}
@@ -39,7 +37,7 @@ task genCastor {
3937
castor(types: "j2", warnings: false, file: orderSchema, todir: sourcesDir,
4038
package: "org.springframework.oxm.castor", properties: castorBuilderProperties)
4139

42-
javac(destdir: classesDir, source: 1.6, target: 1.6, debug: true,
40+
javac(destdir: classesDir, source: 1.8, target: 1.8, debug: true,
4341
debugLevel: "lines,vars,source", classpath: configurations.castor.asPath) {
4442
src(path: sourcesDir)
4543
include(name: "**/*.java")
@@ -74,7 +72,7 @@ task genJaxb {
7472
produces(dir: sourcesDir, includes: "**/*.java")
7573
}
7674

77-
javac(destdir: classesDir, source: 1.6, target: 1.6, debug: true,
75+
javac(destdir: classesDir, source: 1.8, target: 1.8, debug: true,
7876
debugLevel: "lines,vars,source",
7977
classpath: configurations.castor.asPath) {
8078
src(path: sourcesDir)
@@ -91,25 +89,6 @@ task genJaxb {
9189
}
9290
}
9391

94-
task genXmlbeans {
95-
ext.classesDir = "${buildDir}/classes/xmlbeans"
96-
97-
inputs.files flightSchema
98-
outputs.dir classesDir
99-
100-
doLast() {
101-
project.ant {
102-
taskdef name: "xmlbeans",
103-
classname: "org.apache.xmlbeans.impl.tool.XMLBean",
104-
classpath: configurations.xmlbeans.asPath
105-
106-
xmlbeans(classgendir: classesDir, schema: flightSchema,
107-
compiler: "modern", verbose: "false",
108-
classpath: configurations.xmlbeans.asPath)
109-
}
110-
}
111-
}
112-
11392
// add jibx binding to the normal test compilation process
11493
// INCOMPATIBLE WITH OPENJDK 8 b89+
11594
def jibxEnabled = project.properties.get("testGroups")?.toLowerCase()?.split(",")?.contains("custom_compilation")

spring-oxm/src/main/java/org/springframework/oxm/config/OxmNamespaceHandler.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2015 the original author or authors.
2+
* Copyright 2002-2016 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -28,12 +28,10 @@
2828
public class OxmNamespaceHandler extends NamespaceHandlerSupport {
2929

3030
@Override
31-
@SuppressWarnings("deprecation")
3231
public void init() {
3332
registerBeanDefinitionParser("jaxb2-marshaller", new Jaxb2MarshallerBeanDefinitionParser());
3433
registerBeanDefinitionParser("jibx-marshaller", new JibxMarshallerBeanDefinitionParser());
3534
registerBeanDefinitionParser("castor-marshaller", new CastorMarshallerBeanDefinitionParser());
36-
registerBeanDefinitionParser("xmlbeans-marshaller", new XmlBeansMarshallerBeanDefinitionParser());
3735
}
3836

3937
}

spring-oxm/src/main/java/org/springframework/oxm/config/XmlBeansMarshallerBeanDefinitionParser.java

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

0 commit comments

Comments
 (0)