Bommels05/maven-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PR: MPARTIFACT-21

Browse Source 
honour distributionSite


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@115568 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
brett
2004-06-28 09:40:14 +00:00
parent 2dc3a63d47
commit f75502a378
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
artifact/project.xml
View File

@@ -25,8 +25,8 @@
<name>Maven Artifact Plugin</name>
<!-- WARNING: some dependency checks will break if we get to 1.10, need to go to 2.0 from there -->
<currentVersion>1.3</currentVersion>
<description/>
<currentVersion>1.4-SNAPSHOT</currentVersion>
<description>Tools to manage artifacts and deployment. Requires Maven 1.0 RC4</description>
<shortDescription>Tools to manage artifacts and deployment</shortDescription>
<url>http://maven.apache.org/reference/plugins/artifact/</url>
<issueTrackingUrl>http://jira.codehaus.org/browse/MPARTIFACT</issueTrackingUrl>

11
artifact/src/main/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
View File

@@ -45,7 +45,7 @@ import org.apache.maven.util.MD5Sum;
*
*
* @author <a href="mailto:michal.maczka@dimatics.com">Michal Maczka</a>
* @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"));
}

3
artifact/xdocs/changes.xml
View File

@@ -25,6 +25,9 @@
<author email="vmassol@apache.org">Vincent Massol</author>
</properties>
<body>
<release version="1.4-SNAPSHOT" date="in CVS">
<action dev="brett" type="add">Allow use of distributionSite POM attribute in artifact method</action>
</release>
<release version="1.3" date="2004-06-25">
<action dev="brett" type="add" issue="MPARTIFACT-8" due-to="Matt Smith">Allow non-passive FTP</action>
<action dev="brett" type="add" issue="MPARTIFACT-20">Fix copy-deps when list is empty</action>