Merge branch 'main' of github.com:oracle-samples/ojdbc-extensions into credential-factory-test

Author: Michael-A-McMahon

ojdbc-provider-oci/example-adb.properties

@@ -47,11 +47,11 @@
 # Configures the OCI Database Connection String Provider. The OCID of the database
 # is configured as an environment variable or JVM system property named
 # "DATABASE_OCID":
-oracle.jdbc.provider.database=ojdbc-provider-oci-database-connection-string
-oracle.jdbc.provider.database.ocid=${DATABASE_OCID}
+oracle.jdbc.provider.connectionString=ojdbc-provider-oci-database-connection-string
+oracle.jdbc.provider.connectionString.ocid=${DATABASE_OCID}
 
 # Configures the OCI Database TLS Provider. Again, the OCID of the database
 # is configured as an environment variable or JVM system property named
 # "DATABASE_OCID":
-oracle.jdbc.provider.sslContext=ojdbc-provider-oci-database-tls
-oracle.jdbc.provider.sslContext.ocid=${DATABASE_OCID}
+oracle.jdbc.provider.tlsConfiguration=ojdbc-provider-oci-database-tls
+oracle.jdbc.provider.tlsConfiguration.ocid=${DATABASE_OCID}

ojdbc-provider-oci/example-vault.properties

@@ -43,14 +43,14 @@
 # connection property. For details, see:
 # https://docs.oracle.com/en/database/oracle/oracle-database/23/jajdb/oracle/jdbc/OracleConnection.html#CONNECTION_PROPERTY_CONFIG_FILE
 
-# Configures the OCI Vault Password Provider. The OCID of the password secret
-# is configured as an environment variable or JVM system property named
-# "PASSWORD_OCID":
-oracle.jdbc.provider.user=ojdbc-provider-oci-vault-user
-oracle.jdbc.provider.user.ocid=${PASSWORD_OCID}
-
 # Configures the OCI Vault Username Provider. The OCID of the username secret
 # is configured as an environment variable or JVM system property named
 # "USERNAME_OCID":
-oracle.jdbc.provider.password=ojdbc-provider-oci-vault-user
-oracle.jdbc.provider.password.ocid=${USERNAME_OCID}
+oracle.jdbc.provider.username=ojdbc-provider-oci-vault-username
+oracle.jdbc.provider.username.ocid=${USERNAME_OCID}
+
+# Configures the OCI Vault Password Provider. The OCID of the password secret
+# is configured as an environment variable or JVM system property named
+# "PASSWORD_OCID":
+oracle.jdbc.provider.password=ojdbc-provider-oci-vault-password
+oracle.jdbc.provider.password.ocid=${PASSWORD_OCID}

pom.xml

@@ -9,7 +9,7 @@
 
   <name>Extensions for the Oracle JDBC Driver</name>
   <description>Oracle JDBC Extensions include providers for multiple resources</description>
-  <url>https://github.com/oracle-samples/ojdbc-extensions</url>
+  <url>https://github.com/oracle/ojdbc-extensions</url>
   <licenses>
     <license>
       <name>The Universal Permissive License (UPL), Version 1.0</name>
@@ -23,9 +23,9 @@
     </developer>
   </developers>
   <scm>
-    <url>https://github.com/oracle-samples/ojdbc-extensions</url>
-    <connection>scm:git:https://github.com/oracle-samples/ojdbc-extensions</connection>
-    <developerConnection>scm:git:https://github.com/oracle-samples/ojdbc-extensions</developerConnection>
+    <url>https://github.com/oracle/ojdbc-extensions</url>
+    <connection>scm:git:https://github.com/oracle/ojdbc-extensions</connection>
+    <developerConnection>scm:git:https://github.com/oracle/ojdbc-extensions</developerConnection>
     <tag>HEAD</tag>
   </scm>
 
@@ -42,7 +42,7 @@
   <profiles>
     <!--
       This profile configures the "release" option for javac, which was added
-      in JDK 9. See https://github.com/oracle-samples/ojdbc-extensions/pull/46
+      in JDK 9. See https://github.com/oracle/ojdbc-extensions/pull/46
     -->
     <profile>
       <id>javac-release</id>