You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2009/03/15 23:37:29 UTC
svn commit: r754784 -
/maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployFileMojo.java
Author: bentmann
Date: Sun Mar 15 22:37:29 2009
New Revision: 754784
URL: http://svn.apache.org/viewvc?rev=754784&view=rev
Log:
[MDEPLOY-84] NPE when deploy-file with generatePom=false
Modified:
maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployFileMojo.java
Modified: maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployFileMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployFileMojo.java?rev=754784&r1=754783&r2=754784&view=diff
==============================================================================
--- maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployFileMojo.java (original)
+++ maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployFileMojo.java Sun Mar 15 22:37:29 2009
@@ -235,15 +235,18 @@
}
// Upload the POM if requested, generating one if need be
- if ( generatePom )
+ if ( !"pom".equals( packaging ) )
{
- ArtifactMetadata metadata = new ProjectArtifactMetadata( artifact, generatePomFile() );
- artifact.addMetadata( metadata );
- }
- else
- {
- ArtifactMetadata metadata = new ProjectArtifactMetadata( artifact, pomFile );
- artifact.addMetadata( metadata );
+ if ( pomFile != null )
+ {
+ ArtifactMetadata metadata = new ProjectArtifactMetadata( artifact, pomFile );
+ artifact.addMetadata( metadata );
+ }
+ else if ( generatePom )
+ {
+ ArtifactMetadata metadata = new ProjectArtifactMetadata( artifact, generatePomFile() );
+ artifact.addMetadata( metadata );
+ }
}
try