From 62f50bc46c7b51d51a25541dfe0a502063dc1fc3 Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Mon, 22 May 2023 17:08:30 +0200 Subject: [PATCH 1/8] [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 cfc72fd..ae0821f 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ limitations under the License. plexus-xml - 4.0.0 + 4.0.1-SNAPSHOT Plexus XML Utilities A collection of various utility classes to ease working with XML. @@ -32,7 +32,7 @@ limitations under the License. scm:git:https://github.com/codehaus-plexus/plexus-xml.git ${project.scm.connection} - plexus-xml-4.0.0 + master https://github.com/codehaus-plexus/plexus-xml/tree/master/ @@ -47,7 +47,7 @@ limitations under the License. - 2023-05-22T15:08:22Z + 2023-05-22T15:08:30Z From 27d6127d3196d09263d8fe0f445b9d83f6ccfb75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Boutemy?= Date: Sun, 28 May 2023 11:04:40 +0200 Subject: [PATCH 2/8] pom.mxl and site.xml cleanup --- pom.xml | 85 +++-------------------------------------------- src/site/site.xml | 5 +++ 2 files changed, 9 insertions(+), 81 deletions(-) diff --git a/pom.xml b/pom.xml index ae0821f..e99c9a9 100644 --- a/pom.xml +++ b/pom.xml @@ -28,16 +28,17 @@ limitations under the License. Plexus XML Utilities A collection of various utility classes to ease working with XML. + https://codehaus-plexus.github.io/plexus-xml/ scm:git:https://github.com/codehaus-plexus/plexus-xml.git ${project.scm.connection} master - https://github.com/codehaus-plexus/plexus-xml/tree/master/ + https://github.com/codehaus-plexus/plexus-xml/tree/${project.scm.tag}/ github - http://github.com/codehaus-plexus/plexus-xml/issues + https://github.com/codehaus-plexus/plexus-xml/issues @@ -48,6 +49,7 @@ limitations under the License. 2023-05-22T15:08:30Z + 8 @@ -79,64 +81,14 @@ limitations under the License. - - org.apache.maven.plugins - maven-enforcer-plugin - 3.3.0 - - - org.apache.maven.plugins - maven-resources-plugin - 3.3.1 - org.apache.maven.plugins maven-surefire-plugin 3.0.0 - - org.apache.maven.plugins - maven-compiler-plugin - 3.11.0 - - - org.apache.maven.plugins - maven-enforcer-plugin - - - enforce-maven - - enforce - - - - - 3.2.5 - This project requires at least Maven 3.2.5 - - - - - - - - maven-compiler-plugin - - - default-compile - - compile - - - 1.8 - 1.8 - - - - org.apache.maven.plugins maven-scm-publish-plugin @@ -175,33 +127,4 @@ limitations under the License. - - - - jdk9+ - - [9,) - - - - - - maven-compiler-plugin - - - compile-java-9 - - compile - - - 8 - - - - - - - - - diff --git a/src/site/site.xml b/src/site/site.xml index 38cbad8..3cb8f1a 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -4,6 +4,11 @@ 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 d227a49f0f9b552a61b2aaac3bbe2c722ce06fea Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Fri, 23 Jun 2023 21:50:05 +0200 Subject: [PATCH 3/8] Fix detection of invalid spaces in prolog (#20) --- pom.xml | 6 +++++ .../plexus/util/xml/pull/MXParser.java | 6 +++-- .../plexus/util/xml/pull/MXParserTest.java | 22 +++++++++++++++++++ 3 files changed, 32 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index e99c9a9..76e4a4f 100644 --- a/pom.xml +++ b/pom.xml @@ -76,6 +76,12 @@ limitations under the License. 5.9.2 test + + org.hamcrest + hamcrest + 2.2 + test + diff --git a/src/main/java/org/codehaus/plexus/util/xml/pull/MXParser.java b/src/main/java/org/codehaus/plexus/util/xml/pull/MXParser.java index 9f4396b..63fffed 100644 --- a/src/main/java/org/codehaus/plexus/util/xml/pull/MXParser.java +++ b/src/main/java/org/codehaus/plexus/util/xml/pull/MXParser.java @@ -2528,9 +2528,11 @@ private void parsePI() throws XmlPullParserException, IOException { if ((buf[piTargetStart] == 'x' || buf[piTargetStart] == 'X') && (buf[piTargetStart + 1] == 'm' || buf[piTargetStart + 1] == 'M') && (buf[piTargetStart + 2] == 'l' || buf[piTargetStart + 2] == 'L')) { - if (piTargetStart > 3) { // 2) { // nnn"; + + 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")); + + 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")); + } } From bcb6981e2a9c635d024e0422de2a997a00ffdd8e Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Fri, 23 Jun 2023 21:56:23 +0200 Subject: [PATCH 4/8] [maven-release-plugin] prepare release plexus-xml-4.0.1 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 76e4a4f..607c914 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ limitations under the License. plexus-xml - 4.0.1-SNAPSHOT + 4.0.1 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.1 https://github.com/codehaus-plexus/plexus-xml/tree/${project.scm.tag}/ @@ -48,7 +48,7 @@ limitations under the License. - 2023-05-22T15:08:30Z + 2023-06-23T19:56:18Z 8 From 25a00cd9d04ff3ab7acdcebdefdbb19ec5c4560d Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Fri, 23 Jun 2023 21:56:25 +0200 Subject: [PATCH 5/8] [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 607c914..ba7eed7 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ limitations under the License. plexus-xml - 4.0.1 + 4.0.2-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.1 + master https://github.com/codehaus-plexus/plexus-xml/tree/${project.scm.tag}/ @@ -48,7 +48,7 @@ limitations under the License. - 2023-06-23T19:56:18Z + 2023-06-23T19:56:25Z 8 From a83cefa086c9a5bb8b6674a409016f378b19891e Mon Sep 17 00:00:00 2001 From: Sylwester Lachiewicz Date: Fri, 30 Jun 2023 23:57:00 +0200 Subject: [PATCH 6/8] Cleanup after parent pom upgrade --- pom.xml | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/pom.xml b/pom.xml index ba7eed7..8d97cb4 100644 --- a/pom.xml +++ b/pom.xml @@ -49,7 +49,6 @@ limitations under the License. 2023-06-23T19:56:25Z - 8 @@ -73,7 +72,6 @@ limitations under the License. org.junit.jupiter junit-jupiter - 5.9.2 test @@ -85,15 +83,6 @@ limitations under the License. - - - - org.apache.maven.plugins - maven-surefire-plugin - 3.0.0 - - - org.apache.maven.plugins @@ -119,16 +108,6 @@ limitations under the License. true - - - JAVA_HOME - ${JAVA_HOME} - - - M2_HOME - ${M2_HOME} - - From c3d99b433a272d8eb1cc7c799410799e8c16ace3 Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Mon, 3 Jul 2023 10:34:18 +0200 Subject: [PATCH 7/8] Upgrade to 4.0.0-alpha-7 and exclude dependency to sisu (fixes #17) (#23) --- pom.xml | 14 +++++++++++++- .../org/codehaus/plexus/util/xml/Xpp3DomUtils.java | 4 ++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 8d97cb4..14236bb 100644 --- a/pom.xml +++ b/pom.xml @@ -55,7 +55,13 @@ limitations under the License. org.apache.maven maven-xml-impl - 4.0.0-alpha-5 + 4.0.0-alpha-7 + + + org.eclipse.sisu + org.eclipse.sisu.plexus + + org.openjdk.jmh @@ -80,6 +86,12 @@ limitations under the License. 2.2 test + + org.codehaus.plexus + plexus-utils + 4.0.0 + test + diff --git a/src/main/java/org/codehaus/plexus/util/xml/Xpp3DomUtils.java b/src/main/java/org/codehaus/plexus/util/xml/Xpp3DomUtils.java index b4475f6..d8a47e5 100644 --- a/src/main/java/org/codehaus/plexus/util/xml/Xpp3DomUtils.java +++ b/src/main/java/org/codehaus/plexus/util/xml/Xpp3DomUtils.java @@ -125,7 +125,7 @@ public static Xpp3Dom mergeXpp3Dom(Xpp3Dom dominant, Xpp3Dom recessive) { } /** - * @deprecated Use {@link org.codehaus.plexus.util.StringUtils#isNotEmpty(String)} instead + * @deprecated Use org.codehaus.plexus.util.StringUtils#isNotEmpty(String) instead */ @Deprecated public static boolean isNotEmpty(String str) { @@ -133,7 +133,7 @@ public static boolean isNotEmpty(String str) { } /** - * @deprecated Use {@link org.codehaus.plexus.util.StringUtils#isEmpty(String)} instead + * @deprecated Use org.codehaus.plexus.util.StringUtils#isEmpty(String) instead */ @Deprecated public static boolean isEmpty(String str) { From 944197c74386b199857a003160d840fb5593ac29 Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Tue, 4 Jul 2023 10:14:18 +0200 Subject: [PATCH 8/8] [maven-release-plugin] prepare release plexus-xml-4.0.2 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 14236bb..35d72bc 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ limitations under the License. plexus-xml - 4.0.2-SNAPSHOT + 4.0.2 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.2 https://github.com/codehaus-plexus/plexus-xml/tree/${project.scm.tag}/ @@ -48,7 +48,7 @@ limitations under the License. - 2023-06-23T19:56:25Z + 2023-07-04T08:14:13Z