change

kongzy

2024-07-01 47a751cb301d05276ae5d75145d57b2d090fe4e1

 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,13 +21,13 @@
    <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>

  <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>
@@ -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>
@@ -322,29 +323,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>2.0.17</version>
    </dependency>
    <dependency>
      <groupId>com.google.collections</groupId>
@@ -360,7 +361,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>
@@ -368,78 +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>

  </profiles>
  <build>
    <finalName>smartlab</finalName>
    <finalName>smartlab_promote</finalName>
    <filters>

      <filter>src/main/webapp/WEB-INF/${profile.active}/${profile.active}.properties</filter>
    </filters>
    <plugins>
@@ -450,6 +437,14 @@
          <target>1.8</target>
          <encoding>UTF-8</encoding>
          <skip>true</skip>
          <excludes>
            <exclude>
              resources/template/*
            </exclude>
            <exclude>
              resources/*.docx
            </exclude>
          </excludes>
        </configuration>
      </plugin>
      <plugin>
@@ -468,6 +463,14 @@
          <webResources>
            <resource>
              <directory>src/main/webapp</directory>
              <excludes>
                <exclude>
                  resources/template/*
                </exclude>
                <exclude>
                  resources/*.docx
                </exclude>
              </excludes>
              <filtering>true</filtering>
              <targetPath>./</targetPath>
            </resource>
@@ -488,6 +491,10 @@
          <include>message.properties</include>
        </includes>
      </resource>
      <resource>
        <directory>src/main/webapp/WEB-INF</directory>
        <filtering>true</filtering>
      </resource>
    </resources>
  </build>
</project>