You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hop.apache.org by ha...@apache.org on 2022/03/10 07:20:00 UTC
[hop] branch master updated: HOP-3838 "javax.xml.stream" and "org.w3c.dom" packages are accessible from more than one module
This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hop.git
The following commit(s) were added to refs/heads/master by this push:
new ad3a699 HOP-3838 "javax.xml.stream" and "org.w3c.dom" packages are accessible from more than one module
new 4b54f38 Merge pull request #1416 from nadment/HOP-3838
ad3a699 is described below
commit ad3a699ba053b305d96239586bdbe618ffe36156
Author: Nicolas Adment <na...@gmail.com>
AuthorDate: Wed Mar 9 22:52:57 2022 +0100
HOP-3838 "javax.xml.stream" and "org.w3c.dom" packages are accessible
from more than one module
---
core/pom.xml | 11 -----------
engine/pom.xml | 2 ++
plugins/transforms/excelinput/pom.xml | 6 ++++++
plugins/transforms/xml/pom.xml | 10 ++++++++--
4 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index 61b86ca..71ba7f5 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -536,17 +536,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <version>1.4.01</version>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>com.googlecode.json-simple</groupId>
<artifactId>json-simple</artifactId>
<version>${json-simple.version}</version>
diff --git a/engine/pom.xml b/engine/pom.xml
index f0218fe..c051c5d 100644
--- a/engine/pom.xml
+++ b/engine/pom.xml
@@ -53,6 +53,7 @@
<picocli-version>4.6.3</picocli-version>
<json-simple.version>1.1.1</json-simple.version>
<commons-vfs2.version>2.9.0</commons-vfs2.version>
+ <jaxen.version>1.2.0</jaxen.version>
</properties>
<dependencies>
@@ -485,6 +486,7 @@
<dependency>
<groupId>jaxen</groupId>
<artifactId>jaxen</artifactId>
+ <version>${jaxen.version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/plugins/transforms/excelinput/pom.xml b/plugins/transforms/excelinput/pom.xml
index a860ea8..45d2bde 100644
--- a/plugins/transforms/excelinput/pom.xml
+++ b/plugins/transforms/excelinput/pom.xml
@@ -71,6 +71,12 @@
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>${xerces.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
diff --git a/plugins/transforms/xml/pom.xml b/plugins/transforms/xml/pom.xml
index 26fa77e..1dc309a 100644
--- a/plugins/transforms/xml/pom.xml
+++ b/plugins/transforms/xml/pom.xml
@@ -35,7 +35,7 @@
<properties>
<saxon.version>8.7</saxon.version>
- <jaxen.version>1.1.6</jaxen.version>
+ <jaxen.version>1.2.0</jaxen.version>
</properties>
<dependencies>
@@ -48,6 +48,12 @@
<groupId>jaxen</groupId>
<artifactId>jaxen</artifactId>
<version>${jaxen.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>