You are viewing a plain text version of this content. The canonical link for it is here.
Posted to wagon-commits@maven.apache.org by ca...@apache.org on 2007/05/17 20:21:17 UTC
svn commit: r539058 - in /maven/wagon/trunk: pom.xml wagon-openpgp/
wagon-providers/pom.xml
wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/CommandExecutorStreamProcessor.java
Author: carlos
Date: Thu May 17 11:21:17 2007
New Revision: 539058
URL: http://svn.apache.org/viewvc?view=rev&rev=539058
Log:
Merged 524429-524438 from wagon-1.x branch that were missing in trunk
Removed:
maven/wagon/trunk/wagon-openpgp/
Modified:
maven/wagon/trunk/pom.xml
maven/wagon/trunk/wagon-providers/pom.xml
maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/CommandExecutorStreamProcessor.java
Modified: maven/wagon/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/pom.xml?view=diff&rev=539058&r1=539057&r2=539058
==============================================================================
--- maven/wagon/trunk/pom.xml (original)
+++ maven/wagon/trunk/pom.xml Thu May 17 11:21:17 2007
@@ -1,3 +1,4 @@
+
<?xml version="1.0" encoding="UTF-8"?>
<!--
@@ -180,7 +181,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>1.0.4</version>
+ <version>1.4.1</version>
</dependency>
</dependencies>
</dependencyManagement>
Modified: maven/wagon/trunk/wagon-providers/pom.xml
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/pom.xml?view=diff&rev=539058&r1=539057&r2=539058
==============================================================================
--- maven/wagon/trunk/wagon-providers/pom.xml (original)
+++ maven/wagon/trunk/wagon-providers/pom.xml Thu May 17 11:21:17 2007
@@ -43,23 +43,9 @@
<module>wagon-ssh-common-test</module>
<module>wagon-ssh</module>
<module>wagon-ssh-ganymed</module>
+ <module>wagon-s3</module>
<module>wagon-webdav</module>
</modules>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-ssh-common</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-ssh-common-test</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
<dependencies>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
Modified: maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/CommandExecutorStreamProcessor.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/CommandExecutorStreamProcessor.java?view=diff&rev=539058&r1=539057&r2=539058
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/CommandExecutorStreamProcessor.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/CommandExecutorStreamProcessor.java Thu May 17 11:21:17 2007
@@ -46,6 +46,7 @@
while ( true )
{
String line = stderrReader.readLine();
+
if ( line == null )
{
break;
@@ -63,6 +64,7 @@
while ( true )
{
String line = stdoutReader.readLine();
+
if ( line == null )
{
break;
---------------------------------------------------------------------
To unsubscribe, e-mail: wagon-commits-unsubscribe@maven.apache.org
For additional commands, e-mail: wagon-commits-help@maven.apache.org