From 2edca611667e8391f5254f53700e2c6d22f3c1b4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 27 Mar 2026 22:41:59 +0000 Subject: [PATCH 1/2] Update plexus-utils version to 3.6.1 Signed-off-by: dependabot[bot] --- modello-maven-plugin/src/it/maven-model/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modello-maven-plugin/src/it/maven-model/pom.xml b/modello-maven-plugin/src/it/maven-model/pom.xml index 0a52fd390..02ce25c06 100644 --- a/modello-maven-plugin/src/it/maven-model/pom.xml +++ b/modello-maven-plugin/src/it/maven-model/pom.xml @@ -46,7 +46,7 @@ org.codehaus.plexus plexus-utils - 3.0.24 + 3.6.1 junit From edcf686b436b886855cb5b1e020fdf52ef2ffb10 Mon Sep 17 00:00:00 2001 From: Sylwester Lachiewicz Date: Sun, 5 Apr 2026 15:20:34 +0200 Subject: [PATCH 2/2] Fix integration tests for plexus-utils 3.6.1 update --- modello-maven-plugin/pom.xml | 2 +- modello-maven-plugin/src/it/features/pom.xml | 2 +- modello-maven-plugin/src/it/maven-model/pom.xml | 2 +- .../org/codehaus/modello/xpp3/Xpp3ParsingTest.java | 10 +++++----- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modello-maven-plugin/pom.xml b/modello-maven-plugin/pom.xml index 74303e089..d8e1fc030 100644 --- a/modello-maven-plugin/pom.xml +++ b/modello-maven-plugin/pom.xml @@ -193,7 +193,7 @@ ${project.build.directory}/local-repo true - 3.0.22 + 3.6.1 ${junit4Version} ${java.version} ${jdom.version} diff --git a/modello-maven-plugin/src/it/features/pom.xml b/modello-maven-plugin/src/it/features/pom.xml index 1f5123683..9edb6c115 100644 --- a/modello-maven-plugin/src/it/features/pom.xml +++ b/modello-maven-plugin/src/it/features/pom.xml @@ -20,7 +20,7 @@ org.codehaus.plexus plexus-utils - 3.0.24 + @plexusUtilsVersion@ org.codehaus.woodstox diff --git a/modello-maven-plugin/src/it/maven-model/pom.xml b/modello-maven-plugin/src/it/maven-model/pom.xml index 02ce25c06..fa7b10b63 100644 --- a/modello-maven-plugin/src/it/maven-model/pom.xml +++ b/modello-maven-plugin/src/it/maven-model/pom.xml @@ -46,7 +46,7 @@ org.codehaus.plexus plexus-utils - 3.6.1 + @plexusUtilsVersion@ junit diff --git a/modello-maven-plugin/src/it/maven-model/src/test/java/org/codehaus/modello/xpp3/Xpp3ParsingTest.java b/modello-maven-plugin/src/it/maven-model/src/test/java/org/codehaus/modello/xpp3/Xpp3ParsingTest.java index abaa4f824..3d8c009ed 100644 --- a/modello-maven-plugin/src/it/maven-model/src/test/java/org/codehaus/modello/xpp3/Xpp3ParsingTest.java +++ b/modello-maven-plugin/src/it/maven-model/src/test/java/org/codehaus/modello/xpp3/Xpp3ParsingTest.java @@ -22,8 +22,8 @@ public class Xpp3ParsingTest public void testXpp3ParsingWithModelWithWrongRootTag() throws Exception { - thrown.expectMessage( startsWith( "Expected root element 'project' but found 'model' (position: START_TAG seen ... @1:7)" ) ); - + thrown.expectMessage( startsWith( "Expected root element 'project' but found 'model' (position: START_TAG seen ... @1:8" ) ); + File model = new File( System.getProperty( "basedir" ), "src/test/models/model-with-wrong-root-tag.xml" ); MavenXpp3Reader reader = new MavenXpp3Reader(); @@ -36,21 +36,21 @@ public void testXpp3ParsingWithModelWithMissingElements() throws Exception { thrown.expectMessage( startsWith( "Unrecognised tag: 'groupId' (position: START_TAG seen ..." ) ); - + File model = new File( System.getProperty( "basedir" ), "src/test/models/model-with-missing-elements.xml" ); MavenXpp3Reader reader = new MavenXpp3Reader(); reader.read( new XmlStreamReader( model ), true ); } - + @Test public void testXpp3ParsingWithModelWithPostTags() throws Exception { // internal message from MXParser thrown.expectMessage( startsWith( "start tag not allowed in epilog" ) ); - + File model = new File( System.getProperty( "basedir" ), "src/test/models/model-with-post-tags.xml" ); MavenXpp3Reader reader = new MavenXpp3Reader();