From bd0600f0d405c08864a44e23b1282f15d86e651c Mon Sep 17 00:00:00 2001
From: ZhangJian He <shoothzj@gmail.com>
Date: Thu, 2 Mar 2023 22:36:10 +0800
Subject: [PATCH] [Multi-Database Support] package postgre h2 dependency]

---
 CHANGES.md                   | 1 +
 apollo-adminservice/pom.xml  | 5 -----
 apollo-assembly/pom.xml      | 5 -----
 apollo-biz/pom.xml           | 5 -----
 apollo-common/pom.xml        | 8 ++++++++
 apollo-configservice/pom.xml | 5 -----
 apollo-portal/pom.xml        | 5 -----
 pom.xml                      | 7 +++++++
 8 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 430026af309..f67f0cf8afc 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -11,6 +11,7 @@ Apollo 2.2.0
 * [Bump springboot version from 2.7.8 to 2.7.9](https://github.com/apolloconfig/apollo/pull/4750)
 * [[Multi-Database Support] Without Reliance on globally_quoted_identifiers Variable](https://github.com/apolloconfig/apollo/pull/4749)
 * [[Multi-Database Support] Without Reliance on boolean integer compare](https://github.com/apolloconfig/apollo/pull/4757)
+* [[Multi-Database Support] package postgre h2 dependency](https://github.com/apolloconfig/apollo/pull/4757)
 
 ------------------
 All issues and pull requests are [here](https://github.com/apolloconfig/apollo/milestone/13?closed=1)
\ No newline at end of file
diff --git a/apollo-adminservice/pom.xml b/apollo-adminservice/pom.xml
index 77607d38439..6e9b29b48b4 100644
--- a/apollo-adminservice/pom.xml
+++ b/apollo-adminservice/pom.xml
@@ -80,11 +80,6 @@
 			<artifactId>jersey-apache-client4</artifactId>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>com.h2database</groupId>
-			<artifactId>h2</artifactId>
-			<scope>test</scope>
-		</dependency>
 		<!-- JDK 1.8+ -->
 		<dependency>
 			<groupId>javax.xml.bind</groupId>
diff --git a/apollo-assembly/pom.xml b/apollo-assembly/pom.xml
index ae854779009..120244bf915 100644
--- a/apollo-assembly/pom.xml
+++ b/apollo-assembly/pom.xml
@@ -43,11 +43,6 @@
 			<groupId>com.ctrip.framework.apollo</groupId>
 			<artifactId>apollo-portal</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>com.h2database</groupId>
-			<artifactId>h2</artifactId>
-			<scope>test</scope>
-		</dependency>
 	</dependencies>
 	<build>
 		<plugins>
diff --git a/apollo-biz/pom.xml b/apollo-biz/pom.xml
index ab307298c7a..737e82707d2 100644
--- a/apollo-biz/pom.xml
+++ b/apollo-biz/pom.xml
@@ -49,10 +49,5 @@
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-zookeeper-discovery</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>com.h2database</groupId>
-			<artifactId>h2</artifactId>
-			<scope>test</scope>
-		</dependency>
 	</dependencies>
 </project>
diff --git a/apollo-common/pom.xml b/apollo-common/pom.xml
index 3f5aac97186..6eb8be96913 100644
--- a/apollo-common/pom.xml
+++ b/apollo-common/pom.xml
@@ -58,6 +58,14 @@
             <groupId>com.mysql</groupId>
             <artifactId>mysql-connector-j</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.data</groupId>
             <artifactId>spring-data-commons</artifactId>
diff --git a/apollo-configservice/pom.xml b/apollo-configservice/pom.xml
index 24256f984f8..c86288a52ac 100644
--- a/apollo-configservice/pom.xml
+++ b/apollo-configservice/pom.xml
@@ -90,11 +90,6 @@
 			<artifactId>nacos-api</artifactId>
 			<version>${nacos-discovery-api.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>com.h2database</groupId>
-			<artifactId>h2</artifactId>
-			<scope>test</scope>
-		</dependency>
 		<!-- JDK 1.8+ -->
 		<dependency>
 			<groupId>javax.xml.bind</groupId>
diff --git a/apollo-portal/pom.xml b/apollo-portal/pom.xml
index 84d28d0121b..a22cf408ff8 100644
--- a/apollo-portal/pom.xml
+++ b/apollo-portal/pom.xml
@@ -108,11 +108,6 @@
 		<!-- end of JDK 11+ -->
 
 		<!-- test -->
-		<dependency>
-			<groupId>com.h2database</groupId>
-			<artifactId>h2</artifactId>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
 			<artifactId>jetty-server</artifactId>
diff --git a/pom.xml b/pom.xml
index f96383fd166..13a6b8fd380 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,7 +72,9 @@
 		<javassist.version>3.23.1-GA</javassist.version>
 		<nacos-discovery-api.version>1.4.0</nacos-discovery-api.version>
 		<common-lang3.version>3.12.0</common-lang3.version>
+		<!-- database driver -->
 		<mysql-connector-j.version>8.0.32</mysql-connector-j.version>
+		<postgre.version>42.5.3</postgre.version>
 		<!-- Plugins Version -->
 		<maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
 		<maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
@@ -159,6 +161,11 @@
 				<artifactId>mysql-connector-j</artifactId>
 				<version>${mysql-connector-j.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.postgresql</groupId>
+				<artifactId>postgresql</artifactId>
+				<version>${postgre.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>com.google.inject</groupId>
 				<artifactId>guice</artifactId>