This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jelly.git
The following commit(s) were added to refs/heads/master by this push:
new fd662ae2 Update build for modern Java
fd662ae2 is described below
commit fd662ae20ca1644e4c7da2112c7aedda6351caa6
Author: Gary D. Gregory <[email protected]>
AuthorDate: Tue Jan 14 07:32:53 2025 -0500
Update build for modern Java
- Bump xmlunit:xmlunit from a mix of 0.8 and 1.0 to 1.6
- Add Xerces since it's no longer in Java and XMLUnit needs it
---
.github/workflows/maven.yml | 4 ++--
jelly-tags/jaxme/pom.xml | 2 +-
jelly-tags/xmlunit/pom.xml | 2 +-
pom.xml | 2 +-
src/changes/changes.xml | 2 ++
5 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 7d2b5e99..76d94977 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -26,8 +26,8 @@ jobs:
continue-on-error: ${{ matrix.experimental }}
strategy:
matrix:
- java: [ 8]
- os: [ubuntu-latest]
+ java: [ 8, 17 ]
+ os: [ ubuntu-latest ]
experimental: [false]
# Don't need
include:
diff --git a/jelly-tags/jaxme/pom.xml b/jelly-tags/jaxme/pom.xml
index f380f81e..5f4b7e2e 100644
--- a/jelly-tags/jaxme/pom.xml
+++ b/jelly-tags/jaxme/pom.xml
@@ -82,7 +82,7 @@
<dependency>
<artifactId>xmlunit</artifactId>
<groupId>xmlunit</groupId>
- <version>0.8</version>
+ <version>1.6</version>
<scope>test</scope>
</dependency>
diff --git a/jelly-tags/xmlunit/pom.xml b/jelly-tags/xmlunit/pom.xml
index 33ce47a6..b6f54dbc 100644
--- a/jelly-tags/xmlunit/pom.xml
+++ b/jelly-tags/xmlunit/pom.xml
@@ -34,7 +34,7 @@
<dependency>
<groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId>
- <version>1.0</version>
+ <version>1.6</version>
</dependency>
<dependency>
<groupId>commons-jelly</groupId>
diff --git a/pom.xml b/pom.xml
index d080a86e..f830c8b3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -449,7 +449,7 @@
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
- <version>2.2.1</version>
+ <version>2.12.2</version>
</dependency>
</dependencies>
<reporting>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 5f7c2356..fe2e13ce 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -51,11 +51,13 @@ The <action> type attribute can be add,update,fix,remove.
<!-- FIX -->
<action type="fix" due-to="ggregory">Throw specialized RuntimeExceptions
instead of plain RuntimeExceptions.</action>
<action type="fix" due-to="ggregory">Deprecate NestedRuntimeException
for RuntimeException.</action>
+ <action type="fix" due-to="ggregory">Fix building on modern
Java.</action>
<!-- UPDATE -->
<action type="update" due-to="ggregory">Bump Java from 7 to 8.</action>
<action type="update" due-to="ggregory">Bump commons-parent from 42 to
58.</action>
<action type="update" dev="ggregory" due-to="Gary Gregory">Bump
commons-logging from 1.0.3 to 1.3.0.</action>
<action type="update" dev="ggregory" due-to="Gary Gregory">Bump
commons-beanutils:commons-beanutils from a mix of 1.6 and 1.7.0 to
1.10.0.</action>
+ <action type="update" dev="ggregory" due-to="Gary Gregory">Bump
xmlunit:xmlunit from a mix of 0.8 and 1.0 to 1.6.</action>
</release>
</body>
</document>
