You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2004/06/25 20:19:35 UTC
cvs commit: maven-plugins/artifact/src/main/org/apache/maven/deploy/deployers GenericSshDeployer.java
brett 2004/06/25 11:19:35
Modified: artifact/src/main/org/apache/maven/artifact/deployer
RepositoryInfoBuilder.java
artifact/src/main/org/apache/maven/deploy/deployers
GenericSshDeployer.java
Log:
handle empty username (default to maven.username) and empty passphrase
Revision Changes Path
1.5 +5 -1 maven-plugins/artifact/src/main/org/apache/maven/artifact/deployer/RepositoryInfoBuilder.java
Index: RepositoryInfoBuilder.java
===================================================================
RCS file: /home/cvs/maven-plugins/artifact/src/main/org/apache/maven/artifact/deployer/RepositoryInfoBuilder.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- RepositoryInfoBuilder.java 12 May 2004 12:33:55 -0000 1.4
+++ RepositoryInfoBuilder.java 25 Jun 2004 18:19:35 -0000 1.5
@@ -90,6 +90,10 @@
String proxyPort = (String) project.getContext().getProxyPort();
+ if (username == null) {
+ username = (String) project.getContext().getVariable("maven.username");
+ }
+
repoInfo.setUserName(username);
repoInfo.setPassword(password);
repoInfo.setPassphrase(passphrase);
1.11 +2 -6 maven-plugins/artifact/src/main/org/apache/maven/deploy/deployers/GenericSshDeployer.java
Index: GenericSshDeployer.java
===================================================================
RCS file: /home/cvs/maven-plugins/artifact/src/main/org/apache/maven/deploy/deployers/GenericSshDeployer.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- GenericSshDeployer.java 25 Jun 2004 13:50:05 -0000 1.10
+++ GenericSshDeployer.java 25 Jun 2004 18:19:35 -0000 1.11
@@ -118,11 +118,7 @@
{
if (repoInfo.getPassphrase() == null)
{
- String msg =
- "Private key provided "
- + "without passphrase for repo: "
- + repoInfo.getRepositoryAlias();
- throw new AuthenticationException(msg);
+ repoInfo.setPassphrase("");
}
LOG.info("Using private key: " + privateKey);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org