Author: brett
Date: Thu Feb 10 19:11:57 2005
New Revision: 153328
URL: http://svn.apache.org/viewcvs?view=rev&rev=153328
Log:
PR: MAVEN-1396
swap out all the old crufty code for Wagon
Added:
maven/maven-1/plugins/trunk/artifact/src/main/org/apache/maven/artifact/deployer/RepositoryBuilder.java
(with props)
maven/maven-1/plugins/trunk/artifact/src/main/org/apache/maven/artifact/deployer/UploadMeter.java
(with props)
Removed:
maven/maven-1/plugins/trunk/artifact/src/main/org/apache/maven/artifact/deployer/RepositoryInfoBuilder.java
maven/maven-1/plugins/trunk/artifact/src/main/org/apache/maven/deploy/
Modified:
maven/maven-1/plugins/trunk/artifact/ (props changed)
maven/maven-1/plugins/trunk/artifact/project.xml
maven/maven-1/plugins/trunk/artifact/src/main/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
maven/maven-1/plugins/trunk/artifact/src/main/org/apache/maven/artifact/deployer/DeployBean.java
maven/maven-1/plugins/trunk/artifact/xdocs/changes.xml
Propchange: maven/maven-1/plugins/trunk/artifact/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Feb 10 19:11:57 2005
@@ -4,3 +4,4 @@
.classpath
.project
build.properties
+maven-artifact-plugin.iml
Modified: maven/maven-1/plugins/trunk/artifact/project.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/artifact/project.xml?view=diff&r1=153327&r2=153328
==============================================================================
--- maven/maven-1/plugins/trunk/artifact/project.xml (original)
+++ maven/maven-1/plugins/trunk/artifact/project.xml Thu Feb 10 19:11:57 2005
@@ -25,7 +25,7 @@
<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.4.2-SNAPSHOT</currentVersion>
+ <currentVersion>1.5-SNAPSHOT</currentVersion>
<description>Tools to manage artifacts and deployment.</description>
<shortDescription>Tools to manage artifacts and deployment</shortDescription>
<url>http://maven.apache.org/reference/plugins/artifact/</url>
@@ -104,7 +104,7 @@
<dependency>
<groupId>jsch</groupId>
<artifactId>jsch</artifactId>
- <version>0.1.5</version>
+ <version>0.1.14</version>
<type>jar</type>
</dependency>
<dependency>
@@ -123,8 +123,33 @@
<dependency>
<groupId>velocity</groupId>
<artifactId>velocity</artifactId>
- <version>1.4-dev</version>
+ <version>1.4</version>
<type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>maven</groupId>
+ <artifactId>wagon-provider-api</artifactId>
+ <version>1.0-alpha-2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>maven</groupId>
+ <artifactId>wagon-http</artifactId>
+ <version>1.0-alpha-2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>maven</groupId>
+ <artifactId>wagon-ftp</artifactId>
+ <version>1.0-alpha-2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>maven</groupId>
+ <artifactId>wagon-ssh</artifactId>
+ <version>1.0-alpha-2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>maven</groupId>
+ <artifactId>wagon-file</artifactId>
+ <version>1.0-alpha-2-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
Modified:
maven/maven-1/plugins/trunk/artifact/src/main/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/artifact/src/main/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java?view=diff&r1=153327&r2=153328
==============================================================================
---
maven/maven-1/plugins/trunk/artifact/src/main/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
(original)
+++
maven/maven-1/plugins/trunk/artifact/src/main/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
Thu Feb 10 19:11:57 2005
@@ -17,28 +17,39 @@
* ====================================================================
*/
-import java.io.File;
-import java.io.IOException;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.TimeZone;
-
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.maven.MavenConstants;
import org.apache.maven.MavenException;
-import org.apache.maven.deploy.DeployTool;
-import org.apache.maven.deploy.RepositoryInfo;
import org.apache.maven.project.Project;
import org.apache.maven.repository.ArtifactTypeHandler;
import org.apache.maven.repository.DefaultArtifactTypeHandler;
import org.apache.maven.util.MD5Sum;
+import org.apache.maven.wagon.ConnectionException;
+import org.apache.maven.wagon.ResourceDoesNotExistException;
+import org.apache.maven.wagon.TransferFailedException;
+import org.apache.maven.wagon.Wagon;
+import org.apache.maven.wagon.authentication.AuthenticationException;
+import org.apache.maven.wagon.authorization.AuthorizationException;
+import org.apache.maven.wagon.providers.file.FileWagon;
+import org.apache.maven.wagon.providers.ftp.FtpWagon;
+import org.apache.maven.wagon.providers.http.HttpWagon;
+import org.apache.maven.wagon.providers.ssh.ScpWagon;
+import org.apache.maven.wagon.repository.Repository;
import org.codehaus.plexus.util.FileUtils;
+import java.io.File;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+import java.util.TimeZone;
+
/**
*
* Default implementation of Artifact Deployer interface.
@@ -108,8 +119,8 @@
handler.constructRepositoryFullPath(type, project,
project.getCurrentVersion());
List srcFiles = new ArrayList();
- srcFiles.add(file.getAbsolutePath());
- srcFiles.add(md5File.getAbsolutePath());
+ srcFiles.add(file);
+ srcFiles.add(md5File);
List destFiles = new ArrayList();
destFiles.add(repositoryPath);
@@ -150,10 +161,10 @@
createSnapshotVersionFile(file, snapshotSignature, project, type);
try {
List srcFiles = new ArrayList();
- srcFiles.add(file.getAbsolutePath());
- srcFiles.add(md5File.getAbsolutePath());
- srcFiles.add(file.getAbsolutePath());
- srcFiles.add(md5File.getAbsolutePath());
+ srcFiles.add(file);
+ srcFiles.add(md5File);
+ srcFiles.add(file);
+ srcFiles.add(md5File);
String snapshotFilename =
handler.constructRepositoryFullPath(
@@ -169,7 +180,7 @@
destFiles.add(timestampedFilename);
destFiles.add(timestampedFilename + ".md5");
- srcFiles.add(snapshotVersionFile.getAbsolutePath());
+ srcFiles.add(snapshotVersionFile);
String snapshotVersionsFilename =
handler.constructRepositoryDirectoryPath(type, project)
@@ -254,7 +265,7 @@
/**
* Install given file in local repository
- * @param artifact the artifact file to install
+ * @param file the artifact file to install
* @param type The type of the artiafct
* @param project
* @param version String denominating the version of the artifact
@@ -331,18 +342,9 @@
return null;
}
- /**
- * @param artifact
- * @param type
- * @param project
- * @param snapshot
- */
private void doDeploy(List srcFiles, List destFiles, Project project)
throws MavenException
{
-
- DeployTool deployTool = new DeployTool();
-
// trick add special values to context for default repository;
String repoStr =
@@ -381,24 +383,20 @@
String repo = repos[i].trim();
LOG.info("Deploying to repository: " + repo);
- RepositoryInfo repoInfo = null;
+ Repository repository = RepositoryBuilder.getRepository(project,
repo);
try
{
- repoInfo =
- RepositoryInfoBuilder.getRepositoryInfo(project, repo);
-
- deployTool.deploy(repoInfo, srcFiles, destFiles);
+ deployFiles( repository, srcFiles, destFiles );
success = true;
}
catch (Exception e)
{
String msg =
"Failed to deploy to: "
- + repoInfo.getRepositoryAlias()
+ + repository.getId()
+ " Reason: "
- + e.getMessage();
- LOG.warn(msg);
- LOG.debug(e);
+ + e;
+ LOG.warn(msg, e);
// deploy to next repository
continue;
}
@@ -409,6 +407,71 @@
}
}
+ private void deployFiles( Repository repository, List srcFiles, List
destFiles )
+ throws ConnectionException, AuthenticationException,
ResourceDoesNotExistException, TransferFailedException,
+ AuthorizationException, MalformedURLException
+ {
+
+ if (srcFiles.size() != destFiles.size())
+ {
+ String msg = "Lengths of the lists should be the same";
+ throw new IllegalArgumentException(msg);
+ }
+
+ Wagon wagon = getWagon( repository.getProtocol() );
+ wagon.addTransferListener( new UploadMeter());
+
+ try
+ {
+ wagon.connect( repository );
+ Iterator srcIterator = srcFiles.iterator();
+ Iterator destIterator = destFiles.iterator();
+ while (srcIterator.hasNext())
+ {
+ File srcFile = (File) srcIterator.next();
+ String destFile = (String) destIterator.next();
+ wagon.put( srcFile, destFile );
+ }
+ }
+ finally
+ {
+ try
+ {
+ wagon.disconnect();
+ }
+ catch (Exception e)
+ {
+ LOG.error("Error cleaning up from the deployer", e);
+ }
+ }
+ }
+
+ private Wagon getWagon( String protocol )
+ throws MalformedURLException
+ {
+ // TODO: implement others (SFTP, SCPEXE)
+ if ( protocol.equals( "http" ) )
+ {
+ return new HttpWagon();
+ }
+ else if ( protocol.equals( "ftp" ) )
+ {
+ return new FtpWagon();
+ }
+ else if ( protocol.equals( "file" ) )
+ {
+ return new FileWagon();
+ }
+ else if ( protocol.equals( "scp" ) )
+ {
+ return new ScpWagon();
+ }
+ else
+ {
+ throw new MalformedURLException( "Unknown Wagon protocol: " +
protocol );
+ }
+ }
+
/**
* Return the local repository path form given project
* @param project
@@ -491,7 +554,7 @@
/**
* Create MD5 checksum file for given file. File is created
* in the same folder
- * @param File
+ * @param file
* @return The <code>File</code> which contatins MD5 checksum
* @throws MavenException when opertaion failed
*/
Modified:
maven/maven-1/plugins/trunk/artifact/src/main/org/apache/maven/artifact/deployer/DeployBean.java
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/artifact/src/main/org/apache/maven/artifact/deployer/DeployBean.java?view=diff&r1=153327&r2=153328
==============================================================================
---
maven/maven-1/plugins/trunk/artifact/src/main/org/apache/maven/artifact/deployer/DeployBean.java
(original)
+++
maven/maven-1/plugins/trunk/artifact/src/main/org/apache/maven/artifact/deployer/DeployBean.java
Thu Feb 10 19:11:57 2005
@@ -18,8 +18,6 @@
*/
import org.apache.maven.MavenException;
-import org.apache.maven.artifact.deployer.ArtifactDeployer;
-import org.apache.maven.artifact.deployer.DefaultArtifactDeployer;
import org.apache.maven.project.Project;
import org.apache.maven.repository.ArtifactTypeHandler;
import org.apache.maven.repository.DefaultArtifactTypeHandler;
@@ -30,7 +28,7 @@
* from jelly scripts.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Michal Maczka</a>
- * @version $Id: DeployBean.java,v 1.6 2004/06/23 13:04:28 brett Exp $
+ * @version $Id$
*/
public class DeployBean
{
Added:
maven/maven-1/plugins/trunk/artifact/src/main/org/apache/maven/artifact/deployer/RepositoryBuilder.java
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/artifact/src/main/org/apache/maven/artifact/deployer/RepositoryBuilder.java?view=auto&rev=153328
==============================================================================
---
maven/maven-1/plugins/trunk/artifact/src/main/org/apache/maven/artifact/deployer/RepositoryBuilder.java
(added)
+++
maven/maven-1/plugins/trunk/artifact/src/main/org/apache/maven/artifact/deployer/RepositoryBuilder.java
Thu Feb 10 19:11:57 2005
@@ -0,0 +1,180 @@
+package org.apache.maven.artifact.deployer;
+
+/* ====================================================================
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ====================================================================
+ */
+
+import org.apache.maven.project.Project;
+import org.apache.maven.wagon.repository.Repository;
+import org.apache.maven.wagon.repository.RepositoryPermissions;
+import org.apache.maven.wagon.authentication.AuthenticationInfo;
+import org.apache.maven.wagon.proxy.ProxyInfo;
+import org.apache.maven.MavenConstants;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import java.net.MalformedURLException;
+
+/**
+ * Perform mapping between project's properties and attributes of Wagon
Repository class.
+ *
+ * @author <a href="mailto:[EMAIL PROTECTED]">Brett Porter</a>
+ * @version $Id$
+ */
+public class RepositoryBuilder
+{
+ private static final Log LOG = LogFactory.getLog( RepositoryBuilder.class
);
+
+ public static Repository getRepository( Project project, String id )
+ {
+ String url = (String) project.getContext().getVariable( "maven.repo."
+ id );
+
+ Repository repository = new Repository( id, url );
+
+ String username = (String) project.getContext().getVariable(
"maven.repo." + id + ".username" );
+ String password = (String) project.getContext().getVariable(
"maven.repo." + id + ".password" );
+ String passphrase = (String) project.getContext().getVariable(
"maven.repo." + id + ".passphrase" );
+ String privateKey = (String) project.getContext().getVariable(
"maven.repo." + id + ".privatekey" );
+
+ if ( username == null )
+ {
+ username = (String) project.getContext().getVariable(
"maven.username" );
+ }
+
+ AuthenticationInfo authenticationInfo = new AuthenticationInfo();
+ authenticationInfo.setUserName( username );
+ authenticationInfo.setPassword( password );
+ authenticationInfo.setPrivateKey( privateKey );
+ authenticationInfo.setPassphrase( passphrase );
+ repository.setAuthenticationInfo( authenticationInfo );
+
+ String dir = (String) project.getContext().getVariable( "maven.repo."
+ id + ".directory" );
+ repository.setBasedir( dir );
+
+ String port = (String) project.getContext().getVariable( "maven.repo."
+ id + ".port" );
+ if ( port != null )
+ {
+ try
+ {
+ repository.setPort( Integer.valueOf( port ).intValue() );
+ }
+ catch ( NumberFormatException e )
+ {
+ LOG.warn("Invalid format for port: " + port);
+ }
+ }
+
+ String remoteGroup = (String) project.getContext().getVariable(
"maven.repo." + id + ".group" );
+ String remoteMode = (String) project.getContext().getVariable(
"maven.repo." + id + ".mode" );
+ String remoteDirectoryMode = (String)
project.getContext().getVariable( "maven.repo." + id + ".directory.mode" );
+
+ if ( remoteMode == null )
+ {
+ remoteMode = "g+w";
+ }
+
+ if ( remoteDirectoryMode == null )
+ {
+ remoteDirectoryMode = remoteMode;
+ }
+
+ RepositoryPermissions permissions = new RepositoryPermissions();
+ permissions.setDirectoryMode( remoteDirectoryMode );
+ permissions.setFileMode( remoteMode );
+ permissions.setGroup( remoteGroup );
+ repository.setPermissions( permissions );
+
+ // TODO: provider specific settings
+/*
+ String passiveModeOn = (String) project.getContext().getVariable(
"maven.repo." + id + ".passiveModeOn" );
+
+ String compress = (String) project.getContext().getVariable(
"maven.repo." + id + ".compress" );
+
+ String scpExe = (String) project.getContext().getVariable(
"maven.repo." + id + ".scp.executable" );
+ if ( scpExe == null )
+ {
+ scpExe = (String) project.getContext().getVariable(
"maven.scp.executable" );
+ }
+ String scpArgs = (String) project.getContext().getVariable(
"maven.repo." + id + ".scp.args" );
+ if ( scpArgs == null )
+ {
+ scpArgs = (String) project.getContext().getVariable(
"maven.scp.args" );
+ }
+ String sshExe = (String) project.getContext().getVariable(
"maven.repo." + id + ".ssh.executable" );
+ if ( sshExe == null )
+ {
+ sshExe = (String) project.getContext().getVariable(
"maven.ssh.executable" );
+ }
+ String sshArgs = (String) project.getContext().getVariable(
"maven.repo." + id + ".ssh.args" );
+ if ( sshArgs == null )
+ {
+ sshArgs = (String) project.getContext().getVariable(
"maven.ssh.args" );
+ }
+
+ if ( passiveModeOn != null )
+ {
+ if ( "false".equalsIgnoreCase( passiveModeOn ) )
+ {
+ repoInfo.setPassiveModeOn( false );
+ }
+ }
+ if ( compress != null )
+ {
+ try
+ {
+ repoInfo.setCompress( new Boolean( compress ).booleanValue() );
+ }
+ catch ( Exception e )
+ {
+ throw new MalformedURLException( "maven.repo." + id +
".compress should be a boolean" );
+ }
+ }
+*/
+
+ return repository;
+ }
+
+ public static void getProxyInfo( Project project )
+ {
+ ProxyInfo proxyInfo = new ProxyInfo();
+
+ String proxyHost = (String) project.getContext().getProxyHost();
+ String proxyUser = (String) project.getContext().getProxyUserName();
+ String proxyPassword = (String)
project.getContext().getProxyPassword();
+ String proxyPort = (String) project.getContext().getProxyPort();
+
+ if ( proxyPort != null )
+ {
+ try
+ {
+ proxyInfo.setPort( Integer.valueOf( proxyPort ).intValue() );
+ }
+ catch ( NumberFormatException e )
+ {
+ LOG.warn("Invalid format for port: " + proxyPort);
+ }
+ }
+
+ proxyInfo.setType( "http" );
+ proxyInfo.setHost( proxyHost );
+ proxyInfo.setNonProxyHosts( (String) project.getContext().getVariable(
"maven.proxy.nonProxyHosts" ));
+ proxyInfo.setNtlmDomain( (String) project.getContext().getVariable(
"maven.proxy.ntlm.domain" ));
+ proxyInfo.setNtlmHost( (String) project.getContext().getVariable(
"maven.proxy.ntlm.host" ));
+ proxyInfo.setUserName( proxyUser );
+ proxyInfo.setPassword( proxyPassword );
+ }
+
+}
Propchange:
maven/maven-1/plugins/trunk/artifact/src/main/org/apache/maven/artifact/deployer/RepositoryBuilder.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/maven-1/plugins/trunk/artifact/src/main/org/apache/maven/artifact/deployer/RepositoryBuilder.java
------------------------------------------------------------------------------
svn:executable = *
Propchange:
maven/maven-1/plugins/trunk/artifact/src/main/org/apache/maven/artifact/deployer/RepositoryBuilder.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/maven-1/plugins/trunk/artifact/src/main/org/apache/maven/artifact/deployer/UploadMeter.java
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/artifact/src/main/org/apache/maven/artifact/deployer/UploadMeter.java?view=auto&rev=153328
==============================================================================
---
maven/maven-1/plugins/trunk/artifact/src/main/org/apache/maven/artifact/deployer/UploadMeter.java
(added)
+++
maven/maven-1/plugins/trunk/artifact/src/main/org/apache/maven/artifact/deployer/UploadMeter.java
Thu Feb 10 19:11:57 2005
@@ -0,0 +1,98 @@
+package org.apache.maven.artifact.deployer;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.maven.wagon.events.TransferEvent;
+import org.apache.maven.wagon.events.TransferListener;
+import org.apache.maven.util.BootstrapDownloadMeter;
+
+/* ====================================================================
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ====================================================================
+ */
+
+/**
+ * Bootstrap download progress meter.
+ *
+ * @author <a href="mailto:[EMAIL PROTECTED]">Brett Porter</a>
+ * @version $Id$
+ */
+public class UploadMeter implements TransferListener
+{
+ /** log for debug output */
+ private static final Log log = LogFactory.getLog(UploadMeter.class);
+
+ private int shownSoFar = 0;
+ private final int numHashes;
+ private final char hashChar;
+ private long complete = 0;
+ private long total;
+
+ public UploadMeter()
+ {
+ this( 20, '.' );
+ }
+
+ public UploadMeter(int numHashes, char hashChar)
+ {
+ this.numHashes = numHashes;
+ this.hashChar = hashChar;
+ }
+
+ public void transferStarted( TransferEvent transferEvent )
+ {
+ shownSoFar = 0;
+ complete = 0;
+ System.out.println( "Uploading " +
transferEvent.getLocalFile().getName() + ": " );
+ total = transferEvent.getLocalFile().length();
+ }
+
+ public void transferProgress( TransferEvent transferEvent, byte[] buffer,
int length )
+ {
+// TODO: fix
+// long total = transferEvent.getResource().getContentLength();
+
+ complete += length;
+
+ if (total > 0)
+ {
+ int numToShow = (int) ( ( complete * numHashes ) / total );
+ for ( int i = shownSoFar + 1; i <= numToShow; i++ )
+ {
+ System.out.print( hashChar );
+ }
+ shownSoFar = numToShow;
+ }
+ }
+
+ public void transferCompleted( TransferEvent transferEvent )
+ {
+// TODO: fix
+// long total = transferEvent.getResource().getContentLength();
+
+ System.out.println(" (" + (total/1024) + "K)");
+ }
+
+ public void transferError( TransferEvent transferEvent )
+ {
+ log.error( transferEvent.getException().getMessage() );
+ }
+
+ public void debug( String message )
+ {
+ log.debug( message );
+ }
+}
+
Propchange:
maven/maven-1/plugins/trunk/artifact/src/main/org/apache/maven/artifact/deployer/UploadMeter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/maven-1/plugins/trunk/artifact/src/main/org/apache/maven/artifact/deployer/UploadMeter.java
------------------------------------------------------------------------------
svn:executable = *
Propchange:
maven/maven-1/plugins/trunk/artifact/src/main/org/apache/maven/artifact/deployer/UploadMeter.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Modified: maven/maven-1/plugins/trunk/artifact/xdocs/changes.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/artifact/xdocs/changes.xml?view=diff&r1=153327&r2=153328
==============================================================================
--- maven/maven-1/plugins/trunk/artifact/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/artifact/xdocs/changes.xml Thu Feb 10 19:11:57
2005
@@ -25,6 +25,9 @@
<author email="[EMAIL PROTECTED]">Vincent Massol</author>
</properties>
<body>
+ <release version="1.5-SNAPSHOT" date="in SVN">
+ <action dev="brett" type="update" issue="MAVEN-1396">Replace bulk of
code with Wagon</action>
+ </release>
<release version="1.4.1" date="2004-09-29">
<action dev="brett" type="fix">Improve error handling in
FTPDeployer</action>
<action dev="brett" type="fix" issue="MPARTIFACT-38">Allow scpexe
protocol to work better with args</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]