Author: brett
Date: Mon Dec 10 18:43:11 2007
New Revision: 603127
URL: http://svn.apache.org/viewvc?rev=603127&view=rev
Log:
[NMAVEN-95] artifacts in the GAC should be deployed to the repository with
their public token key id
Modified:
incubator/nmaven/trunk/assemblies/NMaven.Model/Pom/pom.xml
incubator/nmaven/trunk/assemblies/NMaven.Plugin/pom.xml
incubator/nmaven/trunk/plugins/maven-deploy-plugin/src/main/java/org/apache/maven/dotnet/plugins/DeployMojo.java
Modified: incubator/nmaven/trunk/assemblies/NMaven.Model/Pom/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/assemblies/NMaven.Model/Pom/pom.xml?rev=603127&r1=603126&r2=603127&view=diff
==============================================================================
--- incubator/nmaven/trunk/assemblies/NMaven.Model/Pom/pom.xml (original)
+++ incubator/nmaven/trunk/assemblies/NMaven.Model/Pom/pom.xml Mon Dec 10
18:43:11 2007
@@ -63,6 +63,13 @@
<isGacInstall>true</isGacInstall>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.dotnet.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <classifier>4b435f4d76e2f0e6</classifier>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
Modified: incubator/nmaven/trunk/assemblies/NMaven.Plugin/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/assemblies/NMaven.Plugin/pom.xml?rev=603127&r1=603126&r2=603127&view=diff
==============================================================================
--- incubator/nmaven/trunk/assemblies/NMaven.Plugin/pom.xml (original)
+++ incubator/nmaven/trunk/assemblies/NMaven.Plugin/pom.xml Mon Dec 10 18:43:11
2007
@@ -56,6 +56,13 @@
<isGacInstall>true</isGacInstall>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.dotnet.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <classifier>4b435f4d76e2f0e6</classifier>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
Modified:
incubator/nmaven/trunk/plugins/maven-deploy-plugin/src/main/java/org/apache/maven/dotnet/plugins/DeployMojo.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-deploy-plugin/src/main/java/org/apache/maven/dotnet/plugins/DeployMojo.java?rev=603127&r1=603126&r2=603127&view=diff
==============================================================================
---
incubator/nmaven/trunk/plugins/maven-deploy-plugin/src/main/java/org/apache/maven/dotnet/plugins/DeployMojo.java
(original)
+++
incubator/nmaven/trunk/plugins/maven-deploy-plugin/src/main/java/org/apache/maven/dotnet/plugins/DeployMojo.java
Mon Dec 10 18:43:11 2007
@@ -76,6 +76,13 @@
private String packaging;
/**
+ * The project classifier type
+ *
+ * @parameter
+ */
+ private String classifier;
+
+ /**
* @component
*/
private ArtifactFactory artifactFactory;
@@ -103,6 +110,22 @@
try
{
artifactDeployer.deploy( exePath, attachedArtifact,
+
project.getDistributionManagementArtifactRepository(), localRepo );
+ }
+ catch ( ArtifactDeploymentException e )
+ {
+ throw new MojoExecutionException( "NMAVEN-DEPLOY: Deploy
Failed", e );
+ }
+ }
+
+ if ( classifier != null )
+ {
+ Artifact attachedArtifact =
artifactFactory.createArtifactWithClassifier( projectArtifact.getGroupId(),
+
projectArtifact.getArtifactId(),
+
project.getVersion(), packaging, classifier );
+ try
+ {
+ artifactDeployer.deploy( project.getArtifact().getFile(),
attachedArtifact,
project.getDistributionManagementArtifactRepository(), localRepo );
}
catch ( ArtifactDeploymentException e )
