Merge remote-tracking branch 'origin/master' into master

gdg

2021-01-08 aaec4271422fa9798ecc55901ad17f9557282806

Merge remote-tracking branch 'origin/master' into master

 pom.xml

@@ -27,7 +27,7 @@
  </repositories>

  <properties>
    <spring.version>4.3.8.RELEASE</spring.version>
    <spring.version>4.3.29.RELEASE</spring.version>
    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
  </properties>
@@ -322,29 +322,29 @@
    <dependency>
      <groupId>org.apache.shiro</groupId>
      <artifactId>shiro-core</artifactId>
      <version>1.2.3</version>
      <version>1.6.0</version>
    </dependency>
    <dependency>
      <groupId>org.apache.shiro</groupId>
      <artifactId>shiro-web</artifactId>
      <version>1.2.3</version>
      <version>1.6.0</version>
    </dependency>
    <dependency>
      <groupId>org.apache.shiro</groupId>
      <artifactId>shiro-ehcache</artifactId>
      <version>1.2.3</version>
      <version>1.6.0</version>
    </dependency>
    <dependency>
      <groupId>org.apache.shiro</groupId>
      <artifactId>shiro-spring</artifactId>
      <version>1.2.3</version>
      <version>1.6.0</version>
    </dependency>
    <!--- end shiro -->

    <dependency>
      <groupId>com.alibaba</groupId>
      <artifactId>fastjson</artifactId>
      <version>1.2.8</version>
      <version>1.2.75</version>
    </dependency>
    <dependency>
      <groupId>com.google.collections</groupId>
@@ -360,7 +360,7 @@
      <dependency>
          <groupId>com.fasterxml.jackson.core</groupId>
          <artifactId>jackson-databind</artifactId>
          <version>2.9.0.pr3</version>
          <version>2.9.10.7</version>
      </dependency>
    <!-- https://mvnrepository.com/artifact/javax.mail/mail -->
    <dependency>