Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion modello-maven-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
<debug>true</debug>
<filterProperties>
<plexusUtilsVersion>3.0.22</plexusUtilsVersion>
<plexusUtilsVersion>3.6.1</plexusUtilsVersion>
<junit4Version>${junit4Version}</junit4Version>
<java.version>${java.version}</java.version>
<jdom.version>${jdom.version}</jdom.version>
Expand Down
2 changes: 1 addition & 1 deletion modello-maven-plugin/src/it/features/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>3.0.24</version>
<version>@plexusUtilsVersion@</version>
</dependency>
<dependency>
<groupId>org.codehaus.woodstox</groupId>
Expand Down
2 changes: 1 addition & 1 deletion modello-maven-plugin/src/it/maven-model/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>3.0.24</version>
<version>@plexusUtilsVersion@</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 <model>... @1:7)" ) );
thrown.expectMessage( startsWith( "Expected root element 'project' but found 'model' (position: START_TAG seen <model>... @1:8" ) );

File model = new File( System.getProperty( "basedir" ), "src/test/models/model-with-wrong-root-tag.xml" );

MavenXpp3Reader reader = new MavenXpp3Reader();
Expand All @@ -36,21 +36,21 @@ public void testXpp3ParsingWithModelWithMissingElements()
throws Exception
{
thrown.expectMessage( startsWith( "Unrecognised tag: 'groupId' (position: START_TAG seen ...<dependencies>" ) );

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();
Expand Down