[
https://issues.apache.org/jira/browse/CAMEL-12081?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16292140#comment-16292140
]
ASF GitHub Bot commented on CAMEL-12081:
----------------------------------------
dmvolod closed pull request #2148: CAMEL-12081: Cherry-pick commits which are
updating saxon from 9.7 to 9.8
URL: https://github.com/apache/camel/pull/2148
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/components/camel-saxon/src/test/resources/org/apache/camel/component/xslt/terminate.xsl
b/components/camel-saxon/src/test/resources/org/apache/camel/component/xslt/terminate.xsl
index d4d986049ea..eadebe811a4 100644
---
a/components/camel-saxon/src/test/resources/org/apache/camel/component/xslt/terminate.xsl
+++
b/components/camel-saxon/src/test/resources/org/apache/camel/component/xslt/terminate.xsl
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
+<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
<xsl:template match="/">
<html>
diff --git
a/components/camel-saxon/src/test/resources/org/apache/camel/component/xslt/transform.xsl
b/components/camel-saxon/src/test/resources/org/apache/camel/component/xslt/transform.xsl
index fea1e639f7c..3b2651a809b 100644
---
a/components/camel-saxon/src/test/resources/org/apache/camel/component/xslt/transform.xsl
+++
b/components/camel-saxon/src/test/resources/org/apache/camel/component/xslt/transform.xsl
@@ -17,7 +17,7 @@
-->
<xsl:stylesheet
xmlns:xsl='http://www.w3.org/1999/XSL/Transform'
- version='1.0'>
+ version='2.0'>
<xsl:output method="xml" indent="yes" encoding="ISO-8859-1"/>
diff --git
a/components/camel-saxon/src/test/resources/org/apache/camel/component/xslt/transform_dtd.xsl
b/components/camel-saxon/src/test/resources/org/apache/camel/component/xslt/transform_dtd.xsl
index 1ad29bd6964..96cb5ae8f3b 100644
---
a/components/camel-saxon/src/test/resources/org/apache/camel/component/xslt/transform_dtd.xsl
+++
b/components/camel-saxon/src/test/resources/org/apache/camel/component/xslt/transform_dtd.xsl
@@ -17,7 +17,7 @@
-->
<xsl:stylesheet
xmlns:xsl='http://www.w3.org/1999/XSL/Transform'
- version='1.0'>
+ version='2.0'>
<xsl:output method="xml" indent="yes" encoding="ISO-8859-1"/>
diff --git
a/components/camel-saxon/src/test/resources/org/apache/camel/component/xslt/transform_includes_data.xsl
b/components/camel-saxon/src/test/resources/org/apache/camel/component/xslt/transform_includes_data.xsl
index 610ab3a2a8d..bf9eca26a2a 100644
---
a/components/camel-saxon/src/test/resources/org/apache/camel/component/xslt/transform_includes_data.xsl
+++
b/components/camel-saxon/src/test/resources/org/apache/camel/component/xslt/transform_includes_data.xsl
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<xsl:stylesheet xmlns:date="http://exslt.org/dates-and-times"; version="1.1"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
+<xsl:stylesheet xmlns:date="http://exslt.org/dates-and-times"; version="2.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
<date:months>
<date:month length="31" abbr="Jan">January</date:month>
<date:month length="28" abbr="Feb">February</date:month>
diff --git
a/components/camel-saxon/src/test/resources/org/apache/camel/component/xslt/transform_text.xsl
b/components/camel-saxon/src/test/resources/org/apache/camel/component/xslt/transform_text.xsl
index 6c38e4a4184..e8de2fe2287 100644
---
a/components/camel-saxon/src/test/resources/org/apache/camel/component/xslt/transform_text.xsl
+++
b/components/camel-saxon/src/test/resources/org/apache/camel/component/xslt/transform_text.xsl
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<xsl:stylesheet version="1.0"
+<xsl:stylesheet version="1.1"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
xmlns:date="http://xml.apache.org/xalan/java/java.util.Date";
xmlns:rt="http://xml.apache.org/xalan/java/java.lang.Runtime";
diff --git
a/components/camel-saxon/src/test/resources/org/apache/camel/component/xslt/transform_text_imported.xsl
b/components/camel-saxon/src/test/resources/org/apache/camel/component/xslt/transform_text_imported.xsl
index e7ae4b051da..931cf0ee8d7 100644
---
a/components/camel-saxon/src/test/resources/org/apache/camel/component/xslt/transform_text_imported.xsl
+++
b/components/camel-saxon/src/test/resources/org/apache/camel/component/xslt/transform_text_imported.xsl
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<xsl:stylesheet version="1.0"
+<xsl:stylesheet version="2.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
<xsl:import href="transform_text.xsl"/>
diff --git
a/components/camel-saxon/src/test/resources/org/apache/camel/util/toolbox/aggregate-user-property.xsl
b/components/camel-saxon/src/test/resources/org/apache/camel/util/toolbox/aggregate-user-property.xsl
index 74bdd857fbc..75404db7dc5 100644
---
a/components/camel-saxon/src/test/resources/org/apache/camel/util/toolbox/aggregate-user-property.xsl
+++
b/components/camel-saxon/src/test/resources/org/apache/camel/util/toolbox/aggregate-user-property.xsl
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
+<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
<xsl:output method="xml" indent="no"/>
<xsl:strip-space elements="*"/>
diff --git
a/components/camel-saxon/src/test/resources/org/apache/camel/util/toolbox/aggregate.xsl
b/components/camel-saxon/src/test/resources/org/apache/camel/util/toolbox/aggregate.xsl
index 8d20385a04f..8f6612e6106 100644
---
a/components/camel-saxon/src/test/resources/org/apache/camel/util/toolbox/aggregate.xsl
+++
b/components/camel-saxon/src/test/resources/org/apache/camel/util/toolbox/aggregate.xsl
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
+<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
<xsl:output method="xml" indent="no"/>
<xsl:strip-space elements="*"/>
diff --git
a/components/camel-schematron/src/main/resources/iso-schematron-xslt2/ExtractSchFromXSD-2.xsl
b/components/camel-schematron/src/main/resources/iso-schematron-xslt2/ExtractSchFromXSD-2.xsl
index 39a21e2529b..47d4804f7ef 100644
---
a/components/camel-schematron/src/main/resources/iso-schematron-xslt2/ExtractSchFromXSD-2.xsl
+++
b/components/camel-schematron/src/main/resources/iso-schematron-xslt2/ExtractSchFromXSD-2.xsl
@@ -54,7 +54,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
-->
-<xsl:transform version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
+<xsl:transform version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
xmlns:sch="http://purl.oclc.org/dsdl/schematron";
xmlns:xs="http://www.w3.org/2001/XMLSchema";>
<!-- Set the output to be XML with an XML declaration and use
indentation -->
<xsl:output method="xml" omit-xml-declaration="no" indent="yes"
standalone="yes"/>
diff --git
a/components/camel-schematron/src/main/resources/iso-schematron-xslt2/iso_abstract_expand.xsl
b/components/camel-schematron/src/main/resources/iso-schematron-xslt2/iso_abstract_expand.xsl
index bdf6d9c19a3..8229d658ba0 100644
---
a/components/camel-schematron/src/main/resources/iso-schematron-xslt2/iso_abstract_expand.xsl
+++
b/components/camel-schematron/src/main/resources/iso-schematron-xslt2/iso_abstract_expand.xsl
@@ -93,7 +93,7 @@ VERSION INFORMATION
* Original written for old namespace
* http://www.topologi.com/resources/iso-pre-pro.xsl
-->
-<xslt:stylesheet version="1.0"
xmlns:xslt="http://www.w3.org/1999/XSL/Transform";
+<xslt:stylesheet version="2.0"
xmlns:xslt="http://www.w3.org/1999/XSL/Transform";
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
xmlns:iso="http://purl.oclc.org/dsdl/schematron";
xmlns:nvdl="http://purl.oclc.org/dsdl/nvdl";
diff --git
a/components/camel-schematron/src/main/resources/iso-schematron-xslt2/iso_dsdl_include.xsl
b/components/camel-schematron/src/main/resources/iso-schematron-xslt2/iso_dsdl_include.xsl
index ded219d6284..10c4b03bf5d 100644
---
a/components/camel-schematron/src/main/resources/iso-schematron-xslt2/iso_dsdl_include.xsl
+++
b/components/camel-schematron/src/main/resources/iso-schematron-xslt2/iso_dsdl_include.xsl
@@ -126,7 +126,7 @@ THE SOFTWARE.
* RJ New
-->
-<xslt:stylesheet version="1.0"
+<xslt:stylesheet version="2.0"
xmlns:xslt="http://www.w3.org/1999/XSL/Transform";
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
xmlns:iso="http://purl.oclc.org/dsdl/schematron";
diff --git
a/components/camel-schematron/src/main/resources/iso-schematron-xslt2/iso_svrl_for_xslt2.xsl
b/components/camel-schematron/src/main/resources/iso-schematron-xslt2/iso_svrl_for_xslt2.xsl
index 28fb87e75b6..51c1ee7c757 100644
---
a/components/camel-schematron/src/main/resources/iso-schematron-xslt2/iso_svrl_for_xslt2.xsl
+++
b/components/camel-schematron/src/main/resources/iso-schematron-xslt2/iso_svrl_for_xslt2.xsl
@@ -163,7 +163,7 @@ THE SOFTWARE.
-->
<xsl:stylesheet
- version="1.0"
+ version="2.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
xmlns:xs="http://www.w3.org/2001/XMLSchema";
xmlns:axsl="http://www.w3.org/1999/XSL/TransformAlias";
diff --git a/parent/pom.xml b/parent/pom.xml
index d9bc60b68ac..acbdeb95ee7 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -593,8 +593,8 @@
<rxjava-version>1.3.4</rxjava-version>
<rxjava2-version>2.1.7</rxjava2-version>
<saaj-impl-version>1.3.2_2</saaj-impl-version>
- <saxon-bundle-version>9.7.0-18_1</saxon-bundle-version>
- <saxon-version>9.7.0-18</saxon-version>
+ <saxon-bundle-version>9.8.0-6_1</saxon-bundle-version>
+ <saxon-version>9.8.0-6</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>
@@ -774,7 +774,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.7.0,9.8)",
+ net.sf.saxon.*;version="[9.8.0,9.9)",
freemarker.*;version="[2.3.15,3)",
javax.persistence.*;version="[1.1,3)",
org.apache.lucene.*;version="${lucene-version-range}",
diff --git
a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
index f3dde809689..b837c6e831e 100644
---
a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
+++
b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
@@ -179,7 +179,7 @@
<dependency>
<groupId>net.sf.saxon</groupId>
<artifactId>Saxon-HE</artifactId>
- <version>9.7.0-18</version>
+ <version>9.8.0-5</version>
</dependency>
<dependency>
<groupId>ognl</groupId>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
> XQuery NPE going from saxon 9.5 to 9.7 (upgraded camel from2.17.4-> 2.20.1)
> ---------------------------------------------------------------------------
>
> Key: CAMEL-12081
> URL: https://issues.apache.org/jira/browse/CAMEL-12081
> Project: Camel
> Issue Type: Bug
> Components: camel-saxon
> Affects Versions: 2.20.1
> Environment: JDK 1.8.0_144. Windows 10 and Centos 7
> Reporter: Riaan Annandale
> Assignee: Dmitry Volodin
> Fix For: 2.20.2
>
>
> Hi guys
> I think saxon went to 9.7 in camel 2.18 (could be 19). Anyway, I used the
> latest to illustrate my problem (2.20.1 at the time of writing)
> I have a routes that receive XML payloads which I then transform via
> xqueries. Inside these I use local functions for readability (read: it's the
> first thing I tried when solving my problem and it worked).
> Since saxon went to 9.7 I get a null pointer exception when an xquery
> containing a local function tries to process the XML.
> To demonstrate this, I have made a GitHub project:
> [https://github.com/rannandale/xqueryIssue]
> In the project I use two xqueries to transform the same source.
> - One uses an inline for loop:
> <o>
> <variables>{for $v in /root/Data return $v/Name}</variables>
> </o>
> - One uses the local function style:
> declare function local:loopMe($nodes)
> {
> for $node in $nodes
> return
> <variables>{$node/*:Name}</variables>
> };
> <o>
> {local:loopMe(/root/Data)}
> </o>
> The latter is the one that returns the NPE.
> I know I could probably go refactor all my xqueries to match the inline
> style, but I figured I'd see if there is an issue here other than PEBKAC.
> They also get quite complex, so it's quite a bit of work.
> Thanks guys
> Riaan
--
This message was sent by Atlassian JIRA
(v6.4.14#64029)
