From a30ed6683e3689e11a3c22dd45359d401b8a3ee7 Mon Sep 17 00:00:00 2001
From: cheng <1821349743@qq.com>
Date: 星期二, 24 十二月 2024 21:56:39 +0800
Subject: [PATCH] pom 版本升级到 2.1.0-release
---
pom.xml | 105 +++++++++++++++++++++++++++++++++++++---------------
1 files changed, 74 insertions(+), 31 deletions(-)
diff --git a/pom.xml b/pom.xml
index b476bf8..02800a5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,11 +9,12 @@
</parent>
<groupId>com.lx</groupId>
<artifactId>product-server</artifactId>
- <version>2.0.0-release</version>
+ <version>2.1.0-release</version>
<packaging>pom</packaging>
<name>product-server</name>
<description>product-server</description>
<modules>
+ <module>product-server-web</module>
<module>product-server-admin</module>
<module>product-server-administration</module>
<module>product-server-auth</module>
@@ -36,13 +37,16 @@
<module>product-server-task</module>
<module>product-server-text-message</module>
<module>product-server-tool-dev</module>
- <module>product-server-tool-face</module>
<module>product-server-tool-flow</module>
<module>product-server-tool-mvc</module>
<module>product-server-tool-table</module>
<module>product-server-util</module>
- <module>product-server-web</module>
<module>product-server-device</module>
+ <module>product-server-tool-face</module>
+ <module>product-server-mobile-core</module>
+ <module>product-server-hr</module>
+ <module>product-server-project-contract</module>
+ <module>product-server-project-base</module>
</modules>
<properties>
<skipTests>true</skipTests>
@@ -65,14 +69,15 @@
<UserAgentUtils.version>1.21</UserAgentUtils.version>
<thumbnailator.version>0.4.8</thumbnailator.version>
<twelvemonkeys.version>3.4.1</twelvemonkeys.version>
- <poi.version>4.1.2</poi.version>
+ <poi.version>5.2.2</poi.version>
<pinyin4j.version>2.5.1</pinyin4j.version>
<mybatis.version>3.4.6</mybatis.version>
<mybatis-spring.version>1.3.2</mybatis-spring.version>
<commons-fileupload.version>1.3.3</commons-fileupload.version>
<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-module-version>2.1.0-release</product-module-version>
+ <product-core-version>2.1.2-release</product-core-version>
</properties>
<repositories>
<repository>
@@ -114,21 +119,37 @@
<dependencyManagement>
<dependencies>
<!--瀛愭ā鍧楋細start-->
+
<dependency>
<groupId>org.spring</groupId>
<artifactId>spring-server-master</artifactId>
<version>1.2.6.6</version>
</dependency>
+
+ <!--core-->
<dependency>
<groupId>com.lx</groupId>
<artifactId>product-server-core</artifactId>
- <version>2.0.1</version>
+ <version>${product-core-version}</version>
</dependency>
+
+ <!--2.1.0-release -->
<dependency>
<groupId>com.lx</groupId>
<artifactId>product-server-device</artifactId>
- <version>${product-module-version}</version>
+ <version>2.1.0-release</version>
</dependency>
+ <dependency>
+ <groupId>com.lx</groupId>
+ <artifactId>product-server-mobile-core</artifactId>
+ <version>2.1.0-release</version>
+ </dependency>
+ <dependency>
+ <groupId>com.lx</groupId>
+ <artifactId>product-server-task</artifactId>
+ <version>2.1.0-release</version>
+ </dependency>
+
<dependency>
<groupId>com.lx</groupId>
<artifactId>product-server-util</artifactId>
@@ -162,11 +183,6 @@
<dependency>
<groupId>com.lx</groupId>
<artifactId>product-server-text-message</artifactId>
- <version>${product-module-version}</version>
- </dependency>
- <dependency>
- <groupId>com.lx</groupId>
- <artifactId>product-server-task</artifactId>
<version>${product-module-version}</version>
</dependency>
<dependency>
@@ -269,9 +285,19 @@
<artifactId>product-server-datasource</artifactId>
<version>${product-module-version}</version>
</dependency>
+ <dependency>
+ <groupId>com.lx</groupId>
+ <artifactId>product-server-hr</artifactId>
+ <version>${product-module-version}</version>
+ </dependency>
<!--瀛愭ā鍧楋細end-->
<!--绗笁鏂逛緷璧栵細start-->
+ <dependency>
+ <groupId>e-iceblue</groupId>
+ <artifactId>spire.doc.free</artifactId>
+ <version>5.2.0</version>
+ </dependency>
<dependency>
<groupId>com.deepoove</groupId>
<artifactId>poi-tl</artifactId>
@@ -666,26 +692,26 @@
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi-ooxml-schemas</artifactId>
- <version>${poi.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-to-slf4j</artifactId>
- </exclusion>
+ <!-- <dependency>-->
+ <!-- <groupId>org.apache.poi</groupId>-->
+ <!-- <artifactId>poi-ooxml-schemas</artifactId>-->
+ <!-- <version>${poi.version}</version>-->
+ <!-- <exclusions>-->
+ <!-- <exclusion>-->
+ <!-- <groupId>org.apache.logging.log4j</groupId>-->
+ <!-- <artifactId>log4j-core</artifactId>-->
+ <!-- </exclusion>-->
+ <!-- <exclusion>-->
+ <!-- <groupId>org.apache.logging.log4j</groupId>-->
+ <!-- <artifactId>log4j-api</artifactId>-->
+ <!-- </exclusion>-->
+ <!-- <exclusion>-->
+ <!-- <groupId>org.apache.logging.log4j</groupId>-->
+ <!-- <artifactId>log4j-to-slf4j</artifactId>-->
+ <!-- </exclusion>-->
- </exclusions>
- </dependency>
+ <!-- </exclusions>-->
+ <!-- </dependency>-->
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-scratchpad</artifactId>
@@ -857,5 +883,22 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>com.squareup.okhttp3</groupId>
+ <artifactId>okhttp</artifactId>
+ <version>3.10.0</version>
+ </dependency>
+ <!--nacos 渚濊禆-->
+ <!-- <dependency>-->
+ <!-- <groupId>com.alibaba.cloud</groupId>-->
+ <!-- <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>-->
+ <!-- <version>2.1.2.RELEASE</version>-->
+ <!-- </dependency>-->
+ <!-- <dependency>-->
+ <!-- <groupId>com.alibaba.cloud</groupId>-->
+ <!-- <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>-->
+ <!-- <version>2.1.2.RELEASE</version>-->
+ <!-- </dependency>-->
</dependencies>
</project>
--
Gitblit v1.9.2