This is an automated email from the ASF dual-hosted git repository.
garydgregory 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 4c079994 Bump commons-parent from 104 to 105.
4c079994 is described below
commit 4c07999493996798cb71a8bac11b74e93f4f9dc7
Author: Gary Gregory <[email protected]>
AuthorDate: Mon Sep 7 16:06:23 2026 -0400
Bump commons-parent from 104 to 105.
- Updated JUnit to 4.13.2 for Surefire 3.6.0 compatibility.
- Fixed the Betwixt fixture modifying a running test suite.
---
core/pom.xml | 2 +-
.../src/test/resources/org/apache/commons/jelly/betwixt/common.jelly | 4 ++--
jelly-tags/junit/pom.xml | 2 +-
jelly-tags/validate/pom.xml | 2 +-
pom.xml | 5 +++--
src/changes/changes.xml | 2 +-
6 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index ed6b7621..f3acc7c1 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -85,7 +85,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>${junit4.version}</version>
</dependency>
<dependency>
<groupId>dom4j</groupId>
diff --git
a/jelly-tags/betwixt/src/test/resources/org/apache/commons/jelly/betwixt/common.jelly
b/jelly-tags/betwixt/src/test/resources/org/apache/commons/jelly/betwixt/common.jelly
index 4df5fdf9..dfb25740 100644
---
a/jelly-tags/betwixt/src/test/resources/org/apache/commons/jelly/betwixt/common.jelly
+++
b/jelly-tags/betwixt/src/test/resources/org/apache/commons/jelly/betwixt/common.jelly
@@ -18,7 +18,7 @@
<!-- common tests that the channel has been created properly -->
-<test:suite xmlns:j="jelly:core" xmlns:test="jelly:junit"
xmlns:b="jelly:betwixt" xmlns:log="jelly:log">
+<j:jelly xmlns:j="jelly:core" xmlns:test="jelly:junit" xmlns:b="jelly:betwixt"
xmlns:log="jelly:log">
<log:info>Parsed channel with title: ${channel.title}</log:info>
@@ -26,4 +26,4 @@
<test:assertEquals actual="${channel.title}" expected="MozillaZine"/>
-</test:suite>
+</j:jelly>
diff --git a/jelly-tags/junit/pom.xml b/jelly-tags/junit/pom.xml
index b69565a3..fd72ed06 100644
--- a/jelly-tags/junit/pom.xml
+++ b/jelly-tags/junit/pom.xml
@@ -34,7 +34,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>${junit4.version}</version>
</dependency>
<!-- END for compilation -->
diff --git a/jelly-tags/validate/pom.xml b/jelly-tags/validate/pom.xml
index 4a71d43a..ea452620 100644
--- a/jelly-tags/validate/pom.xml
+++ b/jelly-tags/validate/pom.xml
@@ -39,7 +39,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>${junit4.version}</version>
</dependency>
<dependency>
<groupId>msv</groupId>
diff --git a/pom.xml b/pom.xml
index b186102c..8787493d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.commons</groupId>
<artifactId>commons-parent</artifactId>
- <version>104</version>
+ <version>105</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>commons-jelly</groupId>
@@ -82,6 +82,7 @@
<commons.encoding>utf-8</commons.encoding>
<xalan.version>2.7.3</xalan.version>
<mx4j.version>3.0.1</mx4j.version>
+ <junit4.version>4.13.2</junit4.version>
</properties>
<issueManagement>
@@ -186,7 +187,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>4.13.2</version>
</dependency>
<dependency>
<groupId>dom4j</groupId>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 7b3382ed..8d4f6d8b 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -53,7 +53,7 @@ The <action> type attribute can be add,update,fix,remove.
<action type="fix" dev="ggregory" due-to="Gary Gregory">Fix building on
modern Java.</action>
<!-- UPDATE -->
<action type="update" dev="ggregory" due-to="Gary Gregory">Bump Java
from 7 to 8.</action>
- <action type="update" dev="ggregory" due-to="Gary Gregory">Bump
commons-parent from 42 to 104.</action>
+ <action type="update" dev="ggregory" due-to="Gary Gregory">Bump
commons-parent from 42 to 105.</action>
<action type="update" dev="sebb" >Update jaxen:jaxen 1.1.6 =>
2.0.0</action>
<action type="update" dev="ggregory" due-to="Gary Gregory">Bump
commons-logging from 1.0.3 to 1.4.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
org.apache.commons:commons-beanutils2 2.0.0-M2.