From 23319b6d41906686ec3534601fde5e9b74338a72 Mon Sep 17 00:00:00 2001
From: 6c <420680616@qq.com>
Date: 星期五, 18 七月 2025 16:03:16 +0800
Subject: [PATCH] Merge branch 'dev-2.2.0' of http://nonxin.cn:8090/r/product/product-server/V2.0.0 into dev-2.2.0
---
pom.xml | 43 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 36 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 0d5101f..6a5ad94 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
</parent>
<groupId>com.lx</groupId>
<artifactId>product-server</artifactId>
- <version>2.0.0-release</version>
+ <version>2.2.0-release</version>
<packaging>pom</packaging>
<name>product-server</name>
<description>product-server</description>
@@ -44,7 +44,6 @@
<module>product-server-tool-face</module>
<module>product-server-mobile-core</module>
<module>product-server-hr</module>
- <module>product-server-tool-conduct</module>
</modules>
<properties>
<skipTests>true</skipTests>
@@ -75,7 +74,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.version>2.0.0-release</project.build.version>
<product-module-version>2.0.0-release</product-module-version>
- <product-core-version>2.1.2-release</product-core-version>
+ <product-core-version>2.2.0-release</product-core-version>
</properties>
<repositories>
<repository>
@@ -135,7 +134,7 @@
<dependency>
<groupId>com.lx</groupId>
<artifactId>product-server-device</artifactId>
- <version>2.1.0-release</version>
+ <version>2.2.0-release</version>
</dependency>
<dependency>
<groupId>com.lx</groupId>
@@ -150,8 +149,13 @@
<dependency>
<groupId>com.lx</groupId>
- <artifactId>product-server-tool-conduct</artifactId>
+ <artifactId>product-server-system-backup</artifactId>
<version>${product-module-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.lx</groupId>
+ <artifactId>product-project-server-contract</artifactId>
+ <version>2.2.0</version>
</dependency>
<dependency>
<groupId>com.lx</groupId>
@@ -241,7 +245,7 @@
<dependency>
<groupId>com.lx</groupId>
<artifactId>product-server-data-sync</artifactId>
- <version>${product-module-version}</version>
+ <version>2.2.0</version>
</dependency>
<dependency>
<groupId>com.lx</groupId>
@@ -441,6 +445,16 @@
<version>4.12</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.github.mwiede</groupId>
+ <artifactId>jsch</artifactId>
+ <version>0.2.25</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-net</groupId>
+ <artifactId>commons-net</artifactId>
+ <version>3.9.0</version>
+ </dependency>
<!--绗笁鏂逛緷璧栵細end-->
</dependencies>
@@ -465,6 +479,14 @@
</exclusions>
</dependency>
+
+ <!-- Maven 绀轰緥 -->
+ <dependency>
+ <groupId>org.postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <version>42.2.5</version> <!-- 浣跨敤鏈�鏂扮増鏈� -->
+ </dependency>
+
<!--logo4j-->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
@@ -886,7 +908,14 @@
<artifactId>sigar</artifactId>
<version>1.6.4</version>
</dependency>
-
+ <dependency>
+ <groupId>com.github.mwiede</groupId>
+ <artifactId>jsch</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-net</groupId>
+ <artifactId>commons-net</artifactId>
+ </dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
--
Gitblit v1.9.2