Author: fanningpj
Date: Sun Oct 1 13:07:09 2023
New Revision: 1912656
URL: http://svn.apache.org/viewvc?rev=1912656&view=rev
Log:
saxon 12.3
Modified:
xmlbeans/trunk/LICENSE-binary.txt
xmlbeans/trunk/build.gradle
xmlbeans/trunk/build.xml
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/xpath/saxon/SaxonXPath.java
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
Modified: xmlbeans/trunk/LICENSE-binary.txt
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/LICENSE-binary.txt?rev=1912656&r1=1912655&r2=1912656&view=diff
==============================================================================
--- xmlbeans/trunk/LICENSE-binary.txt (original)
+++ xmlbeans/trunk/LICENSE-binary.txt Sun Oct 1 13:07:09 2023
@@ -234,4 +234,4 @@ org.slf4j:slf4j-api:1.7.25
Mozilla Public License 2.0
--------------------------
-net.sf.saxon:Saxon-HE:11.5
+net.sf.saxon:Saxon-HE:12.3
Modified: xmlbeans/trunk/build.gradle
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/build.gradle?rev=1912656&r1=1912655&r2=1912656&view=diff
==============================================================================
--- xmlbeans/trunk/build.gradle (original)
+++ xmlbeans/trunk/build.gradle Sun Oct 1 13:07:09 2023
@@ -69,7 +69,7 @@ ext {
antVersion = '1.10.14'
javaparserVersion = '3.25.5'
log4jVersion = '2.20.0'
- saxonVersion = '11.5'
+ saxonVersion = '12.3'
androidSdkMinimum = '26'
}
Modified: xmlbeans/trunk/build.xml
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/build.xml?rev=1912656&r1=1912655&r2=1912656&view=diff
==============================================================================
--- xmlbeans/trunk/build.xml (original)
+++ xmlbeans/trunk/build.xml Sun Oct 1 13:07:09 2023
@@ -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.20.0" usage="main"/>
- <dependency prefix="saxon" artifact="net.sf.saxon:Saxon-HE:11.5"
usage="main"/>
+ <dependency prefix="saxon" artifact="net.sf.saxon:Saxon-HE:12.3"
usage="main"/>
<dependency prefix="ant" artifact="org.apache.ant:ant:1.10.14"
usage="main"/>
<dependency prefix="javaparser-core"
artifact="com.github.javaparser:javaparser-core:3.25.5" usage="main"/>
<dependency prefix="javaparser-symbol-solver-core"
artifact="com.github.javaparser:javaparser-symbol-solver-core:3.25.5"
usage="main"/>
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/xpath/saxon/SaxonXPath.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/xpath/saxon/SaxonXPath.java?rev=1912656&r1=1912655&r2=1912656&view=diff
==============================================================================
---
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/xpath/saxon/SaxonXPath.java
(original)
+++
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/xpath/saxon/SaxonXPath.java
Sun Oct 1 13:07:09 2023
@@ -18,6 +18,7 @@ package org.apache.xmlbeans.impl.xpath.s
import net.sf.saxon.Configuration;
import net.sf.saxon.dom.DOMNodeWrapper;
import net.sf.saxon.om.Item;
+import net.sf.saxon.om.NamespaceUri;
import net.sf.saxon.om.NodeInfo;
import net.sf.saxon.om.SequenceTool;
import net.sf.saxon.sxpath.*;
@@ -94,16 +95,18 @@ public class SaxonXPath implements Path
// also see https://saxonica.plan.io/issues/2130
// (XPath referencing attribute with namespace fails when using
DOM)
if (defaultNS != null) {
- sc.setDefaultElementNamespace(defaultNS);
+ sc.setDefaultElementNamespace(NamespaceUri.of(defaultNS));
}
- namespaceMap.forEach(sc::declareNamespace);
+ for (Map.Entry<String, String> entry : namespaceMap.entrySet()) {
+ sc.declareNamespace(entry.getKey(),
NamespaceUri.of(entry.getValue()));
+ }
NodeInfo contextItem = config.unravel(new DOMSource(contextNode));
XPathEvaluator xpe = new XPathEvaluator(config);
xpe.setStaticContext(sc);
- XPathVariable thisVar = sc.declareVariable("", contextVar);
+ XPathVariable thisVar = sc.declareVariable(NamespaceUri.of(""),
contextVar);
XPathExpression xpath = xpe.createExpression(path);
XPathDynamicContext dc = xpath.createDynamicContext(null);
dc.setContextItem(contextItem);
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=1912656&r1=1912655&r2=1912656&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
Sun Oct 1 13:07:09 2023
@@ -20,6 +20,7 @@ import net.sf.saxon.dom.DocumentWrapper;
import net.sf.saxon.dom.NodeOverNodeInfo;
import net.sf.saxon.ma.map.HashTrieMap;
import net.sf.saxon.om.Item;
+import net.sf.saxon.om.NamespaceUri;
import net.sf.saxon.om.NodeInfo;
import net.sf.saxon.om.StructuredQName;
import net.sf.saxon.query.DynamicQueryContext;
@@ -81,7 +82,9 @@ public class SaxonXQuery implements XQue
StaticQueryContext sc = config.newStaticQueryContext();
Map<String, String> nsMap = xmlOptions.getLoadAdditionalNamespaces();
if (nsMap != null) {
- nsMap.forEach(sc::declareNamespace);
+ for (Map.Entry<String, String> entry : nsMap.entrySet()) {
+ sc.declareNamespace(entry.getKey(),
NamespaceUri.of(entry.getValue()));
+ }
}
this.contextVar = contextVar;
//Saxon requires external variables at the end of the prolog...
@@ -176,13 +179,14 @@ public class SaxonXQuery implements XQue
DocumentWrapper docWrapper = new DocumentWrapper(dom, null,
config);
NodeInfo root = docWrapper.wrap(contextNode);
+ NamespaceUri emptyUri = NamespaceUri.of("");
DynamicQueryContext dc = new DynamicQueryContext(config);
dc.setContextItem(root);
- dc.setParameter(new StructuredQName("", null, contextVar), root);
+ dc.setParameter(new StructuredQName("", emptyUri, contextVar),
root);
// Set the other variables
if (variableBindings != null) {
for (Map.Entry<String, Object> me :
variableBindings.entrySet()) {
- StructuredQName key = new StructuredQName("", null,
me.getKey());
+ StructuredQName key = new StructuredQName("", emptyUri,
me.getKey());
Object value = me.getValue();
if (value instanceof XmlTokenSource) {
Node paramObject = ((XmlTokenSource)
value).getDomNode();
@@ -282,7 +286,7 @@ public class SaxonXQuery implements XQue
}
} else if (value instanceof QName) {
QName q = (QName) value;
- return new QNameValue(q.getPrefix(), q.getNamespaceURI(),
q.getLocalPart()); //BuiltInAtomicType.QNAME, null);
+ return new QNameValue(q.getPrefix(),
NamespaceUri.of(q.getNamespaceURI()), q.getLocalPart());
//BuiltInAtomicType.QNAME, null);
} else if (value instanceof URI) {
return new AnyURIValue(value.toString());
} else if (value instanceof Map) {
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=1912656&r1=1912655&r2=1912656&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 Sun Oct
1 13:07:09 2023
@@ -85,7 +85,7 @@
<dependency>
<groupId>net.sf.saxon</groupId>
<artifactId>Saxon-HE</artifactId>
- <version>11.5</version>
+ <version>12.3</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=1912656&r1=1912655&r2=1912656&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/maven/plugin.xml (original)
+++ xmlbeans/trunk/src/main/maven/plugin.xml Sun Oct 1 13:07:09 2023
@@ -409,7 +409,7 @@
<dependency>
<groupId>net.sf.saxon</groupId>
<artifactId>Saxon-HE</artifactId>
- <version>11.5</version>
+ <version>12.3</version>
</dependency>
<dependency>
<groupId>com.github.javaparser</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
