brett 2004/06/28 02:40:14
Modified: artifact project.xml
artifact/src/main/org/apache/maven/artifact/deployer
DefaultArtifactDeployer.java
artifact/xdocs changes.xml
Log:
PR: MPARTIFACT-21
honour distributionSite
Revision Changes Path
1.31 +2 -2 maven-plugins/artifact/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/artifact/project.xml,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- project.xml 25 Jun 2004 18:54:25 -0000 1.30
+++ project.xml 28 Jun 2004 09:40:14 -0000 1.31
@@ -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>
1.22 +8 -3
maven-plugins/artifact/src/main/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
Index: DefaultArtifactDeployer.java
===================================================================
RCS file:
/home/cvs/maven-plugins/artifact/src/main/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- DefaultArtifactDeployer.java 25 Jun 2004 13:50:05 -0000 1.21
+++ DefaultArtifactDeployer.java 28 Jun 2004 09:40:14 -0000 1.22
@@ -350,7 +350,12 @@
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 @@
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"));
}
1.22 +3 -0 maven-plugins/artifact/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/artifact/xdocs/changes.xml,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- changes.xml 25 Jun 2004 18:54:25 -0000 1.21
+++ changes.xml 28 Jun 2004 09:40:14 -0000 1.22
@@ -25,6 +25,9 @@
<author email="[EMAIL PROTECTED]">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>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
