Merge pull request #97 from oracle/release_2019-01-24

Releasing version 1.3.5

Author: dshelbyo

CHANGELOG.md

@@ -13,6 +13,14 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 ### Added
 - N/A
 
+## 1.3.5 - 2018-01-24
+### Added
+- Support for renaming databases during restore-from-backup operations in the Database service
+- Support for calling Oracle Cloud Infrastructure services in the ca-toronto-1 region
+
+### Changed
+- Upgraded to Jersey version 2.27 and JAX-RS version 2.1
+
 ## 1.3.4 - 2019-01-10
 ### Added
 - Support for device attributes on volume attachments in the Compute service

bmc-addons/bmc-apache-connector-provider/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.oracle.oci.sdk</groupId>
     <artifactId>oci-java-sdk-addons</artifactId>
-    <version>1.3.4</version>
+    <version>1.3.5</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -22,6 +22,12 @@
       <version>${jersey.version}</version>
     </dependency>
 
+    <dependency>
+      <groupId>org.glassfish.jersey.inject</groupId>
+      <artifactId>jersey-hk2</artifactId>
+      <version>${jersey.version}</version>
+    </dependency>
+
     <dependency>
       <groupId>org.glassfish.jersey.connectors</groupId>
       <artifactId>jersey-apache-connector</artifactId>
@@ -37,7 +43,7 @@
     <dependency>
       <groupId>com.oracle.oci.sdk</groupId>
       <artifactId>oci-java-sdk-common</artifactId>
-      <version>1.3.4</version>
+      <version>1.3.5</version>
     </dependency>
   </dependencies>
 </project>

bmc-addons/bmc-resteasy-client-configurator/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.oracle.oci.sdk</groupId>
     <artifactId>oci-java-sdk-addons</artifactId>
-    <version>1.3.4</version>
+    <version>1.3.5</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -38,7 +38,7 @@
     <dependency>
       <groupId>com.oracle.oci.sdk</groupId>
       <artifactId>oci-java-sdk-common</artifactId>
-      <version>1.3.4</version>
+      <version>1.3.5</version>
     </dependency>
   </dependencies>
 </project>

bmc-addons/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.oracle.oci.sdk</groupId>
     <artifactId>oci-java-sdk</artifactId>
-    <version>1.3.4</version>
+    <version>1.3.5</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

bmc-audit/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.oracle.oci.sdk</groupId>
     <artifactId>oci-java-sdk</artifactId>
-    <version>1.3.4</version>
+    <version>1.3.5</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -19,7 +19,7 @@
     <dependency>
       <groupId>com.oracle.oci.sdk</groupId>
       <artifactId>oci-java-sdk-common</artifactId>
-      <version>1.3.4</version>
+      <version>1.3.5</version>
     </dependency>
   </dependencies>
 

bmc-audit/src/main/java/com/oracle/bmc/audit/AuditAsyncClient.java

@@ -12,12 +12,12 @@
  * Async client implementation for Audit service. <br/>
  * There are two ways to use async client:
  * 1. Use AsyncHandler: using AsyncHandler, if the response to the call is an {@link java.io.InputStream}, like
- * getObject Api in object storage service, developers need to process the stream in AsyncHandler not anywhere else
+ * getObject Api in object storage service, developers need to process the stream in AsyncHandler, and not anywhere else,
  * because the stream will be closed right after the AsyncHandler is invoked. <br/>
- * 2. Use Java Future: using Java Future, develpers need to close the stream after done with Java Furture.<br/>
+ * 2. Use Java Future: using Java Future, developers need to close the stream after they are done with the Java Future.<br/>
  * Accessing the result should be done in a mutually exclusive manner, either through the Future or the AsyncHandler,
- * but not both.  If the Future will be used, the caller should pass in null as the AsyncHandler.  If the AsyncHandler
- * is used, it is still safe to use the Future to determine whether or not the request as completed via
+ * but not both.  If the Future is used, the caller should pass in null as the AsyncHandler.  If the AsyncHandler
+ * is used, it is still safe to use the Future to determine whether or not the request was completed via
  * Future.isDone/isCancelled.<br/>
  * Please refer to https://github.com/oracle/oci-java-sdk/blob/master/bmc-examples/src/main/java/ResteasyClientWithObjectStorageExample.java
  */

bmc-bom/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.oracle.oci.sdk</groupId>
     <artifactId>oci-java-sdk</artifactId>
-    <version>1.3.4</version>
+    <version>1.3.5</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>oci-java-sdk-bom</artifactId>
@@ -19,91 +19,91 @@
       <dependency>
         <groupId>com.oracle.oci.sdk</groupId>
         <artifactId>oci-java-sdk-common</artifactId>
-        <version>1.3.4</version>
+        <version>1.3.5</version>
         <optional>false</optional>
       </dependency>
       <!-- Service modules, alpha sorted -->
       <dependency>
         <groupId>com.oracle.oci.sdk</groupId>
         <artifactId>oci-java-sdk-audit</artifactId>
-        <version>1.3.4</version>
+        <version>1.3.5</version>
         <optional>false</optional>
       </dependency>
       <dependency>
         <groupId>com.oracle.oci.sdk</groupId>
         <artifactId>oci-java-sdk-containerengine</artifactId>
-        <version>1.3.4</version>
+        <version>1.3.5</version>
         <optional>false</optional>
       </dependency>
       <dependency>
         <groupId>com.oracle.oci.sdk</groupId>
         <artifactId>oci-java-sdk-core</artifactId>
-        <version>1.3.4</version>
+        <version>1.3.5</version>
         <optional>false</optional>
       </dependency>
       <dependency>
         <groupId>com.oracle.oci.sdk</groupId>
         <artifactId>oci-java-sdk-database</artifactId>
-        <version>1.3.4</version>
+        <version>1.3.5</version>
         <optional>false</optional>
       </dependency>
       <dependency>
         <groupId>com.oracle.oci.sdk</groupId>
         <artifactId>oci-java-sdk-dns</artifactId>
-        <version>1.3.4</version>
+        <version>1.3.5</version>
         <optional>false</optional>
       </dependency>
       <dependency>
         <groupId>com.oracle.oci.sdk</groupId>
         <artifactId>oci-java-sdk-email</artifactId>
-        <version>1.3.4</version>
+        <version>1.3.5</version>
         <optional>false</optional>
       </dependency>
       <dependency>
         <groupId>com.oracle.oci.sdk</groupId>
         <artifactId>oci-java-sdk-filestorage</artifactId>
-        <version>1.3.4</version>
+        <version>1.3.5</version>
         <optional>false</optional>
       </dependency>
       <dependency>
         <groupId>com.oracle.oci.sdk</groupId>
         <artifactId>oci-java-sdk-identity</artifactId>
-        <version>1.3.4</version>
+        <version>1.3.5</version>
         <optional>false</optional>
       </dependency>
       <dependency>
         <groupId>com.oracle.oci.sdk</groupId>
         <artifactId>oci-java-sdk-loadbalancer</artifactId>
-        <version>1.3.4</version>
+        <version>1.3.5</version>
         <optional>false</optional>
       </dependency>
       <dependency>
         <groupId>com.oracle.oci.sdk</groupId>
         <artifactId>oci-java-sdk-objectstorage</artifactId>
-        <version>1.3.4</version>
+        <version>1.3.5</version>
         <optional>false</optional>
       </dependency>
       <dependency>
         <groupId>com.oracle.oci.sdk</groupId>
         <artifactId>oci-java-sdk-addons-resteasy-client-configurator</artifactId>
-        <version>1.3.4</version>
+        <version>1.3.5</version>
       </dependency>
       <dependency>
         <groupId>com.oracle.oci.sdk</groupId>
         <artifactId>oci-java-sdk-resourcesearch</artifactId>
         <optional>false</optional>
-        <version>1.3.4</version>
+        <version>1.3.5</version>
       </dependency>
       <dependency>
         <groupId>com.oracle.oci.sdk</groupId>
         <optional>false</optional>
         <artifactId>oci-java-sdk-addons-apache</artifactId>
-        <version>1.3.4</version>
+        <version>1.3.5</version>
       </dependency>
       <dependency>
         <groupId>com.oracle.oci.sdk</groupId>
         <artifactId>oci-java-sdk-keymanagement</artifactId>
-        <version>1.3.4</version>
+        <version>1.3.5</version>
         <optional>false</optional>
       </dependency>
     </dependencies>

bmc-common/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.oracle.oci.sdk</groupId>
     <artifactId>oci-java-sdk</artifactId>
-    <version>1.3.4</version>
+    <version>1.3.5</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -47,11 +47,6 @@
       <artifactId>jsr305</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>com.fasterxml.jackson.jaxrs</groupId>
-      <artifactId>jackson-jaxrs-json-provider</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>com.fasterxml.jackson.datatype</groupId>
       <artifactId>jackson-datatype-jsr310</artifactId>
@@ -65,6 +60,14 @@
       <groupId>org.glassfish.jersey.core</groupId>
       <artifactId>jersey-client</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.glassfish.jersey.inject</groupId>
+      <artifactId>jersey-hk2</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.glassfish.jersey.media</groupId>
+      <artifactId>jersey-media-json-jackson</artifactId>
+    </dependency>
 
     <dependency>
       <groupId>org.bouncycastle</groupId>

bmc-common/src/main/java/com/oracle/bmc/Region.java

@@ -22,6 +22,7 @@
 @RequiredArgsConstructor
 public enum Region {
     // OC1
+    CA_TORONTO_1("ca-toronto-1", Realm.OC1),
     // regionCode for FRA shouldn't be needed, but left for backwards compat
     EU_FRANKFURT_1("eu-frankfurt-1", "fra", Realm.OC1),
     // regionCode for LHR shouldn't be needed, but left for backwards compat

bmc-common/src/main/java/com/oracle/bmc/auth/internal/X509FederationClient.java

@@ -19,7 +19,7 @@
 import com.oracle.bmc.http.signing.internal.Constants;
 import com.oracle.bmc.model.BmcException;
 import com.oracle.bmc.requests.BmcRequest;
-import lombok.AllArgsConstructor;
+
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
@@ -309,10 +309,15 @@ public X509FederationRequest(
         }
     }
 
-    @Getter
-    @AllArgsConstructor
     public static class SecurityToken {
-        @JsonProperty("token")
+        public SecurityToken(@JsonProperty("token") String token) {
+            this.token = token;
+        }
+
         private String token;
+
+        public String getToken() {
+            return token;
+        }
     }
 }