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 2018/12/07 09:28:32 UTC
[camel] branch sandbox/camel-3.x updated (67778f6 -> 361446f)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 67778f6 Upgrade AWS SDK and related bundle to version 1.11.461
new 02bf780 Upgrade Saxon and related bundle to version 9.9.0
new 5c356cc Fixed Range for Saxon Karaf feature
new 361446f Upgrade Braintree to version 2.89.0
The 3 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:
.../java/org/apache/camel/component/xquery/XQueryBuilder.java | 5 ++++-
.../camel/component/xslt/SaxonXsltMessageTerminateTest.java | 2 +-
parent/pom.xml | 8 ++++----
3 files changed, 9 insertions(+), 6 deletions(-)
[camel] 03/03: Upgrade Braintree to version 2.89.0
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 361446f8d31c3c35144b997f6a1bc1e42385bba8
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Dec 7 10:25:10 2018 +0100
Upgrade Braintree to version 2.89.0
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index d989817..8118125 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -97,7 +97,7 @@
<bouncycastle-version>1.60</bouncycastle-version>
<boxjavalibv2.version>3.2.1</boxjavalibv2.version>
<box-java-sdk-version>2.10.0</box-java-sdk-version>
- <braintree-gateway-version>2.88.0</braintree-gateway-version>
+ <braintree-gateway-version>2.89.0</braintree-gateway-version>
<brave-zipkin-version>5.5.2</brave-zipkin-version>
<build-helper-maven-plugin-version>1.12</build-helper-maven-plugin-version>
<c3p0-version>0.9.5.2</c3p0-version>
[camel] 01/03: Upgrade Saxon and related bundle to version 9.9.0
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 02bf7808429e8e408413f638a26136a2a829163f
Author: Andrea Cosentino <an...@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 90419c4..6c3bac9 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;
@@ -697,7 +700,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 1166740..98b92ac 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>
[camel] 02/03: Fixed Range for Saxon Karaf feature
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 5c356cc1118ef817e9d3d77b7c2a7787ce4b9201
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Dec 7 10:16:03 2018 +0100
Fixed Range for Saxon Karaf feature
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 98b92ac..d989817 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -776,7 +776,7 @@
org.mortbay.cometd.*;version="[6.1,7)",
org.slf4j.*;version="[1.7,2)",
net.sf.flatpack.*;version="[3.1.1,4)",
- net.sf.saxon.*;version="[9.8.0,9.9)",
+ net.sf.saxon.*;version="[9.9.0,10)",
freemarker.*;version="[2.3.15,3)",
javax.persistence.*;version="[1.1,3)",
org.apache.lucene.*;version="${lucene-version-range}",