diff --git a/artifact/project.xml b/artifact/project.xml
index b851c8e7..1c2c5f8c 100644
--- a/artifact/project.xml
+++ b/artifact/project.xml
@@ -25,8 +25,8 @@
Maven Artifact Plugin
- 1.3
-
+ 1.4-SNAPSHOT
+ Tools to manage artifacts and deployment. Requires Maven 1.0 RC4
Tools to manage artifacts and deployment
http://maven.apache.org/reference/plugins/artifact/
http://jira.codehaus.org/browse/MPARTIFACT
diff --git a/artifact/src/main/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java b/artifact/src/main/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
index 848ad3a8..4c61349a 100644
--- a/artifact/src/main/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
+++ b/artifact/src/main/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
@@ -45,7 +45,7 @@ import org.apache.maven.util.MD5Sum;
*
*
* @author Michal Maczka
- * @version $Id: DefaultArtifactDeployer.java,v 1.21 2004/06/25 13:50:05 brett Exp $
+ * @version $Id: DefaultArtifactDeployer.java,v 1.22 2004/06/28 09:40:14 brett Exp $
*/
public class DefaultArtifactDeployer implements ArtifactDeployer
{
@@ -350,7 +350,12 @@ public class DefaultArtifactDeployer implements ArtifactDeployer
if (repoStr == null || repoStr.trim().length() == 0)
{
- String central = (String) project.getContext().getVariable("maven.repo.central");
+ String central = project.getDistributionSite();
+ String centralDirectory = project.getDistributionDirectory();
+ if (central == null || central.trim().length() == 0) {
+ central = (String) project.getContext().getVariable("maven.repo.central");
+ centralDirectory = (String) project.getContext().getVariable("maven.repo.central.directory");
+ }
if (central != null && central.trim().length() > 0) {
repoStr = "default";
project.getContext().setVariable("maven.repo.default", "scp://" + central);
@@ -361,7 +366,7 @@ public class DefaultArtifactDeployer implements ArtifactDeployer
LOG.warn( "WARNING: assuming empty passphrase. Specify maven.repo.default.passphrase if needed" );
project.getContext().setVariable("maven.repo.default.passphrase", "");
}
- project.getContext().setVariable("maven.repo.default.directory", project.getContext().getVariable("maven.repo.central.directory"));
+ project.getContext().setVariable("maven.repo.default.directory", centralDirectory);
project.getContext().setVariable("maven.repo.default.username", project.getContext().getVariable("maven.username"));
project.getContext().setVariable("maven.repo.default.group", project.getContext().getVariable("maven.remote.group"));
}
diff --git a/artifact/xdocs/changes.xml b/artifact/xdocs/changes.xml
index 1a63c9b9..c0c32dc4 100644
--- a/artifact/xdocs/changes.xml
+++ b/artifact/xdocs/changes.xml
@@ -25,6 +25,9 @@
Vincent Massol
+
+ Allow use of distributionSite POM attribute in artifact method
+
Allow non-passive FTP
Fix copy-deps when list is empty