Skip to content

Commit c8758b1

Browse files
dshelbyodshelbyo
authored
Merge pull request #81 from oracle/release_2018-10-04
Releasing version 1.2.48
2 parents dab162b + 28e2771 commit c8758b1

File tree

241 files changed

+14406
-472
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

241 files changed

+14406
-472
lines changed

‎CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,13 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
1313
### Added
1414
- N/A
1515

16+
## 1.2.48 - 2018-10-04
17+
### Added
18+
- Support for trusted partner images through application listings and subscriptions in the Compute service
19+
- Support for object lifecycle policies in the Object Storage service
20+
- Support for copying objects across regions in the Object Storage service
21+
- Support for network address translation (NAT) gateways in the Networking service
22+
1623
## 1.2.47 - 2018-09-27
1724
### Added
1825
- Support for `paravirtualized` launch mode when importing images in the Compute service

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.oracle.oci.sdk</groupId>
77
<artifactId>oci-java-sdk-addons</artifactId>
8-
<version>1.2.47</version>
8+
<version>1.2.48</version>
99
<relativePath>../pom.xml</relativePath>
1010
</parent>
1111

@@ -37,7 +37,7 @@
3737
<dependency>
3838
<groupId>com.oracle.oci.sdk</groupId>
3939
<artifactId>oci-java-sdk-common</artifactId>
40-
<version>1.2.47</version>
40+
<version>1.2.48</version>
4141
</dependency>
4242
</dependencies>
4343
</project>

‎bmc-addons/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.oracle.oci.sdk</groupId>
77
<artifactId>oci-java-sdk</artifactId>
8-
<version>1.2.47</version>
8+
<version>1.2.48</version>
99
<relativePath>../pom.xml</relativePath>
1010
</parent>
1111

‎bmc-audit/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.oracle.oci.sdk</groupId>
77
<artifactId>oci-java-sdk</artifactId>
8-
<version>1.2.47</version>
8+
<version>1.2.48</version>
99
<relativePath>../pom.xml</relativePath>
1010
</parent>
1111

@@ -18,7 +18,7 @@
1818
<dependency>
1919
<groupId>com.oracle.oci.sdk</groupId>
2020
<artifactId>oci-java-sdk-common</artifactId>
21-
<version>1.2.47</version>
21+
<version>1.2.48</version>
2222
</dependency>
2323
</dependencies>
2424

‎bmc-bom/pom.xml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.oracle.oci.sdk</groupId>
77
<artifactId>oci-java-sdk</artifactId>
8-
<version>1.2.47</version>
8+
<version>1.2.48</version>
99
<relativePath>../pom.xml</relativePath>
1010
</parent>
1111
<artifactId>oci-java-sdk-bom</artifactId>
@@ -19,86 +19,86 @@
1919
<dependency>
2020
<groupId>com.oracle.oci.sdk</groupId>
2121
<artifactId>oci-java-sdk-common</artifactId>
22-
<version>1.2.47</version>
22+
<version>1.2.48</version>
2323
<optional>false</optional>
2424
</dependency>
2525
<!-- Service modules, alpha sorted -->
2626
<dependency>
2727
<groupId>com.oracle.oci.sdk</groupId>
2828
<artifactId>oci-java-sdk-audit</artifactId>
29-
<version>1.2.47</version>
29+
<version>1.2.48</version>
3030
<optional>false</optional>
3131
</dependency>
3232
<dependency>
3333
<groupId>com.oracle.oci.sdk</groupId>
3434
<artifactId>oci-java-sdk-containerengine</artifactId>
35-
<version>1.2.47</version>
35+
<version>1.2.48</version>
3636
<optional>false</optional>
3737
</dependency>
3838
<dependency>
3939
<groupId>com.oracle.oci.sdk</groupId>
4040
<artifactId>oci-java-sdk-core</artifactId>
41-
<version>1.2.47</version>
41+
<version>1.2.48</version>
4242
<optional>false</optional>
4343
</dependency>
4444
<dependency>
4545
<groupId>com.oracle.oci.sdk</groupId>
4646
<artifactId>oci-java-sdk-database</artifactId>
47-
<version>1.2.47</version>
47+
<version>1.2.48</version>
4848
<optional>false</optional>
4949
</dependency>
5050
<dependency>
5151
<groupId>com.oracle.oci.sdk</groupId>
5252
<artifactId>oci-java-sdk-dns</artifactId>
53-
<version>1.2.47</version>
53+
<version>1.2.48</version>
5454
<optional>false</optional>
5555
</dependency>
5656
<dependency>
5757
<groupId>com.oracle.oci.sdk</groupId>
5858
<artifactId>oci-java-sdk-email</artifactId>
59-
<version>1.2.47</version>
59+
<version>1.2.48</version>
6060
<optional>false</optional>
6161
</dependency>
6262
<dependency>
6363
<groupId>com.oracle.oci.sdk</groupId>
6464
<artifactId>oci-java-sdk-filestorage</artifactId>
65-
<version>1.2.47</version>
65+
<version>1.2.48</version>
6666
<optional>false</optional>
6767
</dependency>
6868
<dependency>
6969
<groupId>com.oracle.oci.sdk</groupId>
7070
<artifactId>oci-java-sdk-identity</artifactId>
71-
<version>1.2.47</version>
71+
<version>1.2.48</version>
7272
<optional>false</optional>
7373
</dependency>
7474
<dependency>
7575
<groupId>com.oracle.oci.sdk</groupId>
7676
<artifactId>oci-java-sdk-loadbalancer</artifactId>
77-
<version>1.2.47</version>
77+
<version>1.2.48</version>
7878
<optional>false</optional>
7979
</dependency>
8080
<dependency>
8181
<groupId>com.oracle.oci.sdk</groupId>
8282
<artifactId>oci-java-sdk-objectstorage</artifactId>
83-
<version>1.2.47</version>
83+
<version>1.2.48</version>
8484
<optional>false</optional>
8585
</dependency>
8686
<dependency>
8787
<groupId>com.oracle.oci.sdk</groupId>
8888
<artifactId>oci-java-sdk-resourcesearch</artifactId>
8989
<optional>false</optional>
90-
<version>1.2.47</version>
90+
<version>1.2.48</version>
9191
</dependency>
9292
<dependency>
9393
<groupId>com.oracle.oci.sdk</groupId>
9494
<optional>false</optional>
9595
<artifactId>oci-java-sdk-addons-apache</artifactId>
96-
<version>1.2.47</version>
96+
<version>1.2.48</version>
9797
</dependency>
9898
<dependency>
9999
<groupId>com.oracle.oci.sdk</groupId>
100100
<artifactId>oci-java-sdk-keymanagement</artifactId>
101-
<version>1.2.47</version>
101+
<version>1.2.48</version>
102102
<optional>false</optional>
103103
</dependency>
104104
</dependencies>

‎bmc-common/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.oracle.oci.sdk</groupId>
77
<artifactId>oci-java-sdk</artifactId>
8-
<version>1.2.47</version>
8+
<version>1.2.48</version>
99
<relativePath>../pom.xml</relativePath>
1010
</parent>
1111

‎bmc-common/src/main/java/com/oracle/bmc/ConfigFileReader.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,7 @@ public static ConfigFile parse(
163163
}
164164
}
165165
if (!accumulator.foundDefaultProfile) {
166-
throw new IllegalStateException(
167-
"No DEFAULT profile was specified in the configuration");
166+
LOG.info("No DEFAULT profile was specified in the configuration");
168167
}
169168
if (profile != null && !accumulator.configurationsByProfile.containsKey(profile)) {
170169
throw new IllegalArgumentException(
@@ -198,7 +197,9 @@ public String get(String key) {
198197
&& (accumulator.configurationsByProfile.get(profile).containsKey(key))) {
199198
return accumulator.configurationsByProfile.get(profile).get(key);
200199
}
201-
return accumulator.configurationsByProfile.get(DEFAULT_PROFILE_NAME).get(key);
200+
return accumulator.foundDefaultProfile
201+
? accumulator.configurationsByProfile.get(DEFAULT_PROFILE_NAME).get(key)
202+
: null;
202203
}
203204
}
204205

‎bmc-common/src/main/java/com/oracle/bmc/http/signing/internal/BouncyCastleHelper.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ private BouncyCastleHelper() {
1818
isProviderInstalled =
1919
Security.getProvider("BC") != null || Security.getProvider("BCFIPS") != null;
2020
try {
21-
bouncyCastleProvider = (Provider) getBouncyCastleProviderClass().newInstance();
21+
final Class bouncyCastleProviderClass = getBouncyCastleProviderClass();
22+
bouncyCastleProvider = (Provider) bouncyCastleProviderClass.newInstance();
23+
LOG.info("Instantiated provider: " + bouncyCastleProviderClass.getName());
2224
} catch (InstantiationException | IllegalAccessException ex) {
2325
LOG.error("Failed to instantiate provider", ex);
2426
throw Throwables.propagate(ex);

‎bmc-common/src/test/java/com/oracle/bmc/ConfigFileReaderTest.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,13 @@ public void noConfigFile() throws IOException {
2626
ConfigFileReader.parse("src/test/resources/does_not_exist");
2727
}
2828

29-
@Test(expected = IllegalStateException.class)
29+
@Test
3030
public void noDefaultProfile() throws IOException {
31-
ConfigFileReader.parse("src/test/resources/unit_test_no_default_config");
31+
final ConfigFile configFile =
32+
ConfigFileReader.parse("src/test/resources/unit_test_no_default_config", "USER");
33+
assertEquals("default_user", configFile.get("user"));
34+
assertEquals("default_tenancy", configFile.get("tenancy"));
35+
assertNull(configFile.get("region"));
3236
}
3337

3438
@Test(expected = IllegalStateException.class)

‎bmc-containerengine/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.oracle.oci.sdk</groupId>
77
<artifactId>oci-java-sdk</artifactId>
8-
<version>1.2.47</version>
8+
<version>1.2.48</version>
99
<relativePath>../pom.xml</relativePath>
1010
</parent>
1111

@@ -18,7 +18,7 @@
1818
<dependency>
1919
<groupId>com.oracle.oci.sdk</groupId>
2020
<artifactId>oci-java-sdk-common</artifactId>
21-
<version>1.2.47</version>
21+
<version>1.2.48</version>
2222
</dependency>
2323
</dependencies>
2424

0 commit comments

Comments
 (0)