diff --git a/README.md b/README.md index 379ac1e..ce4cf7a 100644 --- a/README.md +++ b/README.md @@ -2,9 +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 `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:\ + 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 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) For publishing [the site](https://codehaus-plexus.github.io/plexus-xml/) do the following: diff --git a/pom.xml b/pom.xml index 35d72bc..f8a0bf3 100644 --- a/pom.xml +++ b/pom.xml @@ -20,11 +20,11 @@ limitations under the License. org.codehaus.plexus plexus - 13 + 16 plexus-xml - 4.0.2 + 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} - plexus-xml-4.0.2 + plexus-xml-4.0.3 https://github.com/codehaus-plexus/plexus-xml/tree/${project.scm.tag}/ @@ -48,14 +48,14 @@ limitations under the License. - 2023-07-04T08:14:13Z + 2023-12-13T20:00:11Z org.apache.maven maven-xml-impl - 4.0.0-alpha-7 + 4.0.0-alpha-9 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/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 http://maven.apache.org/xsd/decoration-1.0.0.xsd"> + + + 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); } }