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/04/19 19:24:33 UTC

[maven-wagon] branch master updated (abc36c5 -> 9600102)

This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven-wagon.git.


    from abc36c5  plexus-container-default 2.1.0
     new b717f60  Add TODOs
     new 1ce89be  HEAD requests never receive an input body
     new 9600102  [WAGON-588] Handle 404 and 410 consistently in HTTP-based Wagon providers

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../org/apache/maven/wagon/providers/http/LightweightHttpWagon.java | 6 +++++-
 .../org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java | 6 ++++++
 .../main/java/org/apache/maven/wagon/providers/http/HttpWagon.java  | 2 ++
 3 files changed, 13 insertions(+), 1 deletion(-)
 mode change 100755 => 100644 wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java
 mode change 100755 => 100644 wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpWagon.java


[maven-wagon] 02/03: HEAD requests never receive an input body

Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-wagon.git

commit 1ce89bea01239c1404c8e93af25ba53d11af312b
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sun Apr 19 21:08:02 2020 +0200

    HEAD requests never receive an input body
---
 .../java/org/apache/maven/wagon/providers/http/LightweightHttpWagon.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http/LightweightHttpWagon.java b/wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http/LightweightHttpWagon.java
index d4910e5..fe06e15 100644
--- a/wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http/LightweightHttpWagon.java
+++ b/wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http/LightweightHttpWagon.java
@@ -441,7 +441,6 @@ public class LightweightHttpWagon
             addHeaders( headConnection );
 
             headConnection.setRequestMethod( "HEAD" );
-            headConnection.setDoOutput( true );
 
             int statusCode = headConnection.getResponseCode();
 


[maven-wagon] 03/03: [WAGON-588] Handle 404 and 410 consistently in HTTP-based Wagon providers

Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-wagon.git

commit 9600102303d646b0e3fe3b5caf2dcf80f6c34286
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sun Apr 19 21:09:29 2020 +0200

    [WAGON-588] Handle 404 and 410 consistently in HTTP-based Wagon providers
---
 .../org/apache/maven/wagon/providers/http/LightweightHttpWagon.java    | 2 ++
 .../org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java    | 3 +++
 .../src/main/java/org/apache/maven/wagon/providers/http/HttpWagon.java | 1 +
 3 files changed, 6 insertions(+)

diff --git a/wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http/LightweightHttpWagon.java b/wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http/LightweightHttpWagon.java
index fe06e15..34240c4 100644
--- a/wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http/LightweightHttpWagon.java
+++ b/wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http/LightweightHttpWagon.java
@@ -286,6 +286,7 @@ public class LightweightHttpWagon
                             reasonPhrase, getProxyInfo() ) );
 
                 case HttpURLConnection.HTTP_NOT_FOUND:
+                case HttpURLConnection.HTTP_GONE:
                     throw new ResourceDoesNotExistException( formatResourceDoesNotExistMessage( buildUrl( resource ),
                             statusCode, reasonPhrase, getProxyInfo() ) );
 
@@ -453,6 +454,7 @@ public class LightweightHttpWagon
                     throw new AuthorizationException( "Access denied to: " + url );
 
                 case HttpURLConnection.HTTP_NOT_FOUND:
+                case HttpURLConnection.HTTP_GONE:
                     return false;
 
                 // TODO Move 401/407 to AuthenticationException after WAGON-587
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 e0bb164..bebadd8 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
@@ -805,6 +805,7 @@ public abstract class AbstractHttpClientWagon
                                 response.getStatusLine().getReasonPhrase(), getProxyInfo() ) );
 
                     case HttpStatus.SC_NOT_FOUND:
+                    case HttpStatus.SC_GONE:
                         EntityUtils.consumeQuietly( response.getEntity() );
                         throw new ResourceDoesNotExistException( formatResourceDoesNotExistMessage( url,
                                 response.getStatusLine().getStatusCode(),
@@ -885,6 +886,7 @@ public abstract class AbstractHttpClientWagon
                                 response.getStatusLine().getReasonPhrase(), getProxyInfo() ) );
 
                     case HttpStatus.SC_NOT_FOUND:
+                    case HttpStatus.SC_GONE:
                         result = false;
                         break;
 
@@ -1171,6 +1173,7 @@ public abstract class AbstractHttpClientWagon
                             getProxyInfo() ) );
 
                 case HttpStatus.SC_NOT_FOUND:
+                case HttpStatus.SC_GONE:
                     EntityUtils.consumeQuietly( response.getEntity() );
                     throw new ResourceDoesNotExistException( formatResourceDoesNotExistMessage( url,
                             response.getStatusLine().getStatusCode(),
diff --git a/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpWagon.java b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpWagon.java
index 08dc803..0f3107a 100644
--- a/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpWagon.java
+++ b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpWagon.java
@@ -89,6 +89,7 @@ public class HttpWagon
                                 reasonPhrase, getProxyInfo() ) );
 
                     case HttpStatus.SC_NOT_FOUND:
+                    case HttpStatus.SC_GONE:
                         EntityUtils.consumeQuietly( response.getEntity() );
                         throw new ResourceDoesNotExistException( formatResourceDoesNotExistMessage( url, statusCode,
                                 reasonPhrase, getProxyInfo() ) );


[maven-wagon] 01/03: Add TODOs

Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-wagon.git

commit b717f607cf7ea4a7b6c76ce9e61d04807eb72e75
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sun Apr 19 21:06:11 2020 +0200

    Add TODOs
---
 .../org/apache/maven/wagon/providers/http/LightweightHttpWagon.java    | 3 +++
 .../org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java    | 3 +++
 .../src/main/java/org/apache/maven/wagon/providers/http/HttpWagon.java | 1 +
 3 files changed, 7 insertions(+)

diff --git a/wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http/LightweightHttpWagon.java b/wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http/LightweightHttpWagon.java
index 82981c9..d4910e5 100644
--- a/wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http/LightweightHttpWagon.java
+++ b/wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http/LightweightHttpWagon.java
@@ -169,6 +169,7 @@ public class LightweightHttpWagon
                 int responseCode = urlConnection.getResponseCode();
                 String reasonPhrase = urlConnection.getResponseMessage();
 
+                // TODO Move 401/407 to AuthenticationException after WAGON-587
                 if ( responseCode == HttpURLConnection.HTTP_FORBIDDEN
                         || responseCode == HttpURLConnection.HTTP_UNAUTHORIZED
                         || responseCode == HttpURLConnection.HTTP_PROXY_AUTH )
@@ -277,6 +278,7 @@ public class LightweightHttpWagon
                 case HttpURLConnection.HTTP_NO_CONTENT: // 204
                     break;
 
+                // TODO Move 401/407 to AuthenticationException after WAGON-587
                 case HttpURLConnection.HTTP_FORBIDDEN:
                 case HttpURLConnection.HTTP_UNAUTHORIZED:
                 case HttpURLConnection.HTTP_PROXY_AUTH:
@@ -454,6 +456,7 @@ public class LightweightHttpWagon
                 case HttpURLConnection.HTTP_NOT_FOUND:
                     return false;
 
+                // TODO Move 401/407 to AuthenticationException after WAGON-587
                 case HttpURLConnection.HTTP_UNAUTHORIZED:
                 case HttpURLConnection.HTTP_PROXY_AUTH:
                     throw new AuthorizationException( "Access denied to: " + url );
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
old mode 100755
new mode 100644
index 81d56d5..e0bb164
--- 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
@@ -794,6 +794,7 @@ public abstract class AbstractHttpClientWagon
                     case HttpStatus.SC_NO_CONTENT:  // 204
                         break;
 
+                    // TODO Move 401/407 to AuthenticationException after WAGON-587
                     case HttpStatus.SC_FORBIDDEN:
                     case HttpStatus.SC_UNAUTHORIZED:
                     case HttpStatus.SC_PROXY_AUTHENTICATION_REQUIRED:
@@ -875,6 +876,7 @@ public abstract class AbstractHttpClientWagon
                         result = true;
                         break;
 
+                    // TODO Move 401/407 to AuthenticationException after WAGON-587
                     case HttpStatus.SC_FORBIDDEN:
                     case HttpStatus.SC_UNAUTHORIZED:
                     case HttpStatus.SC_PROXY_AUTHENTICATION_REQUIRED:
@@ -1158,6 +1160,7 @@ public abstract class AbstractHttpClientWagon
                     // return, leaving last modified set to original value so getIfNewer should return unmodified
                     return;
 
+                // TODO Move 401/407 to AuthenticationException after WAGON-587
                 case HttpStatus.SC_FORBIDDEN:
                 case HttpStatus.SC_UNAUTHORIZED:
                 case HttpStatus.SC_PROXY_AUTHENTICATION_REQUIRED:
diff --git a/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpWagon.java b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpWagon.java
old mode 100755
new mode 100644
index 532141c..08dc803
--- a/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpWagon.java
+++ b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpWagon.java
@@ -80,6 +80,7 @@ public class HttpWagon
                     case HttpStatus.SC_OK:
                         break;
 
+                    // TODO Move 401/407 to AuthenticationException after WAGON-587
                     case HttpStatus.SC_FORBIDDEN:
                     case HttpStatus.SC_UNAUTHORIZED:
                     case HttpStatus.SC_PROXY_AUTHENTICATION_REQUIRED: