From c94601ba52761297163d1aeea5ecdcb6a0894f55 Mon Sep 17 00:00:00 2001
From: vikasrathee-cs <vikas.rathee@cloudsufi.com>
Date: Tue, 15 Oct 2024 23:22:21 +0530
Subject: [PATCH 1/2] Added fix for date datatype

Added fix for date datatype

(cherry picked from commit ca328a2fea43e0be57ca183546d51010e11e6214)
---
 .../features/sink/OracleRunTime.feature       | 51 +++++++++++++++++++
 .../java/io.cdap.plugin/BQValidation.java     | 48 ++++++++++++++---
 .../java/io.cdap.plugin/OracleClient.java     | 10 ++++
 .../common.stepsdesign/TestSetupHooks.java    | 30 +++++++++++
 .../resources/pluginParameters.properties     |  6 +++
 .../BigQuery/CreateBQTableQueryFileDate.txt   |  1 +
 .../BigQuery/InsertBQDataQueryFileDate.txt    |  1 +
 .../plugin/oracle/OracleSourceDBRecord.java   |  4 +-
 8 files changed, 142 insertions(+), 9 deletions(-)
 create mode 100644 oracle-plugin/src/e2e-test/resources/testdata/BigQuery/CreateBQTableQueryFileDate.txt
 create mode 100644 oracle-plugin/src/e2e-test/resources/testdata/BigQuery/InsertBQDataQueryFileDate.txt

diff --git a/oracle-plugin/src/e2e-test/features/sink/OracleRunTime.feature b/oracle-plugin/src/e2e-test/features/sink/OracleRunTime.feature
index 67293700b..70b1bdba6 100644
--- a/oracle-plugin/src/e2e-test/features/sink/OracleRunTime.feature
+++ b/oracle-plugin/src/e2e-test/features/sink/OracleRunTime.feature
@@ -167,3 +167,54 @@ Feature: Oracle - Verify data transfer from BigQuery source to Oracle sink
     Then Verify the pipeline status is "Succeeded"
     Then Validate records transferred to target table with record counts of BigQuery table
     Then Validate the values of records transferred to target Oracle table is equal to the values from source BigQuery table with case
+
+
+  @BQ_SOURCE_TEST_DATE @ORACLE_DATE_TABLE
+  Scenario: To verify data is getting transferred from BigQuery source to Oracle sink successfully when schema is having date and timestamp fields
+    Given Open Datafusion Project to configure pipeline
+    When Expand Plugin group in the LHS plugins list: "Source"
+    When Select plugin: "BigQuery" from the plugins list as: "Source"
+    When Expand Plugin group in the LHS plugins list: "Sink"
+    When Select plugin: "Oracle" from the plugins list as: "Sink"
+    Then Connect plugins: "BigQuery" and "Oracle" to establish connection
+    Then Navigate to the properties page of plugin: "BigQuery"
+    Then Replace input plugin property: "project" with value: "projectId"
+    Then Enter input plugin property: "datasetProject" with value: "projectId"
+    Then Enter input plugin property: "referenceName" with value: "BQReferenceName"
+    Then Enter input plugin property: "dataset" with value: "dataset"
+    Then Enter input plugin property: "table" with value: "bqSourceTable"
+    Then Click on the Get Schema button
+    Then Verify the Output Schema matches the Expected Schema: "outputDatatypesDateTimeSchema"
+    Then Validate "BigQuery" plugin properties
+    Then Close the Plugin Properties page
+    Then Navigate to the properties page of plugin: "Oracle"
+    Then Select dropdown plugin property: "select-jdbcPluginName" with option value: "driverName"
+    Then Replace input plugin property: "host" with value: "host" for Credentials and Authorization related fields
+    Then Replace input plugin property: "port" with value: "port" for Credentials and Authorization related fields
+    Then Replace input plugin property: "user" with value: "username" for Credentials and Authorization related fields
+    Then Replace input plugin property: "password" with value: "password" for Credentials and Authorization related fields
+    Then Select radio button plugin property: "connectionType" with value: "service"
+    Then Select radio button plugin property: "role" with value: "normal"
+    Then Enter input plugin property: "referenceName" with value: "sourceRef"
+    Then Replace input plugin property: "database" with value: "databaseName"
+    Then Replace input plugin property: "tableName" with value: "targetTable"
+    Then Replace input plugin property: "dbSchemaName" with value: "schema"
+    Then Replace input plugin property: "user" with value: "username" for Credentials and Authorization related fields
+    Then Replace input plugin property: "password" with value: "password" for Credentials and Authorization related fields
+    Then Enter input plugin property: "referenceName" with value: "targetRef"
+    Then Select radio button plugin property: "connectionType" with value: "service"
+    Then Select radio button plugin property: "role" with value: "normal"
+    Then Validate "Oracle" plugin properties
+    Then Close the Plugin Properties page
+    Then Save the pipeline
+    Then Preview and run the pipeline
+    Then Verify the preview of pipeline is "success"
+    Then Click on preview data for Oracle sink
+    Then Close the preview data
+    Then Deploy the pipeline
+    Then Run the Pipeline in Runtime
+    Then Wait till pipeline is in running state
+    Then Open and capture logs
+    Then Verify the pipeline status is "Succeeded"
+    Then Validate records transferred to target table with record counts of BigQuery table
+    Then Validate the values of records transferred to target Oracle table is equal to the values from source BigQuery table
diff --git a/oracle-plugin/src/e2e-test/java/io.cdap.plugin/BQValidation.java b/oracle-plugin/src/e2e-test/java/io.cdap.plugin/BQValidation.java
index b7d93c80a..b5a82e420 100644
--- a/oracle-plugin/src/e2e-test/java/io.cdap.plugin/BQValidation.java
+++ b/oracle-plugin/src/e2e-test/java/io.cdap.plugin/BQValidation.java
@@ -33,7 +33,12 @@
 import java.sql.Types;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Base64;
 import java.util.Date;
 import java.util.List;
@@ -44,6 +49,13 @@
 
 public class BQValidation {
 
+  private static final List<SimpleDateFormat> TIMESTAMP_DATE_FORMATS = Arrays.asList(
+    new SimpleDateFormat("yyyy-MM-dd'T'hh:mm:ss"),
+    new SimpleDateFormat("yyyy-MM-dd"));
+  private static final List<DateTimeFormatter> TIMESTAMP_TZ_DATE_FORMATS = Arrays.asList(
+    DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ssXXX"),
+    DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSSSSXXX"));
+
   /**
    * Extracts entire data from source and target tables.
    *
@@ -173,21 +185,43 @@ public static boolean compareResultSetAndJsonData(ResultSet rsSource, List<JsonO
 
           case Types.TIMESTAMP:
             Timestamp sourceTS = rsSource.getTimestamp(columnName);
-            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'hh:mm:ss");
             String targetT = bigQueryData.get(jsonObjectIdx).get(columnName).getAsString();
-            Date dateParsed = dateFormat.parse(targetT);
+            Date dateParsed = null;
+            for (SimpleDateFormat dateTimeFormatter : TIMESTAMP_DATE_FORMATS) {
+              try {
+                dateParsed = dateTimeFormatter.parse(targetT);
+                break;
+              } catch (ParseException exception) {
+                // do nothing
+              }
+            }
             Timestamp targetTs = new java.sql.Timestamp(dateParsed.getTime());
-            result = String.valueOf(sourceTS).equals(String.valueOf(targetTs));
+            result = sourceTS.equals(targetTs);
             Assert.assertTrue("Different values found for column : %s", result);
             break;
 
           case OracleSourceSchemaReader.TIMESTAMP_TZ:
             Timestamp sourceTZ = rsSource.getTimestamp(columnName);
-            SimpleDateFormat dateValue = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
             String targetTS = bigQueryData.get(jsonObjectIdx).get(columnName).getAsString();
-            Date date = dateValue.parse(targetTS);
-            Timestamp targetTZ = new Timestamp(date.getTime());
-            Assert.assertTrue("Different columns found for Timestamp", sourceTZ.equals(targetTZ));
+            ZonedDateTime targetDate = null;
+            for (DateTimeFormatter dateTimeFormatter : TIMESTAMP_TZ_DATE_FORMATS) {
+              try {
+                targetDate = ZonedDateTime.parse(targetTS, dateTimeFormatter);
+                break;
+              } catch (DateTimeParseException exception) {
+                // do nothing
+              }
+            }
+            Assert.assertTrue("Different columns found for Timestamp",
+                              sourceTZ.toLocalDateTime().equals(targetDate.toLocalDateTime()));
+            break;
+
+          case OracleSourceSchemaReader.TIMESTAMP_LTZ:
+            Timestamp sourceLTZ = rsSource.getTimestamp(columnName);
+            String targetLTZ = bigQueryData.get(jsonObjectIdx).get(columnName).getAsString();
+            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSSSS");
+            Assert.assertTrue("Different columns found for Timestamp",
+                              sourceLTZ.toLocalDateTime().equals(LocalDateTime.parse(targetLTZ, formatter)));
             break;
 
           case OracleSourceSchemaReader.BINARY_FLOAT:
diff --git a/oracle-plugin/src/e2e-test/java/io.cdap.plugin/OracleClient.java b/oracle-plugin/src/e2e-test/java/io.cdap.plugin/OracleClient.java
index b340ef690..815d5309c 100644
--- a/oracle-plugin/src/e2e-test/java/io.cdap.plugin/OracleClient.java
+++ b/oracle-plugin/src/e2e-test/java/io.cdap.plugin/OracleClient.java
@@ -350,4 +350,14 @@ public static void deleteTable(String schema, String table)
       }
     }
   }
+
+  public static void createTargetDateTable(String targetTable, String schema) throws SQLException,
+    ClassNotFoundException {
+    try (Connection connect = getOracleConnection(); Statement statement = connect.createStatement()) {
+      String createTargetTableQuery = "CREATE TABLE " + schema + "." + targetTable +
+        "(ID varchar2(100),DATE_COL DATE,TIMESTAMP_TZ_COL TIMESTAMP WITH TIME ZONE,TIMESTAMP_LTZ_COL " +
+        "TIMESTAMP WITH LOCAL TIME ZONE,INTERVAL_YM_COL INTERVAL YEAR TO MONTH,DATE_TYPE DATE)";
+      statement.executeUpdate(createTargetTableQuery);
+    }
+  }
 }
diff --git a/oracle-plugin/src/e2e-test/java/io.cdap.plugin/common.stepsdesign/TestSetupHooks.java b/oracle-plugin/src/e2e-test/java/io.cdap.plugin/common.stepsdesign/TestSetupHooks.java
index c66a001b7..757b9c9f7 100644
--- a/oracle-plugin/src/e2e-test/java/io.cdap.plugin/common.stepsdesign/TestSetupHooks.java
+++ b/oracle-plugin/src/e2e-test/java/io.cdap.plugin/common.stepsdesign/TestSetupHooks.java
@@ -386,4 +386,34 @@ public static void deleteTempSourceBQTableSmallCase() throws IOException, Interr
     BeforeActions.scenario.write("BQ source Table " + bqSourceTable + " deleted successfully");
     PluginPropertyUtils.removePluginProp("bqSourceTable");
   }
+
+  @Before(order = 1, value = "@BQ_SOURCE_TEST_DATE")
+  public static void createTempSourceBQTableWithDateColumns() throws IOException, InterruptedException {
+    createSourceBQTableWithQueries(PluginPropertyUtils.pluginProp("CreateBQTableQueryFileDate"),
+                                   PluginPropertyUtils.pluginProp("InsertBQDataQueryFileDate"));
+  }
+
+  @After(order = 1, value = "@BQ_SOURCE_TEST_DATE")
+  public static void deleteTempSourceBQTableWithDateColumns() throws IOException, InterruptedException {
+    String bqSourceTable = PluginPropertyUtils.pluginProp("bqSourceTable");
+    BigQueryClient.dropBqQuery(bqSourceTable);
+    BeforeActions.scenario.write("BQ source Table " + bqSourceTable + " deleted successfully");
+    PluginPropertyUtils.removePluginProp("bqSourceTable");
+  }
+
+  @Before(order = 2, value = "@ORACLE_DATE_TABLE")
+  public static void createOracleTargetDateTable() throws SQLException, ClassNotFoundException {
+    OracleClient.createTargetDateTable(PluginPropertyUtils.pluginProp("targetTable"),
+                                       PluginPropertyUtils.pluginProp("schema"));
+    BeforeActions.scenario.write("Oracle Target Table - " + PluginPropertyUtils.pluginProp("targetTable")
+                                   + " created successfully");
+  }
+
+  @After(order = 2, value = "@ORACLE_DATE_TABLE")
+  public static void dropOracleTargetDateTable() throws SQLException, ClassNotFoundException {
+    OracleClient.deleteTable(PluginPropertyUtils.pluginProp("schema"),
+                             PluginPropertyUtils.pluginProp("targetTable"));
+    BeforeActions.scenario.write("Oracle Target Table - " + PluginPropertyUtils.pluginProp("targetTable")
+                                   + " deleted successfully");
+  }
 }
diff --git a/oracle-plugin/src/e2e-test/resources/pluginParameters.properties b/oracle-plugin/src/e2e-test/resources/pluginParameters.properties
index 5362faba6..c71e82b53 100644
--- a/oracle-plugin/src/e2e-test/resources/pluginParameters.properties
+++ b/oracle-plugin/src/e2e-test/resources/pluginParameters.properties
@@ -111,6 +111,9 @@ InsertBQDataQueryFile=testdata/BigQuery/BigQueryInsertDataQuery.txt
 #bq queries file path for Small Case Schema
 CreateBQTableQueryFileSmallCase=testdata/BigQuery/BigQueryCreateTableQuerySmallCase.txt
 InsertBQDataQueryFileSmallCase=testdata/BigQuery/BigQueryInsertDataQuerySmallCase.txt
+#bq queries file path for various Date time type Fields
+CreateBQTableQueryFileDate=testdata/BigQuery/CreateBQTableQueryFileDate.txt
+InsertBQDataQueryFileDate=testdata/BigQuery/InsertBQDataQueryFileDate.txt
 
 #ORACLE Datatypes
 bigQueryColumns=(COL23 FLOAT(4), COL28 TIMESTAMP, COL29 TIMESTAMP(9), COL30 TIMESTAMP WITH TIME ZONE, \
@@ -125,3 +128,6 @@ outputDatatypesSchema1=[{"key":"COL23","value":"double"},{"key":"COL28","value":
   {"key":"COL29","value":"datetime"},{"key":"COL30","value":"timestamp"},{"key":"COL31","value":"string"},\
   {"key":"COL32","value":"string"},{"key":"COL33","value":"datetime"},{"key":"COL34","value":"float"},\
   {"key":"COL35","value":"double"}]
+outputDatatypesDateTimeSchema=[{"key":"ID","value":"string"},{"key":"DATE_COL","value":"datetime"},\
+  {"key":"TIMESTAMP_TZ_COL","value":"timestamp"},{"key":"TIMESTAMP_LTZ_COL","value":"datetime"},\
+  {"key":"INTERVAL_YM_COL","value":"string"},{"key":"DATE_TYPE","value":"date"}]
diff --git a/oracle-plugin/src/e2e-test/resources/testdata/BigQuery/CreateBQTableQueryFileDate.txt b/oracle-plugin/src/e2e-test/resources/testdata/BigQuery/CreateBQTableQueryFileDate.txt
new file mode 100644
index 000000000..4674ab6b8
--- /dev/null
+++ b/oracle-plugin/src/e2e-test/resources/testdata/BigQuery/CreateBQTableQueryFileDate.txt
@@ -0,0 +1 @@
+CREATE TABLE `DATASET.TABLE_NAME` (ID STRING NOT NULL,DATE_COL DATETIME, TIMESTAMP_TZ_COL TIMESTAMP, TIMESTAMP_LTZ_COL DATETIME, INTERVAL_YM_COL STRING,DATE_TYPE DATE);
\ No newline at end of file
diff --git a/oracle-plugin/src/e2e-test/resources/testdata/BigQuery/InsertBQDataQueryFileDate.txt b/oracle-plugin/src/e2e-test/resources/testdata/BigQuery/InsertBQDataQueryFileDate.txt
new file mode 100644
index 000000000..c005d3526
--- /dev/null
+++ b/oracle-plugin/src/e2e-test/resources/testdata/BigQuery/InsertBQDataQueryFileDate.txt
@@ -0,0 +1 @@
+INSERT INTO `DATASET.TABLE_NAME` (id, date_col, timestamp_tz_col, timestamp_ltz_col, interval_ym_col,date_type) VALUES('2', '2024-10-11', '2024-10-11 14:30:00.123456+00:00',  '2024-10-11 14:30:00.123456','2-6','2024-10-11');
\ No newline at end of file
diff --git a/oracle-plugin/src/main/java/io/cdap/plugin/oracle/OracleSourceDBRecord.java b/oracle-plugin/src/main/java/io/cdap/plugin/oracle/OracleSourceDBRecord.java
index 3f7c2a20a..7d7c69d2b 100644
--- a/oracle-plugin/src/main/java/io/cdap/plugin/oracle/OracleSourceDBRecord.java
+++ b/oracle-plugin/src/main/java/io/cdap/plugin/oracle/OracleSourceDBRecord.java
@@ -160,8 +160,8 @@ protected void writeNonNullToDB(PreparedStatement stmt, Schema fieldSchema,
         String timestampString = Timestamp.valueOf(localDateTime).toString();
         Object timestampWithTimeZone = createOracleTimestamp(stmt.getConnection(), timestampString);
         stmt.setObject(sqlIndex, timestampWithTimeZone);
-      } else if (Schema.LogicalType.TIMESTAMP_MICROS.equals(fieldSchema.getLogicalType())) {
-        // Deprecated: Handle the case when the Timestamp is mapped to CDAP Timestamp type
+      } else {
+        // Handle the case when the Timestamp is mapped to CDAP Timestamp type or CDAP Date type.
         super.writeNonNullToDB(stmt, fieldSchema, fieldName, fieldIndex);
       }
     } else {

From d0243cb040d2976ae64d9a8cbedc3a80fd4f640f Mon Sep 17 00:00:00 2001
From: vikasrathee-cs <vikas.rathee@cloudsufi.com>
Date: Wed, 23 Oct 2024 12:17:33 +0530
Subject: [PATCH 2/2] Bump up to 1.11.4

---
 amazon-redshift-plugin/pom.xml     | 2 +-
 aurora-mysql-plugin/pom.xml        | 2 +-
 aurora-postgresql-plugin/pom.xml   | 2 +-
 cloudsql-mysql-plugin/pom.xml      | 2 +-
 cloudsql-postgresql-plugin/pom.xml | 2 +-
 database-commons/pom.xml           | 2 +-
 db2-plugin/pom.xml                 | 2 +-
 generic-database-plugin/pom.xml    | 2 +-
 generic-db-argument-setter/pom.xml | 2 +-
 mariadb-plugin/pom.xml             | 2 +-
 memsql-plugin/pom.xml              | 2 +-
 mssql-plugin/pom.xml               | 2 +-
 mysql-plugin/pom.xml               | 2 +-
 netezza-plugin/pom.xml             | 2 +-
 oracle-plugin/pom.xml              | 2 +-
 pom.xml                            | 2 +-
 postgresql-plugin/pom.xml          | 2 +-
 saphana-plugin/pom.xml             | 2 +-
 teradata-plugin/pom.xml            | 2 +-
 19 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/amazon-redshift-plugin/pom.xml b/amazon-redshift-plugin/pom.xml
index db99429ff..46fbbdf28 100644
--- a/amazon-redshift-plugin/pom.xml
+++ b/amazon-redshift-plugin/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>database-plugins-parent</artifactId>
     <groupId>io.cdap.plugin</groupId>
-    <version>1.11.4-SNAPSHOT</version>
+    <version>1.11.4</version>
   </parent>
 
   <name>Amazon Redshift plugin</name>
diff --git a/aurora-mysql-plugin/pom.xml b/aurora-mysql-plugin/pom.xml
index f37390c37..52bd863c4 100644
--- a/aurora-mysql-plugin/pom.xml
+++ b/aurora-mysql-plugin/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>database-plugins-parent</artifactId>
     <groupId>io.cdap.plugin</groupId>
-    <version>1.11.4-SNAPSHOT</version>
+    <version>1.11.4</version>
   </parent>
 
   <name>Aurora DB MySQL plugin</name>
diff --git a/aurora-postgresql-plugin/pom.xml b/aurora-postgresql-plugin/pom.xml
index a3fe5bed9..0ea3d211a 100644
--- a/aurora-postgresql-plugin/pom.xml
+++ b/aurora-postgresql-plugin/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>database-plugins-parent</artifactId>
     <groupId>io.cdap.plugin</groupId>
-    <version>1.11.4-SNAPSHOT</version>
+    <version>1.11.4</version>
   </parent>
 
   <name>Aurora DB PostgreSQL plugin</name>
diff --git a/cloudsql-mysql-plugin/pom.xml b/cloudsql-mysql-plugin/pom.xml
index cd3b7e1e1..6daba90c1 100644
--- a/cloudsql-mysql-plugin/pom.xml
+++ b/cloudsql-mysql-plugin/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>database-plugins-parent</artifactId>
     <groupId>io.cdap.plugin</groupId>
-    <version>1.11.4-SNAPSHOT</version>
+    <version>1.11.4</version>
   </parent>
 
   <name>CloudSQL MySQL plugin</name>
diff --git a/cloudsql-postgresql-plugin/pom.xml b/cloudsql-postgresql-plugin/pom.xml
index 5d97d547b..185235a04 100644
--- a/cloudsql-postgresql-plugin/pom.xml
+++ b/cloudsql-postgresql-plugin/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>database-plugins-parent</artifactId>
     <groupId>io.cdap.plugin</groupId>
-    <version>1.11.4-SNAPSHOT</version>
+    <version>1.11.4</version>
   </parent>
 
   <name>CloudSQL PostgreSQL plugin</name>
diff --git a/database-commons/pom.xml b/database-commons/pom.xml
index c51034cb5..85de33814 100644
--- a/database-commons/pom.xml
+++ b/database-commons/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>database-plugins-parent</artifactId>
     <groupId>io.cdap.plugin</groupId>
-    <version>1.11.4-SNAPSHOT</version>
+    <version>1.11.4</version>
   </parent>
 
   <name>Database Commons</name>
diff --git a/db2-plugin/pom.xml b/db2-plugin/pom.xml
index 406a2614a..f74a73313 100644
--- a/db2-plugin/pom.xml
+++ b/db2-plugin/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>database-plugins-parent</artifactId>
     <groupId>io.cdap.plugin</groupId>
-    <version>1.11.4-SNAPSHOT</version>
+    <version>1.11.4</version>
   </parent>
 
   <name>IBM DB2 plugin</name>
diff --git a/generic-database-plugin/pom.xml b/generic-database-plugin/pom.xml
index 58d7600f9..f60c6e1b4 100644
--- a/generic-database-plugin/pom.xml
+++ b/generic-database-plugin/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>database-plugins-parent</artifactId>
     <groupId>io.cdap.plugin</groupId>
-    <version>1.11.4-SNAPSHOT</version>
+    <version>1.11.4</version>
   </parent>
 
   <name>Generic database plugin</name>
diff --git a/generic-db-argument-setter/pom.xml b/generic-db-argument-setter/pom.xml
index b2db66d2e..11176aad4 100644
--- a/generic-db-argument-setter/pom.xml
+++ b/generic-db-argument-setter/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>database-plugins-parent</artifactId>
     <groupId>io.cdap.plugin</groupId>
-    <version>1.11.4-SNAPSHOT</version>
+    <version>1.11.4</version>
   </parent>
 
   <name>Generic database argument setter plugin</name>
diff --git a/mariadb-plugin/pom.xml b/mariadb-plugin/pom.xml
index ed6d20f19..3d45a86f2 100644
--- a/mariadb-plugin/pom.xml
+++ b/mariadb-plugin/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>database-plugins-parent</artifactId>
     <groupId>io.cdap.plugin</groupId>
-    <version>1.11.4-SNAPSHOT</version>
+    <version>1.11.4</version>
   </parent>
 
   <name>Maria DB plugin</name>
diff --git a/memsql-plugin/pom.xml b/memsql-plugin/pom.xml
index 757ca5ee2..40f541c1d 100644
--- a/memsql-plugin/pom.xml
+++ b/memsql-plugin/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>database-plugins-parent</artifactId>
     <groupId>io.cdap.plugin</groupId>
-    <version>1.11.4-SNAPSHOT</version>
+    <version>1.11.4</version>
   </parent>
 
   <name>Memsql plugin</name>
diff --git a/mssql-plugin/pom.xml b/mssql-plugin/pom.xml
index 4e8fb3048..bc189004a 100644
--- a/mssql-plugin/pom.xml
+++ b/mssql-plugin/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>database-plugins-parent</artifactId>
     <groupId>io.cdap.plugin</groupId>
-    <version>1.11.4-SNAPSHOT</version>
+    <version>1.11.4</version>
   </parent>
 
   <name>Microsoft SQL Server plugin</name>
diff --git a/mysql-plugin/pom.xml b/mysql-plugin/pom.xml
index 34ec642c6..ee353ab20 100644
--- a/mysql-plugin/pom.xml
+++ b/mysql-plugin/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>database-plugins-parent</artifactId>
     <groupId>io.cdap.plugin</groupId>
-    <version>1.11.4-SNAPSHOT</version>
+    <version>1.11.4</version>
   </parent>
 
   <name>Mysql plugin</name>
diff --git a/netezza-plugin/pom.xml b/netezza-plugin/pom.xml
index a11b1d01d..d44e0615b 100644
--- a/netezza-plugin/pom.xml
+++ b/netezza-plugin/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>database-plugins-parent</artifactId>
     <groupId>io.cdap.plugin</groupId>
-    <version>1.11.4-SNAPSHOT</version>
+    <version>1.11.4</version>
   </parent>
 
   <name>Netezza plugin</name>
diff --git a/oracle-plugin/pom.xml b/oracle-plugin/pom.xml
index 4c3902c3a..ee01680b1 100644
--- a/oracle-plugin/pom.xml
+++ b/oracle-plugin/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>database-plugins-parent</artifactId>
     <groupId>io.cdap.plugin</groupId>
-    <version>1.11.4-SNAPSHOT</version>
+    <version>1.11.4</version>
   </parent>
 
   <name>Oracle plugin</name>
diff --git a/pom.xml b/pom.xml
index ff9f58a58..7fe284df2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
 
   <groupId>io.cdap.plugin</groupId>
   <artifactId>database-plugins-parent</artifactId>
-  <version>1.11.4-SNAPSHOT</version>
+  <version>1.11.4</version>
   <packaging>pom</packaging>
   <name>Database Plugins</name>
   <description>Collection of database plugins</description>
diff --git a/postgresql-plugin/pom.xml b/postgresql-plugin/pom.xml
index 2a9a28cfa..73f16b2f2 100644
--- a/postgresql-plugin/pom.xml
+++ b/postgresql-plugin/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>database-plugins-parent</artifactId>
     <groupId>io.cdap.plugin</groupId>
-    <version>1.11.4-SNAPSHOT</version>
+    <version>1.11.4</version>
   </parent>
 
   <name>PostgreSQL plugin</name>
diff --git a/saphana-plugin/pom.xml b/saphana-plugin/pom.xml
index 6805f04af..0bcca7c45 100644
--- a/saphana-plugin/pom.xml
+++ b/saphana-plugin/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>database-plugins-parent</artifactId>
     <groupId>io.cdap.plugin</groupId>
-    <version>1.11.4-SNAPSHOT</version>
+    <version>1.11.4</version>
   </parent>
 
   <name>SAP HANA plugin</name>
diff --git a/teradata-plugin/pom.xml b/teradata-plugin/pom.xml
index 166564699..b6b7809d6 100644
--- a/teradata-plugin/pom.xml
+++ b/teradata-plugin/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>database-plugins-parent</artifactId>
     <groupId>io.cdap.plugin</groupId>
-    <version>1.11.4-SNAPSHOT</version>
+    <version>1.11.4</version>
   </parent>
 
   <artifactId>teradata-plugin</artifactId>