From af8dd6eccb0aab770246ae44db1cde4e531416c5 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 01 Feb 2018 15:10:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pom.xml | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 deletions(-)
diff --git a/pom.xml b/pom.xml
index e0ddd4e..7c20374 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,6 +71,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -138,7 +139,34 @@
<dependency>
<groupId>tk.mybatis</groupId>
<artifactId>mapper</artifactId>
- <version>3.3.9</version>
+ <version>3.4.6</version>
+ </dependency>
+ <dependency>
+ <groupId>jstl</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>taglibs</groupId>
+ <artifactId>standard</artifactId>
+ <version>1.1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-jasper</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-net</groupId>
+ <artifactId>commons-net</artifactId>
+ <version>3.6</version>
+ </dependency>
+
+ <dependency>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>1.6.1</version>
</dependency>
</dependencies>
--
Gitblit v1.8.0