You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2013/10/08 22:49:56 UTC
svn commit: r1530417 - in
/maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install:
AbstractInstallMojo.java InstallFileMojo.java InstallMojo.java
Author: rfscholte
Date: Tue Oct 8 20:49:56 2013
New Revision: 1530417
URL: http://svn.apache.org/r1530417
Log:
[MINSTALL-99] InstallAtEnd should respect plugin-configuration per project
prepare methods
Modified:
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/AbstractInstallMojo.java
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallMojo.java
Modified: maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/AbstractInstallMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/AbstractInstallMojo.java?rev=1530417&r1=1530416&r2=1530417&view=diff
==============================================================================
--- maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/AbstractInstallMojo.java (original)
+++ maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/AbstractInstallMojo.java Tue Oct 8 20:49:56 2013
@@ -109,9 +109,10 @@ public abstract class AbstractInstallMoj
* installed POM for robustness with regard to future changes like re-introducing some kind of POM filtering.
*
* @param artifact The artifact for which to create checksums, must not be <code>null</code>.
+ * @param createChecksum {@code true} if checksum should be created, otherwise {@code false}.
* @throws MojoExecutionException If the checksums could not be installed.
*/
- protected void installChecksums( Artifact artifact )
+ protected void installChecksums( Artifact artifact, boolean createChecksum )
throws MojoExecutionException
{
if ( !createChecksum )
@@ -123,7 +124,7 @@ public abstract class AbstractInstallMoj
installChecksums( artifactFile );
}
- protected void addMetaDataFilesForArtifact( Artifact artifact, Collection<File> targetMetadataFiles )
+ protected void addMetaDataFilesForArtifact( Artifact artifact, Collection<File> targetMetadataFiles, boolean createChecksum )
{
if ( !createChecksum )
{
Modified: maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java?rev=1530417&r1=1530416&r2=1530417&view=diff
==============================================================================
--- maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java (original)
+++ maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java Tue Oct 8 20:49:56 2013
@@ -317,8 +317,8 @@ public class InstallFileMojo
try
{
installer.install( file, artifact, localRepository );
- installChecksums( artifact );
- addMetaDataFilesForArtifact( artifact, metadataFiles );
+ installChecksums( artifact, createChecksum );
+ addMetaDataFilesForArtifact( artifact, metadataFiles, createChecksum );
}
catch ( ArtifactInstallationException e )
@@ -341,8 +341,8 @@ public class InstallFileMojo
try
{
installer.install( sources, artifact, localRepository );
- installChecksums( artifact );
- addMetaDataFilesForArtifact( artifact, metadataFiles );
+ installChecksums( artifact, createChecksum );
+ addMetaDataFilesForArtifact( artifact, metadataFiles, createChecksum );
}
catch ( ArtifactInstallationException e )
@@ -357,8 +357,8 @@ public class InstallFileMojo
try
{
installer.install( javadoc, artifact, localRepository );
- installChecksums( artifact );
- addMetaDataFilesForArtifact( artifact, metadataFiles );
+ installChecksums( artifact, createChecksum );
+ addMetaDataFilesForArtifact( artifact, metadataFiles, createChecksum );
}
catch ( ArtifactInstallationException e )
Modified: maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallMojo.java?rev=1530417&r1=1530416&r2=1530417&view=diff
==============================================================================
--- maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallMojo.java (original)
+++ maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallMojo.java Tue Oct 8 20:49:56 2013
@@ -158,8 +158,8 @@ public class InstallMojo
if ( isPomArtifact )
{
installer.install( pomFile, artifact, localRepository );
- installChecksums( artifact );
- addMetaDataFilesForArtifact( artifact, metadataFiles );
+ installChecksums( artifact, createChecksum );
+ addMetaDataFilesForArtifact( artifact, metadataFiles, createChecksum );
}
else
{
@@ -173,8 +173,8 @@ public class InstallMojo
if ( file != null && file.isFile() )
{
installer.install( file, artifact, localRepository );
- installChecksums( artifact );
- addMetaDataFilesForArtifact( artifact, metadataFiles );
+ installChecksums( artifact, createChecksum );
+ addMetaDataFilesForArtifact( artifact, metadataFiles, createChecksum );
}
else if ( !attachedArtifacts.isEmpty() )
{
@@ -190,8 +190,8 @@ public class InstallMojo
}
installer.install( pomFile, pomArtifact, localRepository );
- installChecksums( pomArtifact );
- addMetaDataFilesForArtifact( pomArtifact, metadataFiles );
+ installChecksums( pomArtifact, createChecksum );
+ addMetaDataFilesForArtifact( pomArtifact, metadataFiles, createChecksum );
}
else
{
@@ -203,8 +203,8 @@ public class InstallMojo
for ( Artifact attached : attachedArtifacts )
{
installer.install( attached.getFile(), attached, localRepository );
- installChecksums( attached );
- addMetaDataFilesForArtifact( attached, metadataFiles );
+ installChecksums( attached, createChecksum );
+ addMetaDataFilesForArtifact( attached, metadataFiles, createChecksum );
}
installChecksums( metadataFiles );