You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2019/10/30 15:15:39 UTC
[maven-wagon] 01/01: Modified for failure
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch WAGON-568_block
in repository https://gitbox.apache.org/repos/asf/maven-wagon.git
commit 7babfa9bd6e9621c687b69f10d13246ef57d6925
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Wed Oct 30 16:15:27 2019 +0100
Modified for failure
---
.../main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java | 6 ++++--
.../org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java | 2 +-
wagon-providers/wagon-http/pom.xml | 1 +
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java b/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java
index a90f8f4..4f2f339 100644
--- a/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java
+++ b/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java
@@ -62,6 +62,7 @@ import javax.servlet.http.HttpServletResponse;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
+import java.io.ByteArrayInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -907,9 +908,10 @@ public abstract class HttpWagonTestCase
String content = "put top secret";
FileUtils.fileWrite( tempFile.getAbsolutePath(), content );
- try ( FileInputStream fileInputStream = new FileInputStream( tempFile ) )
+ //try ( FileInputStream fileInputStream = new FileInputStream( tempFile ) )
+ try ( InputStream inputStream = new ByteArrayInputStream( content.getBytes() ) )
{
- wagon.putFromStream( fileInputStream, "test-secured-put-resource", content.length(), -1 );
+ wagon.putFromStream( inputStream, "test-secured-put-resource", content.length(), -1 );
assertEquals( content, FileUtils.fileRead( sourceFile.getAbsolutePath() ) );
checkRequestResponseForRedirectPutWithFullUrl( redirectHandler, putHandler );
diff --git a/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java b/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java
index 3bf4291..d174cc7 100755
--- a/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java
+++ b/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java
@@ -954,7 +954,7 @@ public abstract class AbstractHttpClientWagon
requestConfigBuilder.setSocketTimeout( getReadTimeout() );
if ( httpMethod instanceof HttpPut )
{
- requestConfigBuilder.setExpectContinueEnabled( true );
+ requestConfigBuilder.setExpectContinueEnabled( false );
}
}
diff --git a/wagon-providers/wagon-http/pom.xml b/wagon-providers/wagon-http/pom.xml
index 675fdcd..20fe19d 100644
--- a/wagon-providers/wagon-http/pom.xml
+++ b/wagon-providers/wagon-http/pom.xml
@@ -165,6 +165,7 @@ under the License.
<maven.wagon.http.ssl.ignore.validity.dates>true</maven.wagon.http.ssl.ignore.validity.dates>
<org.slf4j.simpleLogger.showDateTime>true</org.slf4j.simpleLogger.showDateTime>
<org.slf4j.simpleLogger.dateTimeFormat>yyyy-MM-dd'T'HH:mm:ss.SSS</org.slf4j.simpleLogger.dateTimeFormat>
+ <org.slf4j.simpleLogger.log.org.apache.http>DEBUG</org.slf4j.simpleLogger.log.org.apache.http>
</systemPropertyVariables>
</configuration>
</plugin>