From 47a751cb301d05276ae5d75145d57b2d090fe4e1 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期一, 01 七月 2024 10:58:35 +0800
Subject: [PATCH] change
---
pom.xml | 140 ++++++++++++++++------------------------------
1 files changed, 48 insertions(+), 92 deletions(-)
diff --git a/pom.xml b/pom.xml
index c3ba94f..ad316d5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.nanometer</groupId>
- <artifactId>smartlab</artifactId>
+ <artifactId>smartlab_promote</artifactId>
<packaging>war</packaging>
<version>1.0-SNAPSHOT</version>
<name>smartlab Maven Webapp</name>
@@ -13,7 +13,7 @@
<id>central</id>
<name>Maven Repository Switchboard</name>
<layout>default</layout>
- <url>http://repo.springsource.org/libs-milestone</url>
+ <url>https://repo.springsource.org/libs-milestone</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
@@ -21,7 +21,7 @@
<repository>
<id>prime-repo</id>
<name>PrimeFaces Maven Repository</name>
- <url>http://repository.primefaces.org</url>
+ <url>https://repository.primefaces.org</url>
<layout>default</layout>
</repository>
</repositories>
@@ -140,7 +140,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
- <version>1.2</version>
+ <version>1.1.2</version>
</dependency>
<dependency>
@@ -208,14 +208,14 @@
<dependency>
<groupId>org.mybatis</groupId>
<artifactId>mybatis</artifactId>
- <version>3.2.8</version>
+ <version>3.5.2</version>
</dependency>
<!--mybatis spring 插件 -->
<dependency>
<groupId>org.mybatis</groupId>
<artifactId>mybatis-spring</artifactId>
- <version>1.2.2</version>
+ <version>2.1.2</version>
</dependency>
<dependency>
<groupId>cglib</groupId>
@@ -227,6 +227,7 @@
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>5.1.40</version>
+<!-- <version>8.0.20</version>-->
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
@@ -243,7 +244,7 @@
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid</artifactId>
- <version>1.0.12</version>
+ <version>1.2.1</version>
</dependency>
<dependency>
@@ -344,7 +345,7 @@
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
- <version>1.2.75</version>
+ <version>2.0.17</version>
</dependency>
<dependency>
<groupId>com.google.collections</groupId>
@@ -368,113 +369,64 @@
<artifactId>mail</artifactId>
<version>1.4.1</version>
</dependency>
-
+ <dependency >
+ <groupId >com.sun.mail </groupId >
+ <artifactId >javax.mail </artifactId >
+ <version >1.6.0 </version >
+ </dependency >
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
- <version>4.0.1</version>
+ <version>4.1.1</version>
</dependency>
-
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
- <version>3.17</version>
+ <version>4.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ <version>1.20</version>
</dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-compress</artifactId>
- <version>1.9</version>
- </dependency>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <version>1.18.30</version>
+ </dependency>
+
+ <dependency>
+ <groupId>cn.hutool</groupId>
+ <artifactId>hutool-all</artifactId>
+ <version>5.8.9</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.zxing</groupId>
+ <artifactId>core</artifactId>
+ <version>3.3.3</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.zxing</groupId>
+ <artifactId>javase</artifactId>
+ <version>3.3.3</version>
+ </dependency>
</dependencies>
<profiles>
<profile>
<id>test</id>
<properties>
- <profile.active>test</profile.active>
+ <profile.active>levena</profile.active>
</properties>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
</profile>
- <profile>
- <id>sds</id>
- <properties>
- <profile.active>sds</profile.active>
- </properties>
- </profile>
- <profile>
- <id>lhs</id>
- <properties>
- <profile.active>lhs</profile.active>
- </properties>
- </profile>
- <profile>
- <id>sin</id>
- <properties>
- <profile.active>sin</profile.active>
- </properties>
- </profile>
- <profile>
- <id>twt</id>
- <properties>
- <profile.active>twt</profile.active>
- </properties>
- </profile>
- <profile>
- <id>hws</id>
- <properties>
- <profile.active>hws</profile.active>
- </properties>
- </profile>
- <profile>
- <id>gcs</id>
- <properties>
- <profile.active>gcs</profile.active>
- </properties>
- </profile>
- <profile>
- <id>lzhws</id>
- <properties>
- <profile.active>lzhws</profile.active>
- </properties>
- </profile>
- <profile>
- <id>qhyhs</id>
- <properties>
- <profile.active>qhyhs</profile.active>
- </properties>
- </profile>
- <profile>
- <id>szygs</id>
- <properties>
- <profile.active>szygs</profile.active>
- </properties>
- </profile>
- <profile>
- <id>zkysh</id>
- <properties>
- <profile.active>zkysh</profile.active>
- </properties>
- </profile>
- <profile>
- <id>shgjs</id>
- <properties>
- <profile.active>shgjs</profile.active>
- </properties>
- </profile>
- <profile>
- <id>zkyshs</id>
- <properties>
- <profile.active>zkyshs</profile.active>
- </properties>
- </profile>
</profiles>
<build>
- <finalName>smartlab</finalName>
+ <finalName>smartlab_promote</finalName>
<filters>
-
<filter>src/main/webapp/WEB-INF/${profile.active}/${profile.active}.properties</filter>
</filters>
<plugins>
@@ -539,6 +491,10 @@
<include>message.properties</include>
</includes>
</resource>
+ <resource>
+ <directory>src/main/webapp/WEB-INF</directory>
+ <filtering>true</filtering>
+ </resource>
</resources>
</build>
</project>
--
Gitblit v1.9.2