Merge branch 'owls75767' of https://github.com/oracle/weblogic-kubernetes-operator into owls75767

Author: vanajamukkara

integration-tests/src/test/java/oracle/kubernetes/operator/ItSitConfig.java

@@ -12,7 +12,6 @@
 import java.nio.file.Paths;
 import java.util.Map;
 import java.util.logging.Level;
-
 import oracle.kubernetes.operator.utils.Domain;
 import oracle.kubernetes.operator.utils.ExecResult;
 import oracle.kubernetes.operator.utils.Operator;
@@ -34,6 +33,9 @@ public class ItSitConfig extends BaseTest {
   private static String ADMINPODNAME;
   private static String fqdn;
   private static String JDBC_URL;
+  private static final String JDBC_DRIVER_NEW = "com.mysql.cj.jdbc.Driver";
+  private static final String JDBC_DRIVER_OLD = "com.mysql.jdbc.Driver";
+  private static final String PS3_TAG = "12.2.1.3";
   private static String KUBE_EXEC_CMD;
   private static Domain domain;
   private static Operator operator1;
@@ -171,6 +173,9 @@ private static void copySitConfigFiles() throws IOException {
       Charset charset = StandardCharsets.UTF_8;
       String content = new String(Files.readAllBytes(path), charset);
       content = content.replaceAll("JDBC_URL", JDBC_URL);
+      if (getWeblogicImageTag().contains(PS3_TAG)) {
+        content = content.replaceAll(JDBC_DRIVER_NEW, JDBC_DRIVER_OLD);
+      }
       path = Paths.get(dstDir, file);
       logger.log(Level.INFO, "to {0}", path.toString());
       Files.write(path, content.getBytes(charset));

integration-tests/src/test/resources/sitconfig/configoverrides/jdbc-JdbcTestDataSource-0.xml

@@ -13,7 +13,7 @@
     </jdbc:jdbc-connection-pool-params>
     <jdbc:jdbc-driver-params>
         <jdbc:url jdbcf:combine-mode="replace">JDBC_URL</jdbc:url>
-        <jdbc:driver-name>com.mysql.jdbc.jdbc2.optional.MysqlXADataSource</jdbc:driver-name>
+        <jdbc:driver-name>com.mysql.cj.jdbc.Driver</jdbc:driver-name>
         <jdbc:properties>
             <jdbc:property>
                 <jdbc:name>user</jdbc:name>

integration-tests/src/test/resources/sitconfig/scripts/create-domain-auto-custom-sit-config20.py

@@ -83,7 +83,7 @@ def createDataSource(dsName, dsJNDI, dsUrl, dsUser, dsPassword, dsTarget):
     cd('/JDBCSystemResource/' + dsName + '/JdbcResource/' + dsName)
     create('testDriverParams', 'JDBCDriverParams')
     cd('JDBCDriverParams/NO_NAME_0')
-    set('DriverName', 'com.mysql.jdbc.jdbc2.optional.MysqlXADataSource')
+    set('DriverName', 'com.mysql.cj.jdbc.Driver')
     set('URL', dsUrl)
     set('PasswordEncrypted', dsPassword)