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 2017/11/23 11:50:26 UTC

[camel] branch master updated: Upgrade Saxon and related bundle to version 9.8.0-5 and regen

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


The following commit(s) were added to refs/heads/master by this push:
     new c501ba7  Upgrade Saxon and related bundle to version 9.8.0-5 and regen
c501ba7 is described below

commit c501ba7e6d8c94ad3c26c78a4ee941fdd745717f
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Nov 23 12:49:07 2017 +0100

    Upgrade Saxon and related bundle to version 9.8.0-5 and regen
---
 .../test/resources/org/apache/camel/component/xslt/terminate.xsl    | 2 +-
 .../test/resources/org/apache/camel/component/xslt/transform.xsl    | 2 +-
 .../resources/org/apache/camel/component/xslt/transform_dtd.xsl     | 2 +-
 .../org/apache/camel/component/xslt/transform_includes_data.xsl     | 2 +-
 .../resources/org/apache/camel/component/xslt/transform_text.xsl    | 2 +-
 .../org/apache/camel/component/xslt/transform_text_imported.xsl     | 2 +-
 .../org/apache/camel/util/toolbox/aggregate-user-property.xsl       | 2 +-
 .../src/test/resources/org/apache/camel/util/toolbox/aggregate.xsl  | 2 +-
 .../src/main/resources/iso-schematron-xslt2/ExtractSchFromXSD-2.xsl | 2 +-
 .../src/main/resources/iso-schematron-xslt2/iso_abstract_expand.xsl | 2 +-
 .../src/main/resources/iso-schematron-xslt2/iso_dsdl_include.xsl    | 2 +-
 .../src/main/resources/iso-schematron-xslt2/iso_svrl_for_xslt2.xsl  | 2 +-
 parent/pom.xml                                                      | 6 +++---
 .../spring-boot-dm/camel-spring-boot-dependencies/pom.xml           | 2 +-
 14 files changed, 16 insertions(+), 16 deletions(-)

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 d4d9860..eadebe8 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 fea1e63..3b2651a 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 1ad29bd..96cb5ae 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 610ab3a..bf9eca2 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 6c38e4a..e8de2fe 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 e7ae4b0..931cf0e 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 74bdd85..75404db 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 8d20385..8f6612e 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 39a21e2..47d4804 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 bdf6d9c..8229d65 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 ded219d..10c4b03 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 28fb87e..51c1ee7c7 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 1e5031c..b9c72af 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -600,8 +600,8 @@
     <rxjava-version>1.3.4</rxjava-version>
     <rxjava2-version>2.1.6</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-5_1</saxon-bundle-version>
+    <saxon-version>9.8.0-5</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>
@@ -781,7 +781,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 a17e03c..5e927aa 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>

-- 
To stop receiving notification emails like this one, please contact
['"commits@camel.apache.org" <co...@camel.apache.org>'].