This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch camel-3.11.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit eabbb511a3a999f767e1bfa7bd0e5c9e74b306ab
Author: Colm O hEigeartaigh <cohei...@apache.org>
AuthorDate: Fri Feb 18 07:38:00 2022 +0000
Fixup previous commit
---
camel-dependencies/pom.xml | 9 ++-------
.../camel/dataformat/xstream/MarshalMapCVE202026217Test.java | 2 +-
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 494ca66..cca7bdd 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -561,7 +561,7 @@
<xbean-spring-version>4.17</xbean-spring-version>
<xchange-guava-version>29.0-jre</xchange-guava-version>
<xchange-version>5.0.11</xchange-version>
- <xerces-version>2.12.0</xerces-version>
+ <xerces-version>2.12.2</xerces-version>
<xml-apis-ext-version>1.3.04</xml-apis-ext-version>
<xml-apis-version>1.4.01</xml-apis-version>
<xml-resolver-version>1.2</xml-resolver-version>
@@ -569,13 +569,8 @@
<xmlsec-version>2.1.7</xmlsec-version>
<xmlunit-version>2.6.3</xmlunit-version>
<xpp3-version>1.1.4c</xpp3-version>
-<<<<<<< HEAD
- <xstream-version>1.4.17</xstream-version>
-
<yetus-audience-annotations-version>0.11.0</yetus-audience-annotations-version>
-=======
<xstream-version>1.4.19</xstream-version>
-
<yetus-audience-annotations-version>0.13.0</yetus-audience-annotations-version>
->>>>>>> 37a061d13e0 (Upgrade to xstream 1.4.19)
+
<yetus-audience-annotations-version>0.11.0</yetus-audience-annotations-version>
<zendesk-client-version>0.14.1</zendesk-client-version>
<zipkin-reporter-version>2.16.3</zipkin-reporter-version>
<zipkin-version>2.23.2</zipkin-version>
diff --git
a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalMapCVE202026217Test.java
b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalMapCVE202026217Test.java
index 8c5d38f..322c880 100644
---
a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalMapCVE202026217Test.java
+++
b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalMapCVE202026217Test.java
@@ -55,7 +55,7 @@ public class MarshalMapCVE202026217Test extends
CamelTestSupport {
Exception exception = assertThrows(CamelExecutionException.class,
() -> template.sendBodyAndProperty("direct:in", body,
Exchange.CHARSET_NAME, "ISO-8859-1"));
- Assertions.assertInstanceOf(ForbiddenClassException.class,
exception.getCause());
+ Assertions.assertTrue(exception.getCause() instanceof
ForbiddenClassException);
}
@Override
