Skip to content

[MINSTALL-160] Generated POM is not installed if original POM exists #36

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

Merged
cstamas merged 2 commits into from
Jul 19, 2022
Merged

[MINSTALL-160] Generated POM is not installed if original POM exists #36

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
cdee558
[MINSTALL-160] Generated POM is not installed if original POM exists
cstamas Jul 18, 2022
10926ff
Reshuffle logging, and fix related IT
cstamas Jul 18, 2022
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
3 changes: 2 additions & 1 deletion src/it/MINSTALL-52/verify.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ assert new File( basedir, "../../local-repo/org/apache/maven/plugins/install/its

File buildLog = new File( basedir, 'build.log' )
assert buildLog.exists()
assert buildLog.text.contains( "[DEBUG] Using META-INF/maven/org.apache.maven.plugins.install.its/minstall52/pom.xml as pomFile" )
assert buildLog.text.contains( "[DEBUG] Loading META-INF/maven/org.apache.maven.plugins.install.its/minstall52/pom.xml" )
assert buildLog.text.contains( "[DEBUG] Using JAR embedded POM as pomFile" )
8 changes: 6 additions & 2 deletions src/main/java/org/apache/maven/plugins/install/InstallFileMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,11 @@ public void execute()
else
{
temporaryPom = readingPomFromJarFile();
pomFile = temporaryPom;
if ( !Boolean.TRUE.equals( generatePom ) )
{
pomFile = temporaryPom;
getLog().debug( "Using JAR embedded POM as pomFile" );
}
}

if ( groupId == null || artifactId == null || version == null || packaging == null )
Expand Down Expand Up @@ -322,7 +326,7 @@ private File readingPomFromJarFile()

if ( pomEntry.matcher( entry.getName() ).matches() )
{
getLog().debug( "Using " + entry.getName() + " as pomFile" );
getLog().debug( "Loading " + entry.getName() );

InputStream pomInputStream = null;
OutputStream pomOutputStream = null;
Expand Down
6 changes: 0 additions & 6 deletions src/test/java/org/apache/maven/plugins/install/InstallFileMojoTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,6 @@ public void testBasicInstallFile()
assignValuesForParameter( mojo );

mojo.execute();

File pomFile = (File) getVariableValueFromObject( mojo, "pomFile" );
org.codehaus.plexus.util.FileUtils.forceDelete( pomFile );

File installedArtifact = new File( getBasedir(), LOCAL_REPO + groupId + "/" + artifactId + "/" + version + "/" +
artifactId + "-" + version + "." + packaging );
Expand Down Expand Up @@ -122,9 +119,6 @@ public void testInstallFileWithClassifier()

mojo.execute();

File pomFile = (File) getVariableValueFromObject( mojo, "pomFile" );
org.codehaus.plexus.util.FileUtils.forceDelete( pomFile );

File installedArtifact = new File( getBasedir(), LOCAL_REPO + groupId + "/" + artifactId + "/" + version + "/" +
artifactId + "-" + version + "-" + classifier + "." + packaging );

Expand Down