From 72c34c116d6697e0848151ae705388836f4676f8 Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Sat, 13 Sep 2025 15:20:02 +0200 Subject: [PATCH 1/4] prepare next iteration --- .circleci/config.yml | 2 +- RELEASE_NOTES.md | 2 ++ pom.xml | 2 +- xmlunit-assertj/pom.xml | 2 +- xmlunit-assertj3/pom.xml | 2 +- xmlunit-bom/pom.xml | 2 +- xmlunit-core/pom.xml | 2 +- xmlunit-jakarta-jaxb-impl/pom.xml | 2 +- xmlunit-legacy/pom.xml | 2 +- xmlunit-matchers/pom.xml | 2 +- xmlunit-placeholders/pom.xml | 2 +- 11 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6be94ec1..a95cdbc2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,7 +5,7 @@ orbs: parameters: xmlunit-version: type: string - default: "2.10.4" + default: "2.10.5-SNAPSHOT" commands: full-checkout: diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index a2e5891c..64bae658 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,5 +1,7 @@ # Release Notes +## XMLUnit for Java 2.10.5 - /not released, yet/ + ## XMLUnit for Java 2.10.4 - /Released 2025-09-13/ * attributes with `null` values could cause a `NullPointerException`. diff --git a/pom.xml b/pom.xml index c9589cb4..d0617d55 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.xmlunit xmlunit-parent pom - 2.10.4 + 2.10.5-SNAPSHOT org.xmlunit:xmlunit-parent Parent POM for all artifacts of XMLUnit https://www.xmlunit.org/ diff --git a/xmlunit-assertj/pom.xml b/xmlunit-assertj/pom.xml index fefb04c8..4c5b587e 100644 --- a/xmlunit-assertj/pom.xml +++ b/xmlunit-assertj/pom.xml @@ -18,7 +18,7 @@ xmlunit-parent org.xmlunit - 2.10.4 + 2.10.5-SNAPSHOT 4.0.0 diff --git a/xmlunit-assertj3/pom.xml b/xmlunit-assertj3/pom.xml index 861c4f55..ea18a00b 100644 --- a/xmlunit-assertj3/pom.xml +++ b/xmlunit-assertj3/pom.xml @@ -18,7 +18,7 @@ xmlunit-parent org.xmlunit - 2.10.4 + 2.10.5-SNAPSHOT 4.0.0 diff --git a/xmlunit-bom/pom.xml b/xmlunit-bom/pom.xml index fa9a909c..c1856956 100644 --- a/xmlunit-bom/pom.xml +++ b/xmlunit-bom/pom.xml @@ -18,7 +18,7 @@ org.xmlunit xmlunit-bom pom - 2.10.4 + 2.10.5-SNAPSHOT org.xmlunit:xmlunit-bom Bill of Materials (BOM) for XMLUnit https://www.xmlunit.org/ diff --git a/xmlunit-core/pom.xml b/xmlunit-core/pom.xml index d169d7e4..9edab077 100644 --- a/xmlunit-core/pom.xml +++ b/xmlunit-core/pom.xml @@ -18,7 +18,7 @@ org.xmlunit xmlunit-parent - 2.10.4 + 2.10.5-SNAPSHOT org.xmlunit diff --git a/xmlunit-jakarta-jaxb-impl/pom.xml b/xmlunit-jakarta-jaxb-impl/pom.xml index 158d62e7..75955ef5 100644 --- a/xmlunit-jakarta-jaxb-impl/pom.xml +++ b/xmlunit-jakarta-jaxb-impl/pom.xml @@ -18,7 +18,7 @@ xmlunit-parent org.xmlunit - 2.10.4 + 2.10.5-SNAPSHOT 4.0.0 diff --git a/xmlunit-legacy/pom.xml b/xmlunit-legacy/pom.xml index ceb16d7b..28443212 100644 --- a/xmlunit-legacy/pom.xml +++ b/xmlunit-legacy/pom.xml @@ -18,7 +18,7 @@ org.xmlunit xmlunit-parent - 2.10.4 + 2.10.5-SNAPSHOT org.xmlunit diff --git a/xmlunit-matchers/pom.xml b/xmlunit-matchers/pom.xml index cda9d890..63b03acd 100644 --- a/xmlunit-matchers/pom.xml +++ b/xmlunit-matchers/pom.xml @@ -18,7 +18,7 @@ org.xmlunit xmlunit-parent - 2.10.4 + 2.10.5-SNAPSHOT org.xmlunit diff --git a/xmlunit-placeholders/pom.xml b/xmlunit-placeholders/pom.xml index c6a1973c..bdb61138 100644 --- a/xmlunit-placeholders/pom.xml +++ b/xmlunit-placeholders/pom.xml @@ -18,7 +18,7 @@ xmlunit-parent org.xmlunit - 2.10.4 + 2.10.5-SNAPSHOT 4.0.0 From b3d86ad8b8c85aa9b5951640577ed3ce3ba69aff Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Sat, 13 Sep 2025 15:20:27 +0200 Subject: [PATCH 2/4] don't sign cyclonedx signatures/checksum --- create-bin-dist.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/create-bin-dist.sh b/create-bin-dist.sh index a17e8e34..e671bcb3 100755 --- a/create-bin-dist.sh +++ b/create-bin-dist.sh @@ -37,7 +37,7 @@ bzip2 xmlunit-$1-bin.tar mv xmlunit-$1-bin.* .. cd .. -for i in *.zip *.tar.gz *.tar.bz2 *-cyclonedx.*; do +for i in *.zip *.tar.gz *.tar.bz2 *-cyclonedx.xml *-cyclonedx.json; do sha256sum $i > $i.sha256 gpg --use-agent --detach-sign --armor $i done From 0500c61575378fb70734fc3bc03a2653564c4729 Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Mon, 20 Oct 2025 21:39:56 +0200 Subject: [PATCH 3/4] remove hard dependency on glassfish's JAXB implementation suggested by @pigelvy in #313 --- .circleci/config.yml | 2 +- RELEASE_NOTES.md | 8 +++++++- pom.xml | 2 +- xmlunit-assertj/pom.xml | 2 +- xmlunit-assertj3/pom.xml | 2 +- xmlunit-bom/pom.xml | 2 +- xmlunit-core/pom.xml | 2 +- xmlunit-jakarta-jaxb-impl/pom.xml | 3 ++- xmlunit-legacy/pom.xml | 2 +- xmlunit-matchers/pom.xml | 2 +- xmlunit-placeholders/pom.xml | 2 +- 11 files changed, 18 insertions(+), 11 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a95cdbc2..5270a657 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,7 +5,7 @@ orbs: parameters: xmlunit-version: type: string - default: "2.10.5-SNAPSHOT" + default: "2.11.0-SNAPSHOT" commands: full-checkout: diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 64bae658..f2ae1afa 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,6 +1,12 @@ # Release Notes -## XMLUnit for Java 2.10.5 - /not released, yet/ +## XMLUnit for Java 2.11.0 - /not released, yet/ + +* the `xmlunit-jakarta-jaxb-impl` no longer depends on `org.glassfish.jaxb:jaxb-runtime` directly. + Issue [#313](https://github.com/xmlunit/xmlunit/issues/313) PR [#314](https://github.com/xmlunit/xmlunit/pull/314) + + This is a breaking change and may force you to add an explicit dependency if you are using the module and rely on + XMLUnit to provide the JAXB implementation. ## XMLUnit for Java 2.10.4 - /Released 2025-09-13/ diff --git a/pom.xml b/pom.xml index d0617d55..1f134bef 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.xmlunit xmlunit-parent pom - 2.10.5-SNAPSHOT + 2.11.0-SNAPSHOT org.xmlunit:xmlunit-parent Parent POM for all artifacts of XMLUnit https://www.xmlunit.org/ diff --git a/xmlunit-assertj/pom.xml b/xmlunit-assertj/pom.xml index 4c5b587e..e55b09bf 100644 --- a/xmlunit-assertj/pom.xml +++ b/xmlunit-assertj/pom.xml @@ -18,7 +18,7 @@ xmlunit-parent org.xmlunit - 2.10.5-SNAPSHOT + 2.11.0-SNAPSHOT 4.0.0 diff --git a/xmlunit-assertj3/pom.xml b/xmlunit-assertj3/pom.xml index ea18a00b..3000712e 100644 --- a/xmlunit-assertj3/pom.xml +++ b/xmlunit-assertj3/pom.xml @@ -18,7 +18,7 @@ xmlunit-parent org.xmlunit - 2.10.5-SNAPSHOT + 2.11.0-SNAPSHOT 4.0.0 diff --git a/xmlunit-bom/pom.xml b/xmlunit-bom/pom.xml index c1856956..6f915f48 100644 --- a/xmlunit-bom/pom.xml +++ b/xmlunit-bom/pom.xml @@ -18,7 +18,7 @@ org.xmlunit xmlunit-bom pom - 2.10.5-SNAPSHOT + 2.11.0-SNAPSHOT org.xmlunit:xmlunit-bom Bill of Materials (BOM) for XMLUnit https://www.xmlunit.org/ diff --git a/xmlunit-core/pom.xml b/xmlunit-core/pom.xml index 9edab077..6a56852f 100644 --- a/xmlunit-core/pom.xml +++ b/xmlunit-core/pom.xml @@ -18,7 +18,7 @@ org.xmlunit xmlunit-parent - 2.10.5-SNAPSHOT + 2.11.0-SNAPSHOT org.xmlunit diff --git a/xmlunit-jakarta-jaxb-impl/pom.xml b/xmlunit-jakarta-jaxb-impl/pom.xml index 75955ef5..10d3b0a5 100644 --- a/xmlunit-jakarta-jaxb-impl/pom.xml +++ b/xmlunit-jakarta-jaxb-impl/pom.xml @@ -18,7 +18,7 @@ xmlunit-parent org.xmlunit - 2.10.5-SNAPSHOT + 2.11.0-SNAPSHOT 4.0.0 @@ -49,6 +49,7 @@ org.glassfish.jaxb jaxb-runtime ${jakarta.xml.bind.version} + test junit diff --git a/xmlunit-legacy/pom.xml b/xmlunit-legacy/pom.xml index 28443212..edae9cfe 100644 --- a/xmlunit-legacy/pom.xml +++ b/xmlunit-legacy/pom.xml @@ -18,7 +18,7 @@ org.xmlunit xmlunit-parent - 2.10.5-SNAPSHOT + 2.11.0-SNAPSHOT org.xmlunit diff --git a/xmlunit-matchers/pom.xml b/xmlunit-matchers/pom.xml index 63b03acd..37a29175 100644 --- a/xmlunit-matchers/pom.xml +++ b/xmlunit-matchers/pom.xml @@ -18,7 +18,7 @@ org.xmlunit xmlunit-parent - 2.10.5-SNAPSHOT + 2.11.0-SNAPSHOT org.xmlunit diff --git a/xmlunit-placeholders/pom.xml b/xmlunit-placeholders/pom.xml index bdb61138..5facdbde 100644 --- a/xmlunit-placeholders/pom.xml +++ b/xmlunit-placeholders/pom.xml @@ -18,7 +18,7 @@ xmlunit-parent org.xmlunit - 2.10.5-SNAPSHOT + 2.11.0-SNAPSHOT 4.0.0 From 02aef5d5950d4f113d26b3bc6d32320a0d1ec6f1 Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Fri, 24 Oct 2025 13:47:28 +0200 Subject: [PATCH 4/4] release 2.11.0 --- .circleci/config.yml | 2 +- RELEASE_NOTES.md | 2 +- pom.xml | 2 +- xmlunit-assertj/pom.xml | 2 +- xmlunit-assertj3/pom.xml | 2 +- xmlunit-bom/pom.xml | 2 +- xmlunit-core/pom.xml | 2 +- xmlunit-jakarta-jaxb-impl/pom.xml | 2 +- xmlunit-legacy/pom.xml | 2 +- xmlunit-matchers/pom.xml | 2 +- xmlunit-placeholders/pom.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5270a657..bcf3b2c9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,7 +5,7 @@ orbs: parameters: xmlunit-version: type: string - default: "2.11.0-SNAPSHOT" + default: "2.11.0" commands: full-checkout: diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index f2ae1afa..15e1ea08 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,6 +1,6 @@ # Release Notes -## XMLUnit for Java 2.11.0 - /not released, yet/ +## XMLUnit for Java 2.11.0 - /Released 2025-10-24/ * the `xmlunit-jakarta-jaxb-impl` no longer depends on `org.glassfish.jaxb:jaxb-runtime` directly. Issue [#313](https://github.com/xmlunit/xmlunit/issues/313) PR [#314](https://github.com/xmlunit/xmlunit/pull/314) diff --git a/pom.xml b/pom.xml index 1f134bef..42948466 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.xmlunit xmlunit-parent pom - 2.11.0-SNAPSHOT + 2.11.0 org.xmlunit:xmlunit-parent Parent POM for all artifacts of XMLUnit https://www.xmlunit.org/ diff --git a/xmlunit-assertj/pom.xml b/xmlunit-assertj/pom.xml index e55b09bf..695d9a05 100644 --- a/xmlunit-assertj/pom.xml +++ b/xmlunit-assertj/pom.xml @@ -18,7 +18,7 @@ xmlunit-parent org.xmlunit - 2.11.0-SNAPSHOT + 2.11.0 4.0.0 diff --git a/xmlunit-assertj3/pom.xml b/xmlunit-assertj3/pom.xml index 3000712e..a631cdd3 100644 --- a/xmlunit-assertj3/pom.xml +++ b/xmlunit-assertj3/pom.xml @@ -18,7 +18,7 @@ xmlunit-parent org.xmlunit - 2.11.0-SNAPSHOT + 2.11.0 4.0.0 diff --git a/xmlunit-bom/pom.xml b/xmlunit-bom/pom.xml index 6f915f48..57b88eb6 100644 --- a/xmlunit-bom/pom.xml +++ b/xmlunit-bom/pom.xml @@ -18,7 +18,7 @@ org.xmlunit xmlunit-bom pom - 2.11.0-SNAPSHOT + 2.11.0 org.xmlunit:xmlunit-bom Bill of Materials (BOM) for XMLUnit https://www.xmlunit.org/ diff --git a/xmlunit-core/pom.xml b/xmlunit-core/pom.xml index 6a56852f..741d0cf2 100644 --- a/xmlunit-core/pom.xml +++ b/xmlunit-core/pom.xml @@ -18,7 +18,7 @@ org.xmlunit xmlunit-parent - 2.11.0-SNAPSHOT + 2.11.0 org.xmlunit diff --git a/xmlunit-jakarta-jaxb-impl/pom.xml b/xmlunit-jakarta-jaxb-impl/pom.xml index 10d3b0a5..dee6d8a8 100644 --- a/xmlunit-jakarta-jaxb-impl/pom.xml +++ b/xmlunit-jakarta-jaxb-impl/pom.xml @@ -18,7 +18,7 @@ xmlunit-parent org.xmlunit - 2.11.0-SNAPSHOT + 2.11.0 4.0.0 diff --git a/xmlunit-legacy/pom.xml b/xmlunit-legacy/pom.xml index edae9cfe..947d6684 100644 --- a/xmlunit-legacy/pom.xml +++ b/xmlunit-legacy/pom.xml @@ -18,7 +18,7 @@ org.xmlunit xmlunit-parent - 2.11.0-SNAPSHOT + 2.11.0 org.xmlunit diff --git a/xmlunit-matchers/pom.xml b/xmlunit-matchers/pom.xml index 37a29175..05a2c28b 100644 --- a/xmlunit-matchers/pom.xml +++ b/xmlunit-matchers/pom.xml @@ -18,7 +18,7 @@ org.xmlunit xmlunit-parent - 2.11.0-SNAPSHOT + 2.11.0 org.xmlunit diff --git a/xmlunit-placeholders/pom.xml b/xmlunit-placeholders/pom.xml index 5facdbde..efb5fef3 100644 --- a/xmlunit-placeholders/pom.xml +++ b/xmlunit-placeholders/pom.xml @@ -18,7 +18,7 @@ xmlunit-parent org.xmlunit - 2.11.0-SNAPSHOT + 2.11.0 4.0.0