From 308359fcfb427f08c745880bf63353eb00dd8219 Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期四, 08 六月 2023 18:13:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
product-server-web/pom.xml | 49 ++++++++++++++++++++++++-------------------------
1 files changed, 24 insertions(+), 25 deletions(-)
diff --git a/product-server-web/pom.xml b/product-server-web/pom.xml
index 60e68ad..94b6a3d 100644
--- a/product-server-web/pom.xml
+++ b/product-server-web/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>com.lx</groupId>
<artifactId>product-server</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0-release</version>
</parent>
<artifactId>product-server-web</artifactId>
<packaging>jar</packaging>
@@ -39,59 +39,48 @@
<dependency>
<groupId>com.lx</groupId>
<artifactId>product-server-common</artifactId>
- <version>2.0.0-release</version>
</dependency>
<dependency>
<groupId>com.lx</groupId>
<artifactId>product-server-print</artifactId>
- <version>2.0.0-release</version>
</dependency>
<dependency>
<groupId>com.lx</groupId>
<artifactId>product-server-util</artifactId>
- <version>2.0.0-release</version>
</dependency>
<dependency>
<groupId>com.lx</groupId>
<artifactId>product-server-admin</artifactId>
- <version>2.0.0-release</version>
</dependency>
<dependency>
<groupId>com.lx</groupId>
<artifactId>product-server-quartz</artifactId>
- <version>2.0.0-release</version>
</dependency>
<dependency>
<groupId>com.lx</groupId>
<artifactId>product-server-org-admin</artifactId>
- <version>2.0.0-release</version>
</dependency>
<dependency>
<groupId>com.lx</groupId>
<artifactId>product-server-administration</artifactId>
- <version>2.0.0-release</version>
</dependency>
<dependency>
<groupId>com.lx</groupId>
<artifactId>product-server-mq</artifactId>
- <version>2.0.0-release</version>
</dependency>
<dependency>
<groupId>com.lx</groupId>
<artifactId>product-server-file</artifactId>
- <version>2.0.0-release</version>
</dependency>
<dependency>
<groupId>com.lx</groupId>
<artifactId>product-server-email</artifactId>
- <version>2.0.0-release</version>
</dependency>
<dependency>
<groupId>com.lx</groupId>
<artifactId>product-server-lucene</artifactId>
- <version>2.0.0-release</version>
</dependency>
<!-- release -->
<dependency>
@@ -112,58 +101,51 @@
<dependency>
<groupId>com.lx</groupId>
<artifactId>product-server-report</artifactId>
- <version>2.0.0-release</version>
</dependency>
<dependency>
<groupId>com.lx</groupId>
<artifactId>product-server-data-export-import</artifactId>
- <version>2.0.0-release</version>
</dependency>
<dependency>
<groupId>com.lx</groupId>
<artifactId>product-server-tool-flow</artifactId>
- <version>2.0.0-release</version>
</dependency>
<dependency>
<groupId>com.lx</groupId>
<artifactId>product-server-tool-mvc</artifactId>
- <version>2.0.0-release</version>
+ </dependency>
+ <dependency>
+ <groupId>com.lx</groupId>
+ <artifactId>product-server-tool-face</artifactId>
</dependency>
<dependency>
<groupId>com.lx</groupId>
<artifactId>product-server-announcement</artifactId>
- <version>2.0.0-release</version>
</dependency>
<dependency>
<groupId>com.lx</groupId>
<artifactId>product-server-tool-table</artifactId>
- <version>2.0.0-release</version>
</dependency>
<dependency>
<groupId>com.lx</groupId>
<artifactId>product-server-badge</artifactId>
- <version>2.0.0-release</version>
</dependency>
<dependency>
<groupId>com.lx</groupId>
<artifactId>product-server-email</artifactId>
- <version>2.0.0-release</version>
</dependency>
<dependency>
<groupId>com.lx</groupId>
<artifactId>product-server-text-message</artifactId>
- <version>2.0.0-release</version>
</dependency>
<dependency>
<groupId>com.lx</groupId>
<artifactId>product-server-auth</artifactId>
- <version>2.0.0-release</version>
</dependency>
<dependency>
<groupId>com.lx</groupId>
<artifactId>product-server-data-center</artifactId>
- <version>2.0.0-release</version>
</dependency>
<dependency>
<groupId>org.spring</groupId>
@@ -173,13 +155,30 @@
<dependency>
<groupId>com.lx</groupId>
<artifactId>product-server-customer</artifactId>
- <version>2.0.0-release</version>
</dependency>
<dependency>
<groupId>com.lx</groupId>
<artifactId>product-server-task</artifactId>
- <version>2.0.0-release</version>
</dependency>
+ <dependency>
+ <groupId>com.lx</groupId>
+ <artifactId>product-server-xining</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.aspose</groupId>
+ <artifactId>cells-line</artifactId>
+ <version>15.9.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.aspose</groupId>
+ <artifactId>slides-line</artifactId>
+ <version>15.9.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.aspose</groupId>
+ <artifactId>words-line</artifactId>
+ <version>15.9.0</version>
+ </dependency>
</dependencies>
<build>
<plugins>
--
Gitblit v1.9.2