From 22e1a89b4a981c5ae518af5a7196d4b043c2629f Mon Sep 17 00:00:00 2001
From: kezhenxu94 <kezhenxu94@apache.org>
Date: Wed, 2 Feb 2022 11:18:32 +0800
Subject: [PATCH] Bump up PostgreSQL driver to fix CVE (#8497)

---
 CHANGES.md                                            | 1 +
 dist-material/release-docs/LICENSE                    | 2 +-
 docs/en/setup/backend/backend-storage.md              | 2 +-
 oap-server-bom/pom.xml                                | 2 +-
 tools/dependencies/known-oap-backend-dependencies.txt | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 77b63fe00d..d7c7539bf2 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -50,6 +50,7 @@ Release Notes.
 * Fix IoTDB Storage Option insert null index value.
 * Set the default value of SW_STORAGE_IOTDB_SESSIONPOOL_SIZE to 8.
 * Bump up iotdb-session to 0.12.4.
+* Bump up PostgreSQL driver to fix CVE.
 
 #### UI
 
diff --git a/dist-material/release-docs/LICENSE b/dist-material/release-docs/LICENSE
index bfe5f6ac9a..5a2e775e57 100755
--- a/dist-material/release-docs/LICENSE
+++ b/dist-material/release-docs/LICENSE
@@ -375,7 +375,7 @@ The text of each license is also included at licenses/LICENSE-[project].txt.
     Google: protobuf-java-util 3.19.2: https://github.com/google/protobuf/blob/master/java/pom.xml , BSD-3-Clause
 
     zstd-jni 1.4.3-1: https://github.com/luben/zstd-jni, BSD-3-Clause
-    postgresql 42.2.18: https://jdbc.postgresql.org/about/license.html, BSD-2-Clause
+    postgresql 42.3.2: https://jdbc.postgresql.org/about/license.html, BSD-2-Clause
     LatencyUtils 2.0.3: https://github.com/LatencyUtils/LatencyUtils, BSD-2-Clause
 
 ========================================================================
diff --git a/docs/en/setup/backend/backend-storage.md b/docs/en/setup/backend/backend-storage.md
index 51215f18c3..44ace762b2 100644
--- a/docs/en/setup/backend/backend-storage.md
+++ b/docs/en/setup/backend/backend-storage.md
@@ -257,7 +257,7 @@ storage:
 All connection related settings, including URL link, username, and password are found in `application.yml`. For metadata storage provider settings, refer to the configurations of **H2/MySQL** above.
 
 ## PostgreSQL
-PostgreSQL jdbc driver uses version 42.2.18. It supports PostgreSQL 8.2 or newer.
+PostgreSQL jdbc driver uses version 42.3.2. It supports PostgreSQL 8.2 or newer.
 Activate PostgreSQL as storage, and set storage provider to **postgresql**. 
 
 ```yaml
diff --git a/oap-server-bom/pom.xml b/oap-server-bom/pom.xml
index 4f55aa2fbe..44041f1cf5 100644
--- a/oap-server-bom/pom.xml
+++ b/oap-server-bom/pom.xml
@@ -71,7 +71,7 @@
         <mvel.version>2.4.8.Final</mvel.version>
         <commons-beanutils.version>1.9.4</commons-beanutils.version>
         <flatbuffers-java.version>1.12.0</flatbuffers-java.version>
-        <postgresql.version>42.2.18</postgresql.version>
+        <postgresql.version>42.3.2</postgresql.version>
         <jetcd.version>0.5.3</jetcd.version>
         <testcontainers.version>1.15.3</testcontainers.version>
         <armeria.version>1.13.4</armeria.version>
diff --git a/tools/dependencies/known-oap-backend-dependencies.txt b/tools/dependencies/known-oap-backend-dependencies.txt
index fea02d4526..6045dc0e3f 100755
--- a/tools/dependencies/known-oap-backend-dependencies.txt
+++ b/tools/dependencies/known-oap-backend-dependencies.txt
@@ -138,7 +138,7 @@ netty-transport-native-unix-common-4.1.68.Final-linux-x86_64.jar
 okhttp-3.14.9.jar
 okio-1.17.2.jar
 perfmark-api-0.23.0.jar
-postgresql-42.2.18.jar
+postgresql-42.3.2.jar
 proto-google-common-protos-2.0.1.jar
 protobuf-java-3.19.2.jar
 protobuf-java-util-3.19.2.jar