From 72c06a0a2d0793a79b1ea6b68eb453cc1ee9c867 Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Tue, 4 Jul 2023 10:14:21 +0200 Subject: [PATCH 1/7] [maven-release-plugin] prepare for next development iteration --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 35d72bc..32cff2a 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ limitations under the License. plexus-xml - 4.0.2 + 4.0.3-SNAPSHOT Plexus XML Utilities A collection of various utility classes to ease working with XML. @@ -33,7 +33,7 @@ limitations under the License. scm:git:https://github.com/codehaus-plexus/plexus-xml.git ${project.scm.connection} - plexus-xml-4.0.2 + master https://github.com/codehaus-plexus/plexus-xml/tree/${project.scm.tag}/ @@ -48,7 +48,7 @@ limitations under the License. - 2023-07-04T08:14:13Z + 2023-07-04T08:14:21Z From bcf34dcd790955f6381efe442f2d24dbe2b8170e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Boutemy?= Date: Sat, 9 Sep 2023 14:46:23 +0200 Subject: [PATCH 2/7] describe plexus-xml update to maven-xml-impl --- README.md | 4 +++- src/site/markdown/index.md | 8 ++++++++ src/site/site.xml | 3 +++ 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 src/site/markdown/index.md diff --git a/README.md b/README.md index 379ac1e..89bb19d 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,9 @@ Plexus-Xml [![Build Status](https://github.com/codehaus-plexus/plexus-xml/actions/workflows/maven.yml/badge.svg)](https://github.com/codehaus-plexus/plexus-xml/actions) [![Maven Central](https://img.shields.io/maven-central/v/org.codehaus.plexus/plexus-xml.svg?label=Maven%20Central)](https://search.maven.org/artifact/org.codehaus.plexus/plexus-xml) -This library consists of XML classes (`org.codehaus.plexus.util.xml`, and `ReaderFactory`/`WriterFactory` moved from `org.codehaus.plexus.util`) that have been extracted from [`plexus-utils`](https://github.com/codehaus-plexus/plexus-utils/) 4. +This library consists of XML classes (`org.codehaus.plexus.util.xml` and `org.codehaus.plexus.util.xml.pull`) that: +1. have been extracted from [`plexus-utils`](https://github.com/codehaus-plexus/plexus-utils/) 4, +2. then updated to use [`maven-xml-api`](https://github.com/apache/maven/tree/maven-4.0.0-alpha-7/api/maven-api-xml)/[`maven-xml-impl`](https://github.com/apache/maven/tree/maven-4.0.0-alpha-7/maven-xml-impl) For publishing [the site](https://codehaus-plexus.github.io/plexus-xml/) do the following: diff --git a/src/site/markdown/index.md b/src/site/markdown/index.md new file mode 100644 index 0000000..823a3b2 --- /dev/null +++ b/src/site/markdown/index.md @@ -0,0 +1,8 @@ +## Plexus XML Utilities + +A collection of various utility classes to ease working with XML. + +This library consists of XML classes (`org.codehaus.plexus.util.xml` and `org.codehaus.plexus.util.xml.pull`): +1. that have been extracted from [`plexus-utils`](../plexus-utils/) 4, +2. then updated to use [`maven-xml-api`](https://maven.apache.org/ref/4.0.0-alpha-7/api/maven-api-xml/)/[`maven-xml-impl`](https://maven.apache.org/ref/4.0.0-alpha-7/maven-xml-impl/index.html) + diff --git a/src/site/site.xml b/src/site/site.xml index 3cb8f1a..43170c2 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -4,6 +4,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0%20http://maven.apache.org/xsd/decoration-1.0.0.xsd"> + + + From 07f63919296984b2c5f5d30a433411c0715b2e9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Boutemy?= Date: Mon, 11 Sep 2023 22:42:12 +0200 Subject: [PATCH 3/7] explain 3 vs 4 --- README.md | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 89bb19d..73f800c 100644 --- a/README.md +++ b/README.md @@ -2,11 +2,18 @@ Plexus-Xml ============ [![Build Status](https://github.com/codehaus-plexus/plexus-xml/actions/workflows/maven.yml/badge.svg)](https://github.com/codehaus-plexus/plexus-xml/actions) +[![Maven Central](https://img.shields.io/maven-central/v/org.codehaus.plexus/plexus-xml.svg?label=Maven%20Central&versionPrefix=3.)](https://search.maven.org/artifact/org.codehaus.plexus/plexus-xml) [![Maven Central](https://img.shields.io/maven-central/v/org.codehaus.plexus/plexus-xml.svg?label=Maven%20Central)](https://search.maven.org/artifact/org.codehaus.plexus/plexus-xml) This library consists of XML classes (`org.codehaus.plexus.util.xml` and `org.codehaus.plexus.util.xml.pull`) that: -1. have been extracted from [`plexus-utils`](https://github.com/codehaus-plexus/plexus-utils/) 4, -2. then updated to use [`maven-xml-api`](https://github.com/apache/maven/tree/maven-4.0.0-alpha-7/api/maven-api-xml)/[`maven-xml-impl`](https://github.com/apache/maven/tree/maven-4.0.0-alpha-7/maven-xml-impl) + +1. have been extracted from [`plexus-utils`](https://github.com/codehaus-plexus/plexus-utils/) 4:\ + this step is released as `plexus-xml` 3, maintained in [3.x branch](tree/3.x)\ + [![Maven Central](https://img.shields.io/maven-central/v/org.codehaus.plexus/plexus-xml.svg?label=Maven%20Central&versionPrefix=3.)](https://search.maven.org/artifact/org.codehaus.plexus/plexus-xml), + +2. then updated to use [`maven-xml-api`](https://github.com/apache/maven/tree/maven-4.0.0-alpha-7/api/maven-api-xml)/[`maven-xml-impl`](https://github.com/apache/maven/tree/maven-4.0.0-alpha-7/maven-xml-impl):\ + this is the `master` branch from which `plexus-xml` 4 is released\ + [![Maven Central](https://img.shields.io/maven-central/v/org.codehaus.plexus/plexus-xml.svg?label=Maven%20Central)](https://search.maven.org/artifact/org.codehaus.plexus/plexus-xml) For publishing [the site](https://codehaus-plexus.github.io/plexus-xml/) do the following: From 7bfeb09596b87f4a28add4699bbd663fe6dcbd6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Boutemy?= Date: Tue, 12 Sep 2023 08:08:47 +0200 Subject: [PATCH 4/7] clarify "Maven 4-specific" --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 73f800c..ce4cf7a 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ This library consists of XML classes (`org.codehaus.plexus.util.xml` and `org.co this step is released as `plexus-xml` 3, maintained in [3.x branch](tree/3.x)\ [![Maven Central](https://img.shields.io/maven-central/v/org.codehaus.plexus/plexus-xml.svg?label=Maven%20Central&versionPrefix=3.)](https://search.maven.org/artifact/org.codehaus.plexus/plexus-xml), -2. then updated to use [`maven-xml-api`](https://github.com/apache/maven/tree/maven-4.0.0-alpha-7/api/maven-api-xml)/[`maven-xml-impl`](https://github.com/apache/maven/tree/maven-4.0.0-alpha-7/maven-xml-impl):\ +2. then updated to use Maven 4-specific [`maven-xml-api`](https://github.com/apache/maven/tree/maven-4.0.0-alpha-7/api/maven-api-xml)/[`maven-xml-impl`](https://github.com/apache/maven/tree/maven-4.0.0-alpha-7/maven-xml-impl):\ this is the `master` branch from which `plexus-xml` 4 is released\ [![Maven Central](https://img.shields.io/maven-central/v/org.codehaus.plexus/plexus-xml.svg?label=Maven%20Central)](https://search.maven.org/artifact/org.codehaus.plexus/plexus-xml) From aa82ed33a2e8c178fcd2a2106f57023d6947d84e Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Wed, 13 Dec 2023 06:57:39 +0100 Subject: [PATCH 5/7] Update dependencies (#26) * Update dependencies Changes: * parent POM to 16 * remove sole use of hamcrest * jmh update * nullcheck --- pom.xml | 14 ++++---------- .../plexus/util/xml/pull/MXParserTest.java | 16 ++++++++-------- 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/pom.xml b/pom.xml index 32cff2a..f554aeb 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ limitations under the License. org.codehaus.plexus plexus - 13 + 16 plexus-xml @@ -55,7 +55,7 @@ limitations under the License. org.apache.maven maven-xml-impl - 4.0.0-alpha-7 + 4.0.0-alpha-8 org.eclipse.sisu @@ -66,13 +66,13 @@ limitations under the License. org.openjdk.jmh jmh-core - 1.36 + 1.37 test org.openjdk.jmh jmh-generator-annprocess - 1.36 + 1.37 test @@ -80,12 +80,6 @@ limitations under the License. junit-jupiter test - - org.hamcrest - hamcrest - 2.2 - test - org.codehaus.plexus plexus-utils diff --git a/src/test/java/org/codehaus/plexus/util/xml/pull/MXParserTest.java b/src/test/java/org/codehaus/plexus/util/xml/pull/MXParserTest.java index f7c9d68..0359b8c 100644 --- a/src/test/java/org/codehaus/plexus/util/xml/pull/MXParserTest.java +++ b/src/test/java/org/codehaus/plexus/util/xml/pull/MXParserTest.java @@ -33,8 +33,6 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; -import static org.hamcrest.MatcherAssert.*; -import static org.hamcrest.Matchers.*; import static org.junit.jupiter.api.Assertions.*; /** @@ -1485,14 +1483,16 @@ void testBlankAtBeginning(String ws) throws XmlPullParserException, IOException MXParser parser = new MXParser(); parser.setInput(new StringReader(ws + xml)); - assertThat( - assertThrows(XmlPullParserException.class, parser::next).getMessage(), - containsString("XMLDecl is only allowed as first characters in input")); + + String message; + message = assertThrows(XmlPullParserException.class, parser::next).getMessage(); + assertNotNull(message); + assertTrue(message.contains("XMLDecl is only allowed as first characters in input"), message); parser.setInput(new StringReader(ws + xml)); assertEquals(XmlPullParser.IGNORABLE_WHITESPACE, parser.nextToken()); - assertThat( - assertThrows(XmlPullParserException.class, parser::nextToken).getMessage(), - containsString("processing instruction can not have PITarget with reserved xml name")); + message = assertThrows(XmlPullParserException.class, parser::nextToken).getMessage(); + assertNotNull(message); + assertTrue(message.contains("processing instruction can not have PITarget with reserved xml name"), message); } } From e6a6427dd4c1e0b40832ea027f5c102cd739ef85 Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Wed, 13 Dec 2023 20:59:12 +0100 Subject: [PATCH 6/7] Upgrade to Maven 4.0.0-alpha-9 (#27) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f554aeb..489292b 100644 --- a/pom.xml +++ b/pom.xml @@ -55,7 +55,7 @@ limitations under the License. org.apache.maven maven-xml-impl - 4.0.0-alpha-8 + 4.0.0-alpha-9 org.eclipse.sisu From 784ff955e0944bea8b3a15254ad7ce06ae72dc20 Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Wed, 13 Dec 2023 21:00:16 +0100 Subject: [PATCH 7/7] [maven-release-plugin] prepare release plexus-xml-4.0.3 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 489292b..f8a0bf3 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ limitations under the License. plexus-xml - 4.0.3-SNAPSHOT + 4.0.3 Plexus XML Utilities A collection of various utility classes to ease working with XML. @@ -33,7 +33,7 @@ limitations under the License. scm:git:https://github.com/codehaus-plexus/plexus-xml.git ${project.scm.connection} - master + plexus-xml-4.0.3 https://github.com/codehaus-plexus/plexus-xml/tree/${project.scm.tag}/ @@ -48,7 +48,7 @@ limitations under the License. - 2023-07-04T08:14:21Z + 2023-12-13T20:00:11Z