[camel] branch master updated (2c5a2d3 -> 3c46d28)

[ac...@apache.org]

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 2c5a2d3  CAMEL-12238 - Updated docs
     add 3c46d28  CAMEL-12865: Resolve relative XSLT references from importing XSLT

No new revisions were added by this update.

Summary of changes:
 .../main/java/org/apache/camel/builder/xml/XsltUriResolver.java  | 6 +++---
 .../main/java/org/apache/camel/component/xslt/XsltEndpoint.java  | 1 -
 .../{XsltIncludeTest.java => XsltIncludeRelativeNestedTest.java} | 9 +++------
 .../included/staff_included_nested_level_1.xsl}                  | 2 ++
 ...lude_relative_other.xsl => staff_include_relative_nested.xsl} | 2 +-
 .../xslt/staff_included_nested_level_2.xsl}                      | 6 ++----
 6 files changed, 11 insertions(+), 15 deletions(-)
 copy camel-core/src/test/java/org/apache/camel/component/xslt/{XsltIncludeTest.java => XsltIncludeRelativeNestedTest.java} (84%)
 copy camel-core/src/test/resources/org/apache/camel/component/{staff_other_template.xsl => xslt/included/staff_included_nested_level_1.xsl} (94%)
 copy camel-core/src/test/resources/org/apache/camel/component/xslt/{staff_include_relative_other.xsl => staff_include_relative_nested.xsl} (92%)
 copy camel-core/src/test/resources/org/apache/camel/{builder/xml/example-with-errors.xsl => component/xslt/staff_included_nested_level_2.xsl} (91%)