Author: fanningpj
Date: Wed Feb 2 13:29:11 2022
New Revision: 1897696
URL: http://svn.apache.org/viewvc?rev=1897696&view=rev
Log:
upgrade saxon to 11.1
Modified:
xmlbeans/trunk/build.gradle
xmlbeans/trunk/build.xml
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/xpath/saxon/SaxonXQuery.java
xmlbeans/trunk/src/main/maven/org.apache.xmlbeans/xmlbeans/pom.xml
xmlbeans/trunk/src/main/maven/plugin.xml
xmlbeans/trunk/src/test/java/misc/checkin/HexBinTest.java
Modified: xmlbeans/trunk/build.gradle
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/build.gradle?rev=1897696&r1=1897695&r2=1897696&view=diff
==============================================================================
--- xmlbeans/trunk/build.gradle (original)
+++ xmlbeans/trunk/build.gradle Wed Feb 2 13:29:11 2022
@@ -69,7 +69,7 @@ ext {
antVersion = '1.10.12'
javaparserVersion = '3.23.1'
log4jVersion = '2.17.1'
- saxonVersion = '10.6'
+ saxonVersion = '11.1'
}
def testSchemas = [
Modified: xmlbeans/trunk/build.xml
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/build.xml?rev=1897696&r1=1897695&r2=1897696&view=diff
==============================================================================
--- xmlbeans/trunk/build.xml (original)
+++ xmlbeans/trunk/build.xml Wed Feb 2 13:29:11 2022
@@ -121,7 +121,7 @@
<!-- dependencies -->
<dependency prefix="xml-apis" artifact="xml-apis:xml-apis:1.4.01"
usage="java8"/>
<dependency prefix="log4j-api"
artifact="org.apache.logging.log4j:log4j-api:2.17.1" usage="main"/>
- <dependency prefix="saxon" artifact="net.sf.saxon:Saxon-HE:10.6"
usage="main"/>
+ <dependency prefix="saxon" artifact="net.sf.saxon:Saxon-HE:11.1"
usage="main"/>
<dependency prefix="ant" artifact="org.apache.ant:ant:1.10.12"
usage="main"/>
<dependency prefix="javaparser.core"
artifact="com.github.javaparser:javaparser-core:3.23.1" usage="main"/>
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/xpath/saxon/SaxonXQuery.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/xpath/saxon/SaxonXQuery.java?rev=1897696&r1=1897695&r2=1897696&view=diff
==============================================================================
---
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/xpath/saxon/SaxonXQuery.java
(original)
+++
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/xpath/saxon/SaxonXQuery.java
Wed Feb 2 13:29:11 2022
@@ -25,6 +25,7 @@ import net.sf.saxon.om.StructuredQName;
import net.sf.saxon.query.DynamicQueryContext;
import net.sf.saxon.query.StaticQueryContext;
import net.sf.saxon.query.XQueryExpression;
+import net.sf.saxon.str.StringView;
import net.sf.saxon.type.BuiltInAtomicType;
import net.sf.saxon.value.*;
import org.apache.logging.log4j.LogManager;
@@ -253,26 +254,29 @@ public class SaxonXQuery implements XQue
XMLGregorianCalendar g = (XMLGregorianCalendar) value;
QName gtype = g.getXMLSchemaType();
if (gtype.equals(DatatypeConstants.DATETIME)) {
- return DateTimeValue.makeDateTimeValue(value.toString(),
config.getConversionRules()).asAtomic();
+ return
DateTimeValue.makeDateTimeValue(StringView.tidy(value.toString()),
+ config.getConversionRules()).asAtomic();
} else if (gtype.equals(DatatypeConstants.DATE)) {
- return DateValue.makeDateValue(value.toString(),
config.getConversionRules()).asAtomic();
+ return
DateValue.makeDateValue(StringView.tidy(value.toString()),
config.getConversionRules()).asAtomic();
} else if (gtype.equals(DatatypeConstants.TIME)) {
- return TimeValue.makeTimeValue(value.toString()).asAtomic();
+ return
TimeValue.makeTimeValue(StringView.tidy(value.toString())).asAtomic();
} else if (gtype.equals(DatatypeConstants.GYEAR)) {
- return GYearValue.makeGYearValue(value.toString(),
config.getConversionRules()).asAtomic();
+ return
GYearValue.makeGYearValue(StringView.tidy(value.toString()),
+ config.getConversionRules()).asAtomic();
} else if (gtype.equals(DatatypeConstants.GYEARMONTH)) {
- return GYearMonthValue.makeGYearMonthValue(value.toString(),
config.getConversionRules()).asAtomic();
+ return
GYearMonthValue.makeGYearMonthValue(StringView.tidy(value.toString()),
+ config.getConversionRules()).asAtomic();
} else if (gtype.equals(DatatypeConstants.GMONTH)) {
// a workaround for W3C schema bug
String val = value.toString();
if (val.endsWith("--")) {
val = val.substring(0, val.length() - 2);
}
- return GMonthValue.makeGMonthValue(val).asAtomic();
+ return
GMonthValue.makeGMonthValue(StringView.tidy(val)).asAtomic();
} else if (gtype.equals(DatatypeConstants.GMONTHDAY)) {
- return
GMonthDayValue.makeGMonthDayValue(value.toString()).asAtomic();
+ return
GMonthDayValue.makeGMonthDayValue(StringView.tidy(value.toString())).asAtomic();
} else if (gtype.equals(DatatypeConstants.GDAY)) {
- return GDayValue.makeGDayValue(value.toString()).asAtomic();
+ return
GDayValue.makeGDayValue(StringView.tidy(value.toString())).asAtomic();
} else {
throw new AssertionError("Unknown Gregorian date type");
}
Modified: xmlbeans/trunk/src/main/maven/org.apache.xmlbeans/xmlbeans/pom.xml
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/maven/org.apache.xmlbeans/xmlbeans/pom.xml?rev=1897696&r1=1897695&r2=1897696&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/maven/org.apache.xmlbeans/xmlbeans/pom.xml
(original)
+++ xmlbeans/trunk/src/main/maven/org.apache.xmlbeans/xmlbeans/pom.xml Wed Feb
2 13:29:11 2022
@@ -85,7 +85,7 @@
<dependency>
<groupId>net.sf.saxon</groupId>
<artifactId>Saxon-HE</artifactId>
- <version>10.6</version>
+ <version>11.1</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: xmlbeans/trunk/src/main/maven/plugin.xml
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/maven/plugin.xml?rev=1897696&r1=1897695&r2=1897696&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/maven/plugin.xml (original)
+++ xmlbeans/trunk/src/main/maven/plugin.xml Wed Feb 2 13:29:11 2022
@@ -409,7 +409,7 @@
<dependency>
<groupId>net.sf.saxon</groupId>
<artifactId>Saxon-HE</artifactId>
- <version>10.6</version>
+ <version>11.1</version>
</dependency>
<dependency>
<groupId>com.github.javaparser</groupId>
Modified: xmlbeans/trunk/src/test/java/misc/checkin/HexBinTest.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/misc/checkin/HexBinTest.java?rev=1897696&r1=1897695&r2=1897696&view=diff
==============================================================================
--- xmlbeans/trunk/src/test/java/misc/checkin/HexBinTest.java (original)
+++ xmlbeans/trunk/src/test/java/misc/checkin/HexBinTest.java Wed Feb 2
13:29:11 2022
@@ -15,6 +15,7 @@
package misc.checkin;
+import net.sf.saxon.str.StringView;
import net.sf.saxon.trans.XPathException;
import net.sf.saxon.value.HexBinaryValue;
import org.apache.xmlbeans.impl.util.HexBin;
@@ -47,7 +48,7 @@ public class HexBinTest {
String exp =
"3c3f786d6c2076657273696f6e3d22312e302220656e636f64696e673d225554462d38223f3e61";
String enc = HexBin.encode(in);
- HexBinaryValue val = new HexBinaryValue(enc);
+ HexBinaryValue val = new HexBinaryValue(StringView.tidy(enc));
String saxIn = new String(val.getBinaryValue(),
StandardCharsets.UTF_8);
assertEquals(exp, enc.toLowerCase(Locale.ROOT));
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
