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 2020/05/17 19:16:27 UTC
[maven-wagon] 02/02: [WAGON-593] Remove non-existent cache header
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch WAGON-593
in repository https://gitbox.apache.org/repos/asf/maven-wagon.git
commit bb12d4ed2467f8deb543fa99d8d9a180e4ab1ea6
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sun May 17 21:16:05 2020 +0200
[WAGON-593] Remove non-existent cache header
---
.../apache/maven/wagon/shared/http/AbstractHttpClientWagon.java | 2 --
.../apache/maven/wagon/providers/http/HttpClientWagonTest.java | 9 ---------
.../apache/maven/wagon/providers/webdav/HttpClientWagonTest.java | 9 ---------
3 files changed, 20 deletions(-)
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 9bedabc..3e9fe91 100644
--- 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
@@ -1013,8 +1013,6 @@ public abstract class AbstractHttpClientWagon
{
// TODO: merge with the other headers and have some better defaults, unify with lightweight headers
method.addHeader( "Cache-control", "no-cache" );
- // FIXME This header does not exist, remove it
- method.addHeader( "Cache-store", "no-store" );
method.addHeader( "Pragma", "no-cache" );
}
diff --git a/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpClientWagonTest.java b/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpClientWagonTest.java
index 692c00d..30ff6ac 100755
--- a/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpClientWagonTest.java
+++ b/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpClientWagonTest.java
@@ -68,7 +68,6 @@ public class HttpClientWagonTest
// these are the default headers.
// method.addRequestHeader( "Cache-control", "no-cache" );
- // method.addRequestHeader( "Cache-store", "no-store" );
// method.addRequestHeader( "Pragma", "no-cache" );
// "Accept-Encoding" is automatically set by HttpClient at runtime
@@ -76,10 +75,6 @@ public class HttpClientWagonTest
assertNotNull( header );
assertEquals( "no-cache", header.getValue() );
- header = method.getFirstHeader( "Cache-store" );
- assertNotNull( header );
- assertEquals( "no-store", header.getValue() );
-
header = method.getFirstHeader( "Pragma" );
assertNotNull( header );
assertEquals( "no-cache", header.getValue() );
@@ -98,15 +93,11 @@ public class HttpClientWagonTest
// these are the default headers.
// method.addRequestHeader( "Cache-control", "no-cache" );
- // method.addRequestHeader( "Cache-store", "no-store" );
// method.addRequestHeader( "Pragma", "no-cache" );
Header header = method.getFirstHeader( "Cache-control" );
assertNull( header );
- header = method.getFirstHeader( "Cache-store" );
- assertNull( header );
-
header = method.getFirstHeader( "Pragma" );
assertNull( header );
}
diff --git a/wagon-providers/wagon-webdav-jackrabbit/src/test/java/org/apache/maven/wagon/providers/webdav/HttpClientWagonTest.java b/wagon-providers/wagon-webdav-jackrabbit/src/test/java/org/apache/maven/wagon/providers/webdav/HttpClientWagonTest.java
index 687db94..77016ea 100644
--- a/wagon-providers/wagon-webdav-jackrabbit/src/test/java/org/apache/maven/wagon/providers/webdav/HttpClientWagonTest.java
+++ b/wagon-providers/wagon-webdav-jackrabbit/src/test/java/org/apache/maven/wagon/providers/webdav/HttpClientWagonTest.java
@@ -93,7 +93,6 @@ public class HttpClientWagonTest
// these are the default headers.
// method.addRequestHeader( "Cache-control", "no-cache" );
- // method.addRequestHeader( "Cache-store", "no-store" );
// method.addRequestHeader( "Pragma", "no-cache" );
// "Accept-Encoding" is automatically set by HttpClient at runtime
@@ -101,10 +100,6 @@ public class HttpClientWagonTest
assertNotNull( header );
assertEquals( "no-cache", header.getValue() );
- header = method.getFirstHeader( "Cache-store" );
- assertNotNull( header );
- assertEquals( "no-store", header.getValue() );
-
header = method.getFirstHeader( "Pragma" );
assertNotNull( header );
assertEquals( "no-cache", header.getValue() );
@@ -123,15 +118,11 @@ public class HttpClientWagonTest
// these are the default headers.
// method.addRequestHeader( "Cache-control", "no-cache" );
- // method.addRequestHeader( "Cache-store", "no-store" );
// method.addRequestHeader( "Pragma", "no-cache" );
Header header = method.getFirstHeader( "Cache-control" );
assertNull( header );
- header = method.getFirstHeader( "Cache-store" );
- assertNull( header );
-
header = method.getFirstHeader( "Pragma" );
assertNull( header );
}