Author: jdcasey
Date: Mon Jun 5 21:36:23 2006
New Revision: 411999
URL: http://svn.apache.org/viewvc?rev=411999&view=rev
Log:
Fixing tests once I moved the default-value of generatePom to the annotation,
which is the standard.
Modified:
maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployFileMojo.java
maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/deploy-file-artifact-not-jar/plugin-config.xml
maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/deploy-file-classifier/plugin-config.xml
maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/deploy-file-legacy-repository-layout/plugin-config.xml
maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/deploy-file-test/plugin-config.xml
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=411999&r1=411998&r2=411999&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
Mon Jun 5 21:36:23 2006
@@ -213,20 +213,21 @@
Artifact artifact =
artifactFactory.createArtifactWithClassifier( groupId, artifactId,
version, packaging, classifier );
- artifact.setFile( file );
-
// Upload the POM if requested, generating one if need be
if ( generatePom )
{
- pomFile = generatePomFile();
+ ArtifactMetadata metadata = new ProjectArtifactMetadata( artifact,
generatePomFile() );
+ artifact.addMetadata( metadata );
+ }
+ else
+ {
+ ArtifactMetadata metadata = new ProjectArtifactMetadata( artifact,
pomFile );
+ artifact.addMetadata( metadata );
}
- ArtifactMetadata metadata = new ProjectArtifactMetadata( artifact,
pomFile );
- artifact.addMetadata( metadata );
-
try
{
- getDeployer().deploy( pomFile, artifact, deploymentRepository,
getLocalRepository() );
+ getDeployer().deploy( file, artifact, deploymentRepository,
getLocalRepository() );
}
catch ( ArtifactDeploymentException e )
{
Modified:
maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/deploy-file-artifact-not-jar/plugin-config.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/deploy-file-artifact-not-jar/plugin-config.xml?rev=411999&r1=411998&r2=411999&view=diff
==============================================================================
---
maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/deploy-file-artifact-not-jar/plugin-config.xml
(original)
+++
maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/deploy-file-artifact-not-jar/plugin-config.xml
Mon Jun 5 21:36:23 2006
@@ -13,7 +13,8 @@
<url>file://${basedir}/target/remote-repo/deploy-file-artifact-not-jar</url>
<uniqueVersion>true</uniqueVersion>
<localRepository>${localRepository}</localRepository>
- <repositoryLayout>default</repositoryLayout>
+ <repositoryLayout>default</repositoryLayout>
+ <generatePom>true</generatePom>
</configuration>
</plugin>
</plugins>
Modified:
maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/deploy-file-classifier/plugin-config.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/deploy-file-classifier/plugin-config.xml?rev=411999&r1=411998&r2=411999&view=diff
==============================================================================
---
maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/deploy-file-classifier/plugin-config.xml
(original)
+++
maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/deploy-file-classifier/plugin-config.xml
Mon Jun 5 21:36:23 2006
@@ -14,7 +14,8 @@
<uniqueVersion>true</uniqueVersion>
<localRepository>${localRepository}</localRepository>
<classifier>bin</classifier>
- <repositoryLayout>default</repositoryLayout>
+ <repositoryLayout>default</repositoryLayout>
+ <generatePom>true</generatePom>
</configuration>
</plugin>
</plugins>
Modified:
maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/deploy-file-legacy-repository-layout/plugin-config.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/deploy-file-legacy-repository-layout/plugin-config.xml?rev=411999&r1=411998&r2=411999&view=diff
==============================================================================
---
maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/deploy-file-legacy-repository-layout/plugin-config.xml
(original)
+++
maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/deploy-file-legacy-repository-layout/plugin-config.xml
Mon Jun 5 21:36:23 2006
@@ -14,6 +14,7 @@
<uniqueVersion>true</uniqueVersion>
<localRepository>${localRepository}</localRepository>
<repositoryLayout>legacy</repositoryLayout>
+ <generatePom>true</generatePom>
</configuration>
</plugin>
</plugins>
Modified:
maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/deploy-file-test/plugin-config.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/deploy-file-test/plugin-config.xml?rev=411999&r1=411998&r2=411999&view=diff
==============================================================================
---
maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/deploy-file-test/plugin-config.xml
(original)
+++
maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/deploy-file-test/plugin-config.xml
Mon Jun 5 21:36:23 2006
@@ -15,6 +15,7 @@
<uniqueVersion>true</uniqueVersion>
<localRepository>${localRepository}</localRepository>
<repositoryLayout>default</repositoryLayout>
+ <generatePom>true</generatePom>
</configuration>
</plugin>
</plugins>
