Release 2.11.1

IBM · Jan 14, 2022 · 79bae81 · 79bae81
1 parent 7f19596
commit 79bae81
Show file tree

Hide file tree

Showing 18 changed files with 43 additions and 25 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # CHANGELOG
 
+## 2.11.1
+
+### Content
+
+#### Defect Fixes
+
+* COSSDK-79868: <https://github.com/IBM/ibm-cos-sdk-java/issues/37>
+* COSSDK-86226: <https://github.com/IBM/ibm-cos-sdk-java/issues/44>
+* COSSDK-85949: <https://github.com/IBM/ibm-cos-sdk-java/issues/45>
+* COSSDK-86451: <https://github.com/IBM/ibm-cos-sdk-java/issues/46>
+* Drop support for Java 6 and 7
+
 ## 2.11.0
 
 ### Content

diff --git a/README.md b/README.md
@@ -24,7 +24,6 @@ You'll need:
 * The ID of the instance of COS that you are working with.
 * Token acquisition endpoint
 * Service endpoint
-* **Java 1.6+**.
 
 These values can be found in the IBM Cloud UI by [generating a 'service credential'](https://cloud.ibm.com/docs/services/cloud-object-storage/iam/service-credentials.html).
 

diff --git a/ibm-cos-java-sdk-bom/build.properties b/ibm-cos-java-sdk-bom/build.properties
@@ -7,4 +7,4 @@ bin.includes = LICENSE.txt,\
                META-INF/,\
                .
 
-jre.compilation.profile = JavaSE-1.6
+jre.compilation.profile = JavaSE-1.8
diff --git a/ibm-cos-java-sdk-bom/pom.xml b/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.0</version>
+    <version>2.11.1</version>
   </parent>
   <groupId>com.ibm.cos</groupId>
   <artifactId>ibm-cos-java-sdk-bom</artifactId>

diff --git a/ibm-cos-java-sdk-bundle/build.properties b/ibm-cos-java-sdk-bundle/build.properties
@@ -7,4 +7,4 @@ bin.includes = LICENSE.txt,\
                META-INF/,\
                .
 
-jre.compilation.profile = JavaSE-1.6
+jre.compilation.profile = JavaSE-1.8
diff --git a/ibm-cos-java-sdk-bundle/pom.xml b/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.0</version>
+        <version>2.11.1</version>
     </parent>
     <groupId>com.ibm.cos</groupId>
     <artifactId>ibm-cos-java-sdk-bundle</artifactId>

diff --git a/ibm-cos-java-sdk-core/build.properties b/ibm-cos-java-sdk-core/build.properties
@@ -7,4 +7,4 @@ bin.includes = LICENSE.txt,\
                META-INF/,\
                .
 
-jre.compilation.profile = JavaSE-1.6
+jre.compilation.profile = JavaSE-1.8
diff --git a/ibm-cos-java-sdk-core/pom.xml b/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.0</version>
+    <version>2.11.1</version>
   </parent>
   <groupId>com.ibm.cos</groupId>
   <artifactId>ibm-cos-java-sdk-core</artifactId>

diff --git a/...s-java-sdk-core/src/main/java/com/ibm/cloud/objectstorage/oauth/DefaultTokenProvider.java b/...s-java-sdk-core/src/main/java/com/ibm/cloud/objectstorage/oauth/DefaultTokenProvider.java
@@ -36,6 +36,8 @@
 import org.apache.http.ssl.SSLContexts;
 import org.apache.http.util.EntityUtils;
 
+import org.apache.http.client.config.RequestConfig;
+
 import com.ibm.cloud.objectstorage.SDKGlobalConfiguration;
 import com.ibm.cloud.objectstorage.http.apache.client.impl.ApacheConnectionManagerFactory.TrustingX509TrustManager;
 import com.ibm.cloud.objectstorage.http.conn.ssl.SdkTLSSocketFactory;
@@ -152,11 +154,16 @@ private Token retrieveTokenHelper(String refreshToken) {
             SSLConnectionSocketFactory sslsf = new SdkTLSSocketFactory(sslContext, new DefaultHostnameVerifier());
 
             HttpClientBuilder builder = HttpClientBuilder.create();
-            if (httpClientSettings != null){
+            HttpClient client;
+            if (httpClientSettings != null) {
                 DefaultTokenManager.addProxyConfig(builder, httpClientSettings);
+                RequestConfig config = RequestConfig.custom().setConnectTimeout(httpClientSettings.getConnectionTimeout()).build();
+                client = builder.setSSLSocketFactory(sslsf).setDefaultRequestConfig(config).build();
+            }
+            else {
+                client = builder.setSSLSocketFactory(sslsf).build();
             }
 
-            HttpClient client = builder.setSSLSocketFactory(sslsf).build();
 
             HttpPost post = new HttpPost(iamEndpoint);
             post.setHeader("Authorization", BASIC_AUTH);
@@ -201,22 +208,22 @@ private Token retrieveTokenHelper(String refreshToken) {
             return token;
 
         } catch (UnsupportedEncodingException e) {
-            OAuthServiceException exception = new OAuthServiceException("Received " + e.toString() + " retrieving IAM token (" + e.getCause() + ")");
+            OAuthServiceException exception = new OAuthServiceException("Received " + e.toString() + " retrieving IAM token (" + e.getCause() + ")", e);
             exception.setStatusMessage(e.toString());
             throw exception;
         } catch (ClientProtocolException e) {
-            OAuthServiceException exception = new OAuthServiceException("Received " + e.toString() + " retrieving IAM token (" + e.getCause() + ")");
+            OAuthServiceException exception = new OAuthServiceException("Received " + e.toString() + " retrieving IAM token (" + e.getCause() + ")", e);
             throw exception;
         } catch (IOException e) {
-            OAuthServiceException exception = new OAuthServiceException("Received " + e.toString() + " retrieving IAM token (" + e.getCause() + ")");
+            OAuthServiceException exception = new OAuthServiceException("Received " + e.toString() + " retrieving IAM token (" + e.getCause() + ")", e);
             exception.setStatusMessage(e.toString());
             throw exception;
         } catch (NoSuchAlgorithmException e) {
-            OAuthServiceException exception = new OAuthServiceException("Received " + e.toString() + " retrieving IAM token (" + e.getCause() + ")");
+            OAuthServiceException exception = new OAuthServiceException("Received " + e.toString() + " retrieving IAM token (" + e.getCause() + ")", e);
             exception.setStatusMessage(e.toString());
             throw exception;
         } catch (KeyManagementException e) {
-            OAuthServiceException exception = new OAuthServiceException("Received " + e.toString() + " retrieving IAM token (" + e.getCause() + ")");
+            OAuthServiceException exception = new OAuthServiceException("Received " + e.toString() + " retrieving IAM token (" + e.getCause() + ")", e);
             exception.setStatusMessage(e.toString());
             throw exception;
         }

diff --git a/ibm-cos-java-sdk-kms/build.properties b/ibm-cos-java-sdk-kms/build.properties
@@ -7,4 +7,4 @@ bin.includes = LICENSE.txt,\
                META-INF/,\
                .
 
-jre.compilation.profile = JavaSE-1.6
+jre.compilation.profile = JavaSE-1.8
diff --git a/ibm-cos-java-sdk-kms/pom.xml b/ibm-cos-java-sdk-kms/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.ibm.cos</groupId>
     <artifactId>ibm-cos-java-sdk-pom</artifactId>
-    <version>2.11.0</version>
+    <version>2.11.1</version>
   </parent>
   <groupId>com.ibm.cos</groupId>
   <artifactId>ibm-cos-java-sdk-kms</artifactId>

diff --git a/ibm-cos-java-sdk-s3/build.properties b/ibm-cos-java-sdk-s3/build.properties
@@ -7,4 +7,4 @@ bin.includes = LICENSE.txt,\
                META-INF/,\
                .
 
-jre.compilation.profile = JavaSE-1.6
+jre.compilation.profile = JavaSE-1.8
diff --git a/ibm-cos-java-sdk-s3/pom.xml b/ibm-cos-java-sdk-s3/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.ibm.cos</groupId>
     <artifactId>ibm-cos-java-sdk-pom</artifactId>
-    <version>2.11.0</version>
+    <version>2.11.1</version>
   </parent>
   <groupId>com.ibm.cos</groupId>
   <artifactId>ibm-cos-java-sdk-s3</artifactId>

diff --git a/ibm-cos-java-sdk-test-utils/build.properties b/ibm-cos-java-sdk-test-utils/build.properties
@@ -7,4 +7,4 @@ bin.includes = LICENSE.txt,\
                META-INF/,\
                .
 
-jre.compilation.profile = JavaSE-1.6
+jre.compilation.profile = JavaSE-1.8
diff --git a/ibm-cos-java-sdk-test-utils/pom.xml b/ibm-cos-java-sdk-test-utils/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.ibm.cos</groupId>
     <artifactId>ibm-cos-java-sdk-pom</artifactId>
-    <version>2.11.0</version>
+    <version>2.11.1</version>
   </parent>
   <groupId>com.ibm.cos</groupId>
   <artifactId>ibm-cos-java-sdk-test-utils</artifactId>

diff --git a/ibm-cos-java-sdk/build.properties b/ibm-cos-java-sdk/build.properties
@@ -7,4 +7,4 @@ bin.includes = LICENSE.txt,\
                META-INF/,\
                .
 
-jre.compilation.profile = JavaSE-1.6
+jre.compilation.profile = JavaSE-1.8
diff --git a/ibm-cos-java-sdk/pom.xml b/ibm-cos-java-sdk/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.ibm.cos</groupId>
     <artifactId>ibm-cos-java-sdk-pom</artifactId>
-    <version>2.11.0</version>
+    <version>2.11.1</version>
   </parent>
   <groupId>com.ibm.cos</groupId>
   <artifactId>ibm-cos-java-sdk</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.ibm.cos</groupId>
   <artifactId>ibm-cos-java-sdk-pom</artifactId>
-  <version>2.11.0</version>
+  <version>2.11.1</version>
   <packaging>pom</packaging>
   <name>IBM COS SDK for Java</name>
   <description>The IBM COS Web Services SDK for Java provides Java APIs
@@ -44,7 +44,7 @@
   </scm>-->
   <properties>
       <ibmcosjavasdk.version>${project.version}</ibmcosjavasdk.version>
-      <jackson.databind.version>2.12.0</jackson.databind.version>
+      <jackson.databind.version>2.13.1</jackson.databind.version>
       <jackson.cbor.version>2.12.1</jackson.cbor.version>
       <asynchttp.version>4.1.4</asynchttp.version>
       <ion.java.version>1.2.0</ion.java.version>
@@ -58,7 +58,7 @@
       <mockito.all.version>1.10.19</mockito.all.version>
       <equalsverifier.version>1.7.8</equalsverifier.version>
       <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-      <jre.version>1.6</jre.version>
+      <jre.version>1.8</jre.version>
       <commons.logging.version>1.1.3</commons.logging.version>
       <httpcomponents.httpclient.version>4.5.13</httpcomponents.httpclient.version>
       <commons.codec.version>1.15</commons.codec.version>