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/01/01 15:12:03 UTC
svn commit: r730549 - in /maven/plugins/trunk/maven-install-plugin/src:
it/no-main-artifact-1/ it/no-main-artifact-2/
main/java/org/apache/maven/plugin/install/
Author: bentmann
Date: Thu Jan 1 06:12:02 2009
New Revision: 730549
URL: http://svn.apache.org/viewvc?rev=730549&view=rev
Log:
[MINSTALL-41] Install with classifier does not install pom
Modified:
maven/plugins/trunk/maven-install-plugin/src/it/no-main-artifact-1/pom.xml
maven/plugins/trunk/maven-install-plugin/src/it/no-main-artifact-1/verify.bsh
maven/plugins/trunk/maven-install-plugin/src/it/no-main-artifact-2/pom.xml
maven/plugins/trunk/maven-install-plugin/src/it/no-main-artifact-2/verify.bsh
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/it/no-main-artifact-1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/src/it/no-main-artifact-1/pom.xml?rev=730549&r1=730548&r2=730549&view=diff
==============================================================================
--- maven/plugins/trunk/maven-install-plugin/src/it/no-main-artifact-1/pom.xml (original)
+++ maven/plugins/trunk/maven-install-plugin/src/it/no-main-artifact-1/pom.xml Thu Jan 1 06:12:02 2009
@@ -29,7 +29,7 @@
<description>
Tests the installation of a non-POM project that has no main artifact file but only attached artifacts (see
- MINSTALL-18, MINSTALL-40). This variant of the test checks the build when target/classes is non-existent.
+ MINSTALL-18, MINSTALL-40, MINSTALL-41). This variant of the test checks the build when target/classes is non-existent.
</description>
<properties>
Modified: maven/plugins/trunk/maven-install-plugin/src/it/no-main-artifact-1/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/src/it/no-main-artifact-1/verify.bsh?rev=730549&r1=730548&r2=730549&view=diff
==============================================================================
--- maven/plugins/trunk/maven-install-plugin/src/it/no-main-artifact-1/verify.bsh (original)
+++ maven/plugins/trunk/maven-install-plugin/src/it/no-main-artifact-1/verify.bsh Thu Jan 1 06:12:02 2009
@@ -3,6 +3,9 @@
String[] paths =
{
+ "org/apache/maven/its/install/nma1/test/maven-metadata-local.xml",
+ "org/apache/maven/its/install/nma1/test/1.0-SNAPSHOT/maven-metadata-local.xml",
+ "org/apache/maven/its/install/nma1/test/1.0-SNAPSHOT/test-1.0-SNAPSHOT.pom",
"org/apache/maven/its/install/nma1/test/1.0-SNAPSHOT/test-1.0-SNAPSHOT-it.jar",
};
Modified: maven/plugins/trunk/maven-install-plugin/src/it/no-main-artifact-2/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/src/it/no-main-artifact-2/pom.xml?rev=730549&r1=730548&r2=730549&view=diff
==============================================================================
--- maven/plugins/trunk/maven-install-plugin/src/it/no-main-artifact-2/pom.xml (original)
+++ maven/plugins/trunk/maven-install-plugin/src/it/no-main-artifact-2/pom.xml Thu Jan 1 06:12:02 2009
@@ -29,7 +29,7 @@
<description>
Tests the installation of a non-POM project that has no main artifact file but only attached artifacts (see
- MINSTALL-18, MINSTALL-40). This variant of the test checks the build when target/classes is existent.
+ MINSTALL-18, MINSTALL-40, MINSTALL-41). This variant of the test checks the build when target/classes is existent.
</description>
<properties>
Modified: maven/plugins/trunk/maven-install-plugin/src/it/no-main-artifact-2/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/src/it/no-main-artifact-2/verify.bsh?rev=730549&r1=730548&r2=730549&view=diff
==============================================================================
--- maven/plugins/trunk/maven-install-plugin/src/it/no-main-artifact-2/verify.bsh (original)
+++ maven/plugins/trunk/maven-install-plugin/src/it/no-main-artifact-2/verify.bsh Thu Jan 1 06:12:02 2009
@@ -3,6 +3,9 @@
String[] paths =
{
+ "org/apache/maven/its/install/nma2/test/maven-metadata-local.xml",
+ "org/apache/maven/its/install/nma2/test/1.0-SNAPSHOT/maven-metadata-local.xml",
+ "org/apache/maven/its/install/nma2/test/1.0-SNAPSHOT/test-1.0-SNAPSHOT.pom",
"org/apache/maven/its/install/nma2/test/1.0-SNAPSHOT/test-1.0-SNAPSHOT-it.jar",
};
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=730549&r1=730548&r2=730549&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 Thu Jan 1 06:12:02 2009
@@ -20,6 +20,7 @@
*/
import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.installer.ArtifactInstaller;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.plugin.AbstractMojo;
@@ -41,10 +42,14 @@
public abstract class AbstractInstallMojo
extends AbstractMojo
{
+
/**
- * @parameter expression="${component.org.apache.maven.artifact.installer.ArtifactInstaller}"
- * @required
- * @readonly
+ * @component
+ */
+ protected ArtifactFactory artifactFactory;
+
+ /**
+ * @component
*/
protected ArtifactInstaller installer;
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=730549&r1=730548&r2=730549&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 Thu Jan 1 06:12:02 2009
@@ -20,7 +20,6 @@
*/
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.installer.ArtifactInstallationException;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.repository.DefaultArtifactRepository;
@@ -119,13 +118,6 @@
private boolean generatePom;
/**
- * Used to create artifacts
- *
- * @component
- */
- private ArtifactFactory artifactFactory;
-
- /**
* The type of remote repository layout to deploy to. Try <i>legacy</i> for
* a Maven 1.x-style repository layout.
*
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=730549&r1=730548&r2=730549&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 Thu Jan 1 06:12:02 2009
@@ -126,6 +126,21 @@
else if ( !attachedArtifacts.isEmpty() )
{
getLog().info( "No primary artifact to install, installing attached artifacts instead." );
+
+ Artifact pomArtifact =
+ artifactFactory.createProjectArtifact( artifact.getGroupId(), artifact.getArtifactId(),
+ artifact.getBaseVersion() );
+ pomArtifact.setFile( pomFile );
+ if ( updateReleaseInfo )
+ {
+ pomArtifact.setRelease( true );
+ }
+
+ installer.install( pomFile, pomArtifact, localRepository );
+ if ( createChecksum )
+ {
+ installCheckSum( pomFile, pomArtifact, false );
+ }
}
else
{