From 69bce3b6fe435c05e7a0b3367341e5da0d92f978 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 19 七月 2023 15:35:38 +0800
Subject: [PATCH] 合并主线
---
pom.xml | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5628ab3..7d2ac6e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
- <version>2.7.2</version>
+ <version>2.7.9</version>
</parent>
<groupId>com.genersoft</groupId>
<artifactId>wvp-pro</artifactId>
- <version>2.6.8</version>
+ <version>2.6.9</version>
<name>web video platform</name>
<description>鍥芥爣28181瑙嗛骞冲彴</description>
<packaging>${project.packaging}</packaging>
@@ -135,11 +135,30 @@
<version>8.0.30</version>
</dependency>
+ <!--postgresql-->
+ <dependency>
+ <groupId>org.postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <version>42.5.1</version>
+ </dependency>
+
+ <!-- kingbase浜哄ぇ閲戜粨 -->
+ <!-- 鎵嬪姩涓嬭浇椹卞姩鍚庡畨瑁� -->
+ <!-- mvn install:install-file -Dfile=/home/lin/soft/kingbase/jdbc-aarch/kingbase8-8.6.0.jar -DgroupId=com.kingbase -DartifactId=kingbase8 -Dversion=8.6.0 -Dpackaging=jar
+ -->
+ <dependency>
+ <groupId>com.kingbase</groupId>
+ <artifactId>kingbase8</artifactId>
+ <version>8.6.0</version>
+ <scope>system</scope>
+ <systemPath>${basedir}/libs/jdbc-aarch/kingbase8-8.6.0.jar</systemPath>
+ </dependency>
+
<!--Mybatis鍒嗛〉鎻掍欢 -->
<dependency>
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper-spring-boot-starter</artifactId>
- <version>1.4.3</version>
+ <version>1.4.6</version>
</dependency>
<!--鍦ㄧ嚎鏂囨。 -->
@@ -317,7 +336,6 @@
<dateFormat>yyyyMMdd</dateFormat>
</configuration>
</plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
@@ -326,7 +344,6 @@
<skipTests>true</skipTests>
</configuration>
</plugin>
-
</plugins>
<resources>
<resource>
--
Gitblit v1.8.0