[camel] 01/03: Upgrade Saxon and related bundle to version 9.9.0

[acosentino]

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 773ea332c19949672a7d8f17d60b87512d14c998
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Fri Dec 7 09:22:23 2018 +0100

    Upgrade Saxon and related bundle to version 9.9.0
---
 .../main/java/org/apache/camel/component/xquery/XQueryBuilder.java   | 5 ++++-
 .../apache/camel/component/xslt/SaxonXsltMessageTerminateTest.java   | 2 +-
 parent/pom.xml                                                       | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

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 e94ed64..179793f 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
@@ -46,9 +46,12 @@ import org.w3c.dom.Node;
 
 import net.sf.saxon.Configuration;
 import net.sf.saxon.lib.ModuleURIResolver;
+import net.sf.saxon.om.AllElementsSpaceStrippingRule;
 import net.sf.saxon.om.DocumentInfo;
+import net.sf.saxon.om.IgnorableSpaceStrippingRule;
 import net.sf.saxon.om.Item;
 import net.sf.saxon.om.SequenceIterator;
+import net.sf.saxon.om.SpaceStrippingRule;
 import net.sf.saxon.om.StructuredQName;
 import net.sf.saxon.query.DynamicQueryContext;
 import net.sf.saxon.query.StaticQueryContext;
@@ -699,7 +702,7 @@ public abstract class XQueryBuilder implements Expression, 
Predicate, NamespaceA
             LOG.debug("Initializing XQueryBuilder {}", this);
             if (configuration == null) {
                 configuration = new Configuration();
-                configuration.setStripsWhiteSpace(isStripsAllWhiteSpace() ? 
Whitespace.ALL : Whitespace.IGNORABLE);
+                
configuration.getParseOptions().setSpaceStrippingRule(isStripsAllWhiteSpace() ? 
AllElementsSpaceStrippingRule.getInstance() : 
IgnorableSpaceStrippingRule.getInstance());
                 LOG.debug("Created new Configuration {}", configuration);
             } else {
                 LOG.debug("Using existing Configuration {}", configuration);
diff --git 
a/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltMessageTerminateTest.java
 
b/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltMessageTerminateTest.java
index 62d5d15..0ba6ccf 100644
--- 
a/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltMessageTerminateTest.java
+++ 
b/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltMessageTerminateTest.java
@@ -39,7 +39,7 @@ public class SaxonXsltMessageTerminateTest extends 
CamelTestSupport {
         // we have the xsl termination message as a error property on the 
exchange as we set terminate=true
         Exception error = out.getProperty(Exchange.XSLT_ERROR, 
Exception.class);
         assertNotNull(error);
-        assertEquals("Error: DOB is an empty string!", error.getMessage());
+        assertEquals("<?xml version=\"1.0\" encoding=\"UTF-8\"?>Error: DOB is 
an empty string!", error.getMessage());
     }
 
     @Override
diff --git a/parent/pom.xml b/parent/pom.xml
index 323c905..c4d5f6b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -601,8 +601,8 @@
     <rxjava-version>1.3.8</rxjava-version>
     <rxjava2-version>2.2.3</rxjava2-version>
     <saaj-impl-version>1.3.2_2</saaj-impl-version>
-    <saxon-bundle-version>9.8.0-14_1</saxon-bundle-version>
-    <saxon-version>9.8.0-14</saxon-version>
+    <saxon-bundle-version>9.9.0-2_1</saxon-bundle-version>
+    <saxon-version>9.9.0-2</saxon-version>
     <scala-version>2.11.7</scala-version>
     <scala-maven-plugin-version>3.2.2</scala-maven-plugin-version>
     <scalatest-version>2.2.5</scalatest-version>