You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2022/08/31 18:53:32 UTC
[camel] branch main updated: CAMEL-18346 Remove use of xalan : remove profiles, remove from camel-eip-documentation-enricher-maven-plugin, remove from camel-xmlsecurity (#8247)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new f1180a9e59d CAMEL-18346 Remove use of xalan : remove profiles, remove from camel-eip-documentation-enricher-maven-plugin, remove from camel-xmlsecurity (#8247)
f1180a9e59d is described below
commit f1180a9e59d3697f438efd00fa4baeb7d4059e41
Author: Tom Cunningham <tc...@redhat.com>
AuthorDate: Wed Aug 31 14:53:26 2022 -0400
CAMEL-18346 Remove use of xalan : remove profiles, remove from camel-eip-documentation-enricher-maven-plugin, remove from camel-xmlsecurity (#8247)
---
camel-dependencies/pom.xml | 1 -
components/camel-fop/pom.xml | 11 -----------
components/camel-xmlsecurity/pom.xml | 4 ----
core/camel-core-engine/pom.xml | 11 -----------
core/camel-management-api/pom.xml | 11 -----------
core/camel-management/pom.xml | 11 -----------
parent/pom.xml | 6 ------
.../camel-eip-documentation-enricher-maven-plugin/pom.xml | 5 -----
.../camel/maven/integration/EIPDocumentationMojoTest.java | 5 +++--
9 files changed, 3 insertions(+), 62 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 416aa84265b..445858a8720 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -549,7 +549,6 @@
<wiremock-version>2.32.0</wiremock-version>
<woodstox-core-version>6.1.1</woodstox-core-version>
<woodstox-version>4.4.1</woodstox-version>
- <xalan-version>2.7.2</xalan-version>
<xbean-asm5-shaded-version>4.5</xbean-asm5-shaded-version>
<xbean-spring-version>4.21</xbean-spring-version>
<xchange-guava-version>29.0-jre</xchange-guava-version>
diff --git a/components/camel-fop/pom.xml b/components/camel-fop/pom.xml
index 27aa18ab93a..4f188e8879a 100644
--- a/components/camel-fop/pom.xml
+++ b/components/camel-fop/pom.xml
@@ -81,17 +81,6 @@
<scope>test</scope>
</dependency>
- <!-- Xalan Serializer dependencies are not -->
- <!-- correctly imported from batik for tests -->
- <!-- and as such they will fail. Must add to -->
- <!-- the test scope. -->
- <dependency>
- <groupId>xalan</groupId>
- <artifactId>serializer</artifactId>
- <version>${xalan-version}</version>
- <scope>test</scope>
- </dependency>
-
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
diff --git a/components/camel-xmlsecurity/pom.xml b/components/camel-xmlsecurity/pom.xml
index 436f5c71960..cb3eebd3e1b 100644
--- a/components/camel-xmlsecurity/pom.xml
+++ b/components/camel-xmlsecurity/pom.xml
@@ -57,10 +57,6 @@
<artifactId>xmlsec</artifactId>
<version>${xmlsec-version}</version>
</dependency>
- <dependency>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- </dependency>
<!-- test dependencies -->
<dependency>
diff --git a/core/camel-core-engine/pom.xml b/core/camel-core-engine/pom.xml
index a757e763795..798da8ccb8f 100644
--- a/core/camel-core-engine/pom.xml
+++ b/core/camel-core-engine/pom.xml
@@ -321,17 +321,6 @@
</build>
</profile>
- <profile>
- <id>xalan</id>
- <dependencies>
- <!-- enable the Xalan processor -->
- <dependency>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- <version>${xalan-version}</version>
- </dependency>
- </dependencies>
- </profile>
<profile>
<id>xerces</id>
<dependencies>
diff --git a/core/camel-management-api/pom.xml b/core/camel-management-api/pom.xml
index f1d3806b91a..fcfa16ab8a2 100644
--- a/core/camel-management-api/pom.xml
+++ b/core/camel-management-api/pom.xml
@@ -218,17 +218,6 @@
</build>
</profile>
- <profile>
- <id>xalan</id>
- <dependencies>
- <!-- enable the Xalan processor -->
- <dependency>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- <version>${xalan-version}</version>
- </dependency>
- </dependencies>
- </profile>
<profile>
<id>xerces</id>
<dependencies>
diff --git a/core/camel-management/pom.xml b/core/camel-management/pom.xml
index 05879d4155d..57caa72ee72 100644
--- a/core/camel-management/pom.xml
+++ b/core/camel-management/pom.xml
@@ -282,17 +282,6 @@
</build>
</profile>
- <profile>
- <id>xalan</id>
- <dependencies>
- <!-- enable the Xalan processor -->
- <dependency>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- <version>${xalan-version}</version>
- </dependency>
- </dependencies>
- </profile>
<profile>
<id>xerces</id>
<dependencies>
diff --git a/parent/pom.xml b/parent/pom.xml
index 1b430c6bef0..0c883e783f7 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -536,7 +536,6 @@
<wiremock-version>2.32.0</wiremock-version>
<woodstox-version>4.4.1</woodstox-version>
<woodstox-core-version>6.1.1</woodstox-core-version>
- <xalan-version>2.7.2</xalan-version>
<xbean-spring-version>4.21</xbean-spring-version>
<xbean-asm5-shaded-version>4.5</xbean-asm5-shaded-version>
<xchange-version>5.0.13</xchange-version>
@@ -3901,11 +3900,6 @@
<artifactId>commons-io</artifactId>
<version>${commons-io-version}</version>
</dependency>
- <dependency>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- <version>${xalan-version}</version>
- </dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
diff --git a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml
index fd34b535a66..9d36442ef3e 100644
--- a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml
+++ b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml
@@ -70,11 +70,6 @@
<artifactId>plexus-build-api</artifactId>
</dependency>
- <dependency>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- </dependency>
-
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
diff --git a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/integration/EIPDocumentationMojoTest.java b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/integration/EIPDocumentationMojoTest.java
index 466cd181e08..d7160ab6c13 100644
--- a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/integration/EIPDocumentationMojoTest.java
+++ b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/integration/EIPDocumentationMojoTest.java
@@ -67,6 +67,7 @@ public class EIPDocumentationMojoTest {
eipDocumentationEnricherMojo.execute();
DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
documentBuilderFactory.setNamespaceAware(true);
+ documentBuilderFactory.setCoalescing(true);
DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder();
Document doc = documentBuilder.parse(tempFile);
validateElement(doc);
@@ -109,8 +110,8 @@ public class EIPDocumentationMojoTest {
Node cdata = documentation.getFirstChild();
assertThat(cdata, instanceOf(CharacterData.class));
-
- assertThat(cdata.getTextContent(), containsString(expectedText));
+ CharacterData cd = (CharacterData) cdata;
+ assertThat(cd.getData(), containsString(expectedText));
}
private Element getFirsElement(NodeList nodeList) {