Merge branch 'patch-dependency' into test

yun-zuoyi
zhang.xw 3 years ago
commit 4442db86c6

@ -76,3 +76,4 @@ redis.resource.db=0
redis.session.db=1 redis.session.db=1
#\u7CFB\u7EDF\u5168\u5C40\u7F13\u5B58\u5E93\uFF0C\u5B58\u653E\u5E73\u53F0\u6838\u5FC3\u6570\u636E\u7F13\u5B58 #\u7CFB\u7EDF\u5168\u5C40\u7F13\u5B58\u5E93\uFF0C\u5B58\u653E\u5E73\u53F0\u6838\u5FC3\u6570\u636E\u7F13\u5B58
redis.core.db=2 redis.core.db=2
wms.redis.open=true

@ -38,9 +38,12 @@
<app.charset>UTF-8</app.charset> <app.charset>UTF-8</app.charset>
<app.jdk.version>1.8</app.jdk.version> <app.jdk.version>1.8</app.jdk.version>
<project.dependency.version>1.0-TEST-SNAPSHOT</project.dependency.version> <project.dependency.version>1.0-TEST-SNAPSHOT</project.dependency.version>
<log4j2.version>2.17.1</log4j2.version>
<qms.icloud.version>1.0.0.1</qms.icloud.version> <qms.icloud.version>1.0.0.1</qms.icloud.version>
<eam.icloud.version>1.0.0.1</eam.icloud.version> <eam.icloud.version>1.0.0.1</eam.icloud.version>
<log4j2.version>2.17.0</log4j2.version> <jackson.databind.version>2.13.2.2</jackson.databind.version>
<jackson.core.version>2.13.2</jackson.core.version>
<jackson.annotation.version>2.13.2</jackson.annotation.version>
</properties> </properties>
<dependencies> <dependencies>
@ -60,6 +63,18 @@
<version>${project.dependency.version}</version> <version>${project.dependency.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>5.0.16.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>5.0.16.RELEASE</version>
</dependency>
<!-- 微朝调用 --> <!-- 微朝调用 -->
<dependency> <dependency>
<groupId>i3plus.core</groupId> <groupId>i3plus.core</groupId>
@ -265,22 +280,22 @@
<dependency> <dependency>
<groupId>org.apache.shiro</groupId> <groupId>org.apache.shiro</groupId>
<artifactId>shiro-core</artifactId> <artifactId>shiro-core</artifactId>
<version>1.4.0</version> <version>1.9.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.shiro</groupId> <groupId>org.apache.shiro</groupId>
<artifactId>shiro-web</artifactId> <artifactId>shiro-web</artifactId>
<version>1.4.0</version> <version>1.9.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.shiro</groupId> <groupId>org.apache.shiro</groupId>
<artifactId>shiro-spring</artifactId> <artifactId>shiro-spring</artifactId>
<version>1.4.0</version> <version>1.9.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.shiro</groupId> <groupId>org.apache.shiro</groupId>
<artifactId>shiro-ehcache</artifactId> <artifactId>shiro-ehcache</artifactId>
<version>1.4.0</version> <version>1.9.1</version>
</dependency> </dependency>
<!-- json --> <!-- json -->
@ -346,7 +361,27 @@
<artifactId>elasticsearch</artifactId> <artifactId>elasticsearch</artifactId>
<version>7.5.1</version> <version>7.5.1</version>
</dependency> </dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.databind.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${jackson.annotation.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${jackson.core.version}</version>
<scope>compile</scope>
</dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>

Loading…
Cancel
Save