You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2020/10/06 19:39:33 UTC
[camel] branch master updated (6af48a7 -> 6894617)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 6af48a7 CAMEL-15644: Fixed potential NPE in camel-salesforce.
new b8c93ac CAMEL-15616:camel-saxon - Upgrade to Saxon 10.x"
new fce17cc CAMEL-15616:camel-saxon - Upgrade to Saxon 10.x, correct OSGi range
new 8824941 CAMEL-15616:camel-saxon - Upgrade to Saxon 10.x, correct OSGi range in xslt-saxon
new 6894617 Regen
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
camel-dependencies/pom.xml | 2 +-
components/camel-saxon/pom.xml | 2 +-
.../java/org/apache/camel/component/xquery/XQueryBuilder.java | 4 ++--
.../java/org/apache/camel/converter/saxon/SaxonConverter.java | 7 ++++---
.../apache/camel/component/xslt/SaxonXsltFeatureRouteTest.java | 9 +++++----
components/camel-xslt-saxon/pom.xml | 2 +-
parent/pom.xml | 2 +-
7 files changed, 15 insertions(+), 13 deletions(-)
[camel] 04/04: Regen
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 6894617efc6b1e47c7cb432830a8e85f659160c3
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Oct 6 20:49:41 2020 +0200
Regen
---
camel-dependencies/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index de72630..2a3625b 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -501,7 +501,7 @@
<rome-version>1.15.0</rome-version>
<rxjava-version>1.3.8</rxjava-version>
<rxjava2-version>2.2.19</rxjava2-version>
- <saxon-version>9.9.1-7</saxon-version>
+ <saxon-version>10.2</saxon-version>
<scala-version>2.11.7</scala-version>
<scribe-version>1.3.7</scribe-version>
<servicemix-specs-version>2.9.0</servicemix-specs-version>
[camel] 02/04: CAMEL-15616:camel-saxon - Upgrade to Saxon 10.x,
correct OSGi range
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit fce17cc8ea1424a9763bd07525cdac22dd6a2615
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Oct 6 19:03:24 2020 +0200
CAMEL-15616:camel-saxon - Upgrade to Saxon 10.x, correct OSGi range
---
components/camel-saxon/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/camel-saxon/pom.xml b/components/camel-saxon/pom.xml
index e3c1a61..b166402 100644
--- a/components/camel-saxon/pom.xml
+++ b/components/camel-saxon/pom.xml
@@ -33,7 +33,7 @@
<properties>
<camel.osgi.import.additional>
- net.sf.saxon.*;version="[9.9.0,11)"
+ net.sf.saxon.*;version="[10,11)"
</camel.osgi.import.additional>
</properties>
[camel] 03/04: CAMEL-15616:camel-saxon - Upgrade to Saxon 10.x,
correct OSGi range in xslt-saxon
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 8824941d2dda21fb59d3752fdf04ab9f5ada1784
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Oct 6 19:08:06 2020 +0200
CAMEL-15616:camel-saxon - Upgrade to Saxon 10.x, correct OSGi range in xslt-saxon
---
components/camel-xslt-saxon/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/camel-xslt-saxon/pom.xml b/components/camel-xslt-saxon/pom.xml
index b6b3097..d10ce41 100644
--- a/components/camel-xslt-saxon/pom.xml
+++ b/components/camel-xslt-saxon/pom.xml
@@ -34,7 +34,7 @@
<properties>
<camel.osgi.import.additional>
- net.sf.saxon.*;version="[9.9.0,11)"
+ net.sf.saxon.*;version="[10,11)"
</camel.osgi.import.additional>
</properties>
[camel] 01/04: CAMEL-15616:camel-saxon - Upgrade to Saxon 10.x"
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit b8c93ac50131bdd50aef3b1d436306856db4b035
Author: Kodanda Ramu Kakarla <kk...@kkakarla.pnq.csb>
AuthorDate: Tue Oct 6 12:30:07 2020 +0530
CAMEL-15616:camel-saxon - Upgrade to Saxon 10.x"
---
components/camel-saxon/pom.xml | 2 +-
.../java/org/apache/camel/component/xquery/XQueryBuilder.java | 4 ++--
.../java/org/apache/camel/converter/saxon/SaxonConverter.java | 7 ++++---
.../apache/camel/component/xslt/SaxonXsltFeatureRouteTest.java | 9 +++++----
components/camel-xslt-saxon/pom.xml | 2 +-
parent/pom.xml | 2 +-
6 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/components/camel-saxon/pom.xml b/components/camel-saxon/pom.xml
index 9ed643c..e3c1a61 100644
--- a/components/camel-saxon/pom.xml
+++ b/components/camel-saxon/pom.xml
@@ -33,7 +33,7 @@
<properties>
<camel.osgi.import.additional>
- net.sf.saxon.*;version="[9.9.0,10)"
+ net.sf.saxon.*;version="[9.9.0,11)"
</camel.osgi.import.additional>
</properties>
diff --git a/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java b/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java
index fd7f38a..384d224 100644
--- a/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java
+++ b/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java
@@ -223,7 +223,7 @@ public abstract class XQueryBuilder implements Expression, Predicate, NamespaceA
DOMResult result = new DOMResult();
DynamicQueryContext context = createDynamicContext(exchange);
XQueryExpression expression = getExpression();
- expression.pull(context, result, properties);
+ expression.run(context, result, properties);
return result.getNode();
}
@@ -232,7 +232,7 @@ public abstract class XQueryBuilder implements Expression, Predicate, NamespaceA
ByteArrayOutputStream buffer = new ByteArrayOutputStream();
Result result = new StreamResult(buffer);
- getExpression().pull(createDynamicContext(exchange), result, properties);
+ getExpression().run(createDynamicContext(exchange), result, properties);
byte[] answer = buffer.toByteArray();
buffer.close();
diff --git a/components/camel-saxon/src/main/java/org/apache/camel/converter/saxon/SaxonConverter.java b/components/camel-saxon/src/main/java/org/apache/camel/converter/saxon/SaxonConverter.java
index b9c0d75..16f1bd4 100644
--- a/components/camel-saxon/src/main/java/org/apache/camel/converter/saxon/SaxonConverter.java
+++ b/components/camel-saxon/src/main/java/org/apache/camel/converter/saxon/SaxonConverter.java
@@ -28,8 +28,8 @@ import org.w3c.dom.NodeList;
import net.sf.saxon.Configuration;
import net.sf.saxon.dom.DOMNodeList;
import net.sf.saxon.dom.NodeOverNodeInfo;
-import net.sf.saxon.om.DocumentInfo;
import net.sf.saxon.om.NodeInfo;
+import net.sf.saxon.om.TreeInfo;
import net.sf.saxon.trans.XPathException;
import net.sf.saxon.type.Type;
import org.apache.camel.Converter;
@@ -51,9 +51,10 @@ public final class SaxonConverter {
return (Document) NodeOverNodeInfo.wrap(node);
case Type.ELEMENT:
// ELEMENT nodes need to build a new DocumentInfo before wrapping
+ //https://www.saxonica.com/documentation/#!javadoc/net.sf.saxon/Configuration@buildDocumentTree
Configuration config = node.getConfiguration();
- DocumentInfo documentInfo = config.buildDocument(node);
- return (Document) NodeOverNodeInfo.wrap(documentInfo);
+ TreeInfo treeInfo = config.buildDocumentTree(node);
+ return (Document) NodeOverNodeInfo.wrap(treeInfo.getRootNode());
default:
return null;
}
diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltFeatureRouteTest.java b/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltFeatureRouteTest.java
index 241c6fc..24186c6 100644
--- a/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltFeatureRouteTest.java
+++ b/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltFeatureRouteTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.xslt;
-import net.sf.saxon.trans.UncheckedXPathException;
+import net.sf.saxon.trans.XPathException;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.junit5.CamelTestSupport;
@@ -39,9 +39,10 @@ public class SaxonXsltFeatureRouteTest extends CamelTestSupport {
template.sendBody("direct:start1", message);
fail("expect an exception here");
} catch (Exception ex) {
- // expect an exception here
- assertTrue(ex instanceof CamelExecutionException, "Get a wrong exception");
- assertTrue(ex.getCause() instanceof UncheckedXPathException, "Get a wrong exception cause");
+
+ assertTrue(ex instanceof CamelExecutionException);
+ assertTrue(ex.getCause() instanceof XPathException);
+
}
}
diff --git a/components/camel-xslt-saxon/pom.xml b/components/camel-xslt-saxon/pom.xml
index 523a1ee..b6b3097 100644
--- a/components/camel-xslt-saxon/pom.xml
+++ b/components/camel-xslt-saxon/pom.xml
@@ -34,7 +34,7 @@
<properties>
<camel.osgi.import.additional>
- net.sf.saxon.*;version="[9.9.0,10)"
+ net.sf.saxon.*;version="[9.9.0,11)"
</camel.osgi.import.additional>
</properties>
diff --git a/parent/pom.xml b/parent/pom.xml
index 1a83116..3424838 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -489,7 +489,7 @@
<rome-version>1.15.0</rome-version>
<rxjava-version>1.3.8</rxjava-version>
<rxjava2-version>2.2.19</rxjava2-version>
- <saxon-version>9.9.1-7</saxon-version>
+ <saxon-version>10.2</saxon-version>
<scala-version>2.11.7</scala-version>
<scribe-version>1.3.7</scribe-version>
<servicemix-specs-version>2.9.0</servicemix-specs-version>