From 5f987012cd14ba754ca252fae8e25a2db0117833 Mon Sep 17 00:00:00 2001
From: 杜洪波 <1074825718@qq.com>
Date: 星期三, 11 二月 2026 17:29:05 +0800
Subject: [PATCH] Merge branch 'saas' of http://nonxin.cn:8090/r/product/product-server-web/V2.0.0 into saas
---
pom.xml | 44 +++++++++-----------------------------------
1 files changed, 9 insertions(+), 35 deletions(-)
diff --git a/pom.xml b/pom.xml
index c4a3624..f2b61b4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>com.lx</groupId>
<artifactId>product-server</artifactId>
- <version>2.0.0-release</version>
+ <version>2.5.0-release</version>
</parent>
<artifactId>product-server-web</artifactId>
<packaging>jar</packaging>
@@ -41,15 +41,6 @@
</profiles>
<dependencies>
- <dependency>
- <groupId>com.lx</groupId>
- <artifactId>product-server-tool-conduct</artifactId>
- </dependency>
- <!--琛ヤ竵妯″潡-->
- <dependency>
- <groupId>com.lx</groupId>
- <artifactId>product-server-patch</artifactId>
- </dependency>
<!--浜轰簨绠＄悊-->
<dependency>
<groupId>com.lx</groupId>
@@ -133,11 +124,6 @@
<groupId>com.lx</groupId>
<artifactId>product-server-data-export-import</artifactId>
</dependency>
- <!--寮�鍙戝伐鍏�-->
- <dependency>
- <groupId>com.lx</groupId>
- <artifactId>product-server-tool-dev</artifactId>
- </dependency>
<!--娴佺▼寤烘ā-->
<dependency>
<groupId>com.lx</groupId>
@@ -183,32 +169,19 @@
<groupId>com.lx</groupId>
<artifactId>product-server-data-center</artifactId>
</dependency>
- <dependency>
- <groupId>com.lx</groupId>
- <artifactId>product-server-system-backup</artifactId>
- </dependency>
<!--椤圭洰绠＄悊妯″潡-->
<dependency>
<groupId>com.lx</groupId>
- <artifactId>product-project-server-base</artifactId>
- </dependency>
- <dependency>
- <groupId>com.lx</groupId>
- <artifactId>product-project-server-contract</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.lx</groupId>
<artifactId>product-server-customer</artifactId>
- </dependency>
- <dependency>
- <groupId>com.lx</groupId>
- <artifactId>product-project-server-contract</artifactId>
</dependency>
<dependency>
<groupId>com.lx</groupId>
<artifactId>product-server-task</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.lx</groupId>
+ <artifactId>product-server-integration</artifactId>
</dependency>
<dependency>
<groupId>org.spring</groupId>
@@ -359,7 +332,8 @@
<fileset dir="${project.build.directory}/lib">
<include name="*.jar"/>
<exclude name="product-server-core-1.0.0-SNAPSHOT.jar"/>
- <exclude name="product-server-core-2.0.0-SNAPSHOT.jar"/>
+ <exclude name="product-server-core-2.1.3-SNAPSHOT.jar"/>
+ <exclude name="product-server-core-3.0.0-release.jar"/>
</fileset>
</copy>
<copy todir="D:/product/workspace/product-server-install/resources/product-server/resources">
@@ -375,8 +349,8 @@
<!-- <include name="*.*"/>-->
<!-- </fileset>-->
<!-- </copy>-->
- <copy file="${project.build.directory}/product-server-web-2.0.0-release.jar"
- tofile="D:/product/workspace/product-server-install/resources/product-server/product-server-web-2.0.0-release.jar"
+ <copy file="${project.build.directory}/product-server-web-2.5.0-release.jar"
+ tofile="D:/product/workspace/product-server-install/resources/product-server/product-server-web-2.5.0-release.jar"
overwrite="true"/>
</tasks>
--
Gitblit v1.9.2