This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch fix-conflict-deps
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 403c3c4a10b270e97090dbb113ff146c3d200855
Author: Kusal Kithul-Godage <g...@kusal.io>
AuthorDate: Sun Oct 15 23:37:13 2023 +1100
Unify HtmlUnit versions
---
apps/rest-showcase/pom.xml | 1 -
apps/showcase/pom.xml | 1 -
pom.xml | 7 +++++++
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml
index e891f704d..7c6f16051 100644
--- a/apps/rest-showcase/pom.xml
+++ b/apps/rest-showcase/pom.xml
@@ -78,7 +78,6 @@
<dependency>
<groupId>net.sourceforge.htmlunit</groupId>
<artifactId>htmlunit</artifactId>
- <version>2.39.0</version>
<scope>test</scope>
</dependency>
diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml
index 87b524ac1..263c029f8 100644
--- a/apps/showcase/pom.xml
+++ b/apps/showcase/pom.xml
@@ -140,7 +140,6 @@
<dependency>
<groupId>net.sourceforge.htmlunit</groupId>
<artifactId>htmlunit</artifactId>
- <version>2.61.0</version>
<scope>test</scope>
</dependency>
diff --git a/pom.xml b/pom.xml
index 7865fb7af..e006c2365 100644
--- a/pom.xml
+++ b/pom.xml
@@ -968,6 +968,13 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>net.sourceforge.htmlunit</groupId>
+ <artifactId>htmlunit</artifactId>
+ <version>2.70.0</version>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>jmock</groupId>
<artifactId>jmock</artifactId>
