Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[3.8.x][MNG-6727] Changed expression check to project.version and project.parent.version #670

Merged
merged 2 commits into from Feb 1, 2022
Merged

[3.8.x][MNG-6727] Changed expression check to project.version and project.parent.version #670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc4a6c4
[MNG-6727] Changed check to project.version and project.parent.version
jmax01 Jan 6, 2021
b163330
Add tests for pom.version and pom.parent.version
gnodet Jan 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
135 changes: 131 additions & 4 deletions maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
View file
Open in desktop
Expand Up @@ -298,11 +298,11 @@ public void testBuildParentVersionRangeLocallyWithoutChildVersion() throws Excep
*
* @throws Exception
*/
public void testBuildParentVersionRangeLocallyWithChildVersionExpression() throws Exception
public void testBuildParentVersionRangeLocallyWithChildProjectVersionExpression() throws Exception
{
File f1 =
getTestFile(
"src/test/resources/projects/parent-version-range-local-child-version-expression/child/pom.xml" );
"src/test/resources/projects/parent-version-range-local-child-project-version-expression/child/pom.xml" );

try
{
Expand All @@ -315,7 +315,47 @@ public void testBuildParentVersionRangeLocallyWithChildVersionExpression() throw
assertThat( e.getMessage(), containsString( "Version must be a constant" ) );
}
}

/**
* Tests whether local version range parent references are build correctly.
*
* @throws Exception
*/
public void testBuildParentVersionRangeLocallyWithChildProjectParentVersionExpression() throws Exception
{
File f1 =
getTestFile(
"src/test/resources/projects/parent-version-range-local-child-project-parent-version-expression/child/pom.xml" );

try
{
getProject( f1 );
fail( "Expected 'ProjectBuildingException' not thrown." );
}
catch ( final ProjectBuildingException e )
{
assertNotNull( e.getMessage() );
assertThat( e.getMessage(), containsString( "Version must be a constant" ) );
}
}

/**
* Tests whether local version range parent references are build correctly.
*
* @throws Exception
*/
public void testBuildParentVersionRangeLocallyWithChildRevisionExpression() throws Exception
{
File f1 =
getTestFile(
"src/test/resources/projects/parent-version-range-local-child-revision-expression/child/pom.xml" );

MavenProject mp = this.getProjectFromRemoteRepository( f1 );

assertEquals("1.0-SNAPSHOT", mp.getVersion());

}

/**
* Tests whether external version range parent references are build correctly.
*
Expand Down Expand Up @@ -363,11 +403,34 @@ public void testBuildParentVersionRangeExternallyWithoutChildVersion() throws Ex
*
* @throws Exception
*/
public void testBuildParentVersionRangeExternallyWithChildVersionExpression() throws Exception
public void testBuildParentVersionRangeExternallyWithChildProjectVersionExpression() throws Exception
{
File f1 =
getTestFile(
"src/test/resources/projects/parent-version-range-external-child-version-expression/pom.xml" );
"src/test/resources/projects/parent-version-range-external-child-project-version-expression/pom.xml" );

try
{
this.getProjectFromRemoteRepository( f1 );
fail( "Expected 'ProjectBuildingException' not thrown." );
}
catch ( final ProjectBuildingException e )
{
assertNotNull( e.getMessage() );
assertThat( e.getMessage(), containsString( "Version must be a constant" ) );
}
}

/**
* Tests whether external version range parent references are build correctly.
*
* @throws Exception
*/
public void testBuildParentVersionRangeExternallyWithChildPomVersionExpression() throws Exception
{
File f1 =
getTestFile(
"src/test/resources/projects/parent-version-range-external-child-pom-version-expression/pom.xml" );

try
{
Expand All @@ -381,4 +444,68 @@ public void testBuildParentVersionRangeExternallyWithChildVersionExpression() th
}
}

/**
* Tests whether external version range parent references are build correctly.
*
* @throws Exception
*/
public void testBuildParentVersionRangeExternallyWithChildPomParentVersionExpression() throws Exception
{
File f1 =
getTestFile(
"src/test/resources/projects/parent-version-range-external-child-pom-parent-version-expression/pom.xml" );

try
{
this.getProjectFromRemoteRepository( f1 );
fail( "Expected 'ProjectBuildingException' not thrown." );
}
catch ( final ProjectBuildingException e )
{
assertNotNull( e.getMessage() );
assertThat( e.getMessage(), containsString( "Version must be a constant" ) );
}
}

/**
* Tests whether external version range parent references are build correctly.
*
* @throws Exception
*/
public void testBuildParentVersionRangeExternallyWithChildProjectParentVersionExpression() throws Exception
{
File f1 =
getTestFile(
"src/test/resources/projects/parent-version-range-external-child-project-parent-version-expression/pom.xml" );

try
{
this.getProjectFromRemoteRepository( f1 );
fail( "Expected 'ProjectBuildingException' not thrown." );
}
catch ( final ProjectBuildingException e )
{
assertNotNull( e.getMessage() );
assertThat( e.getMessage(), containsString( "Version must be a constant" ) );
}
}

/**
* Tests whether external version range parent references are build correctly.
*
* @throws Exception
*/
public void testBuildParentVersionRangeExternallyWithChildRevisionExpression() throws Exception
{
File f1 =
getTestFile(
"src/test/resources/projects/parent-version-range-external-child-revision-expression/pom.xml" );


MavenProject mp = this.getProjectFromRemoteRepository( f1 );

assertEquals("1.0-SNAPSHOT", mp.getVersion());


}
}
12 changes: 12 additions & 0 deletions ...ources/projects/parent-version-range-external-child-pom-parent-version-expression/pom.xml
View file
Open in desktop
@@ -0,0 +1,12 @@
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
<version>[1,1]</version>
</parent>
<artifactId>child</artifactId>
<!-- Must not use ${project.parent.version} due to version range. -->
<version>${pom.parent.version}</version>
<packaging>pom</packaging>
</project>
4 changes: 2 additions & 2 deletions ...external-child-version-expression/pom.xml → ...rnal-child-pom-version-expression/pom.xml
View file
Open in desktop
Expand Up @@ -6,7 +6,7 @@
<version>[1,1]</version>
</parent>
<artifactId>child</artifactId>
<!-- Must not use expressions from parent due to version range. -->
<version>${some.property}</version>
<!-- Must not use ${project.version} due to version range. -->
<version>${project.version}</version>
<packaging>pom</packaging>
</project>
12 changes: 12 additions & 0 deletions ...es/projects/parent-version-range-external-child-project-parent-version-expression/pom.xml
View file
Open in desktop
@@ -0,0 +1,12 @@
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
<version>[1,1]</version>
</parent>
<artifactId>child</artifactId>
<!-- Must not use ${project.parent.version} due to version range. -->
<version>${project.parent.version}</version>
<packaging>pom</packaging>
</project>
12 changes: 12 additions & 0 deletions ...resources/projects/parent-version-range-external-child-project-version-expression/pom.xml
View file
Open in desktop
@@ -0,0 +1,12 @@
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
<version>[1,1]</version>
</parent>
<artifactId>child</artifactId>
<!-- Must not use ${project.version} due to version range. -->
<version>${project.version}</version>
<packaging>pom</packaging>
</project>
14 changes: 14 additions & 0 deletions ...c/test/resources/projects/parent-version-range-external-child-revision-expression/pom.xml
View file
Open in desktop
@@ -0,0 +1,14 @@
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
<version>[1,1]</version>
</parent>
<artifactId>child</artifactId>
<version>${revision}</version>
<packaging>pom</packaging>
<properties>
<revision>1.0-SNAPSHOT</revision>
</properties>
</project>
12 changes: 12 additions & 0 deletions ...projects/parent-version-range-local-child-project-parent-version-expression/child/pom.xml
View file
Open in desktop
@@ -0,0 +1,12 @@
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>parent-version-range-local</groupId>
<artifactId>parent</artifactId>
<version>[1,10]</version>
</parent>
<artifactId>child</artifactId>
<!-- Must not use ${project.parent.version} due to version range. -->
<version>${project.parent.version}</version>
<packaging>pom</packaging>
</project>
7 changes: 7 additions & 0 deletions ...urces/projects/parent-version-range-local-child-project-parent-version-expression/pom.xml
View file
Open in desktop
@@ -0,0 +1,7 @@
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>parent-version-range-local</groupId>
<artifactId>parent</artifactId>
<version>1</version>
<packaging>pom</packaging>
</project>
4 changes: 2 additions & 2 deletions ...al-child-version-expression/child/pom.xml → ...-project-version-expression/child/pom.xml
View file
Open in desktop
Expand Up @@ -6,7 +6,7 @@
<version>[1,10]</version>
</parent>
<artifactId>child</artifactId>
<!-- Must not use expressions from parent due to version range. -->
<version>${some.property}</version>
<!-- Must not use ${project.version} due to version range. -->
<version>${project.version}</version>
<packaging>pom</packaging>
</project>
7 changes: 7 additions & 0 deletions ...st/resources/projects/parent-version-range-local-child-project-version-expression/pom.xml
View file
Open in desktop
@@ -0,0 +1,7 @@
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>parent-version-range-local</groupId>
<artifactId>parent</artifactId>
<version>1</version>
<packaging>pom</packaging>
</project>
14 changes: 14 additions & 0 deletions ...est/resources/projects/parent-version-range-local-child-revision-expression/child/pom.xml
View file
Open in desktop
@@ -0,0 +1,14 @@
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>parent-version-range-local</groupId>
<artifactId>parent</artifactId>
<version>[1,10]</version>
</parent>
<artifactId>child</artifactId>
<version>${revision}</version>
<packaging>pom</packaging>
<properties>
<revision>1.0-SNAPSHOT</revision>
</properties>
</project>
0 ...ge-local-child-version-expression/pom.xml → ...e-local-child-revision-expression/pom.xml
View file
Open in desktop
File renamed without changes.
20 changes: 16 additions & 4 deletions maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
View file
Open in desktop
Expand Up @@ -1057,7 +1057,9 @@ private ModelData readParentLocally( Model childModel, ModelSource childSource,
}

// Validate versions aren't inherited when using parent ranges the same way as when read externally.
if ( childModel.getVersion() == null )
String rawChildModelVersion = childModel.getVersion();

if ( rawChildModelVersion == null )
{
// Message below is checked for in the MNG-2199 core IT.
problems.add( new ModelProblemCollectorRequest( Severity.FATAL, Version.V31 )
Expand All @@ -1066,7 +1068,7 @@ private ModelData readParentLocally( Model childModel, ModelSource childSource,
}
else
{
if ( childModel.getVersion().contains( "${" ) )
if ( rawChildVersionReferencesParent( rawChildModelVersion ) )
{
// Message below is checked for in the MNG-2199 core IT.
problems.add( new ModelProblemCollectorRequest( Severity.FATAL, Version.V31 )
Expand Down Expand Up @@ -1099,6 +1101,14 @@ private ModelData readParentLocally( Model childModel, ModelSource childSource,
return parentData;
}

private boolean rawChildVersionReferencesParent( String rawChildModelVersion )
{
return rawChildModelVersion.equals( "${pom.version}" )
|| rawChildModelVersion.equals( "${project.version}" )
|| rawChildModelVersion.equals( "${pom.parent.version}" )
|| rawChildModelVersion.equals( "${project.parent.version}" );
}

private ModelSource getParentPomFile( Model childModel, ModelSource source )
{
if ( !( source instanceof ModelSource2 ) )
Expand Down Expand Up @@ -1187,7 +1197,9 @@ public int getValidationLevel()

if ( !parent.getVersion().equals( version ) )
{
if ( childModel.getVersion() == null )
String rawChildModelVersion = childModel.getVersion();

if ( rawChildModelVersion == null )
{
// Message below is checked for in the MNG-2199 core IT.
problems.add( new ModelProblemCollectorRequest( Severity.FATAL, Version.V31 )
Expand All @@ -1196,7 +1208,7 @@ public int getValidationLevel()
}
else
{
if ( childModel.getVersion().contains( "${" ) )
if ( rawChildVersionReferencesParent( rawChildModelVersion ) )
{
// Message below is checked for in the MNG-2199 core IT.
problems.add( new ModelProblemCollectorRequest( Severity.FATAL, Version.V31 )
Expand Down