Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ojdbc-provider-oci/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<dependency>
<groupId>com.oracle.oci.sdk</groupId>
<artifactId>oci-java-sdk-bom</artifactId>
<version>3.48.0</version>
<version>3.83.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,9 @@ private Properties getRemoteProperties(String location) {

DatabaseToolsKeyStorePassword keyStorePassword =
keyStore.getKeyStorePassword();
String keyStorePasswordValue = keyStorePassword == null
? null
: String.valueOf(getSecret(keyStorePassword).toCharArray());

switch (keyStore.getKeyStoreType()) {
case JavaKeyStore:
Expand Down Expand Up @@ -206,6 +209,14 @@ private Properties getRemoteProperties(String location) {
OracleConnection.CONNECTION_PROPERTY_WALLET_LOCATION,
"data:;base64," + base64KeyStoreContent);
break;
case Pem:
walletProps.put(
OracleConnection.CONNECTION_PROPERTY_WALLET_LOCATION,
"data:;base64," + base64KeyStoreContent);
if (keyStorePasswordValue != null) {
walletProps.put("oracle.net.wallet_password", keyStorePasswordValue);
}
break;
case UnknownEnumValue:
default:
throw new IllegalStateException(
Expand Down Expand Up @@ -323,4 +334,3 @@ private Properties refreshProperties(String location)
}
}
}

Loading