Release 2.11.2

.gitignore

@@ -1,5 +1,5 @@
 target/
-*settings.xml
+settings.xml
 *.iml
 .idea/*
 

CHANGELOG.md

@@ -1,5 +1,14 @@
 # CHANGELOG
 
+## 2.11.2
+
+### Content
+
+#### Defect Fixes
+
+* COSSDK-88569: <https://github.com/IBM/ibm-cos-sdk-java/issues/52>
+* AWS Patches aligned to version 1.12.137 of the AWS Java SDK
+
 ## 2.11.1
 
 ### Content

build.properties

@@ -7,4 +7,4 @@ bin.includes = LICENSE.txt,\
                META-INF/,\
                .
 
-jre.compilation.profile = JavaSE-1.6
+jre.compilation.profile = JavaSE-1.8

ibm-cos-java-sdk-bom/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.ibm.cos</groupId>
     <artifactId>ibm-cos-java-sdk-pom</artifactId>
-    <version>2.11.1</version>
+    <version>2.11.2</version>
   </parent>
   <groupId>com.ibm.cos</groupId>
   <artifactId>ibm-cos-java-sdk-bom</artifactId>

ibm-cos-java-sdk-bundle/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ibm.cos</groupId>
         <artifactId>ibm-cos-java-sdk-pom</artifactId>
-        <version>2.11.1</version>
+        <version>2.11.2</version>
     </parent>
     <groupId>com.ibm.cos</groupId>
     <artifactId>ibm-cos-java-sdk-bundle</artifactId>

ibm-cos-java-sdk-core/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.ibm.cos</groupId>
     <artifactId>ibm-cos-java-sdk-pom</artifactId>
-    <version>2.11.1</version>
+    <version>2.11.2</version>
   </parent>
   <groupId>com.ibm.cos</groupId>
   <artifactId>ibm-cos-java-sdk-core</artifactId>

ibm-cos-java-sdk-core/src/main/java/com/ibm/cloud/objectstorage/AbortedException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2013-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.

ibm-cos-java-sdk-core/src/main/java/com/ibm/cloud/objectstorage/AmazonClientException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.

ibm-cos-java-sdk-core/src/main/java/com/ibm/cloud/objectstorage/AmazonServiceException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
@@ -108,6 +108,11 @@ public enum ErrorType {
      */
     private byte[] rawResponse;
 
+    /**
+     * Track proxy host if configured, in case error response came from proxy instead of AWS.
+     */
+    private String proxyHost;
+
     /**
      * Constructs a new AmazonServiceException with the specified message.
      *
@@ -264,7 +269,9 @@ public String getMessage() {
             + " (Service: " + getServiceName()
             + "; Status Code: " + getStatusCode()
             + "; Error Code: " + getErrorCode()
-            + "; Request ID: " + getRequestId() + ")";
+            + "; Request ID: " + getRequestId()
+            + "; Proxy: " + getProxyHost()
+            + ")";
     }
 
     /**
@@ -312,4 +319,23 @@ public Map<String, String> getHttpHeaders() {
     public void setHttpHeaders(Map<String, String> httpHeaders) {
         this.httpHeaders = httpHeaders;
     }
+
+    /**
+     * Returns proxy host if configured.
+     * If using a proxy, then it's possible that the error response came from the proxy instead of AWS.
+     *
+     * @return proxy host if configured or {@code null}
+     */
+    public String getProxyHost() {
+        return proxyHost;
+    }
+
+    /**
+     * Sets proxy host.
+     *
+     * @param proxyHost the proxy host to set
+     */
+    public void setProxyHost(String proxyHost) {
+        this.proxyHost = proxyHost;
+    }
 }