diff --git a/dsBase/pom.xml b/dsBase/pom.xml index 1c0acb97..f996dd27 100644 --- a/dsBase/pom.xml +++ b/dsBase/pom.xml @@ -10,14 +10,6 @@ dsBase dsBase - - - - 21 - 21 - UTF-8 - - diff --git a/dsRes/pom.xml b/dsRes/pom.xml index 2b7933c8..1a5753be 100644 --- a/dsRes/pom.xml +++ b/dsRes/pom.xml @@ -3,22 +3,16 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - dsRes - 1.0 com.dsideal dsProject 1.0 - - - UTF-8 - 21 - 21 - + dsRes + 1.0 - + com.jfinal jfinal @@ -35,30 +29,38 @@ ${jfinal-cos.version} + cn.smallbun.screw screw-core 1.0.5 - org.postgresql postgresql ${postgresql.version} + + com.zaxxer + HikariCP + ${HikariCP.version} + - + io.minio minio ${minio.version} - + + io.github.yedaxia japidocs - 1.4.4 + ${japidocs.version} + + javax.xml.bind jaxb-api @@ -69,145 +71,131 @@ activation 1.1.1 - org.glassfish.jaxb jaxb-runtime 2.3.3 + + com.sun.xml.bind + jaxb-impl + 2.3.0 + + + com.sun.xml.bind + jaxb-core + 2.3.0 + + + org.slf4j slf4j-simple - 1.7.36 + ${slf4j.version} - + + ch.qos.logback + logback-classic + 1.5.6 + + + org.apache.logging.log4j + log4j-core + ${log4j2.version} + + + org.apache.logging.log4j + log4j-api + ${log4j2.version} + + + com.fasterxml.jackson.core jackson-core - 2.17.2 + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + 2.18.0 - net.sf.json-lib json-lib 2.4 jdk15 - - - ch.qos.logback - logback-classic - 1.5.6 + com.alibaba + fastjson + ${fastjson.version} + + + com.google.code.gson + gson + ${gson.version} - - + cn.hutool hutool-all ${hutool.version} - - - com.alibaba - fastjson - ${fastjson.version} - - - org.jsoup jsoup - 1.17.2 - - - - - com.google.code.gson - gson - 2.10.1 + ${jsoup.version} commons-io commons-io - 2.14.0 + ${commons-io.version} org.apache.commons commons-email - 1.5 + ${commons-email.version} org.apache.commons commons-lang3 - 3.12.0 + ${commons-lang3.version} org.dom4j dom4j - 2.1.4 + ${dom4j.version} - + + redis.clients jedis ${jedis.version} + org.apache.httpcomponents httpmime 4.5.14 - - org.apache.logging.log4j - log4j-core - 2.20.0 - - - - org.projectlombok - lombok - 1.18.34 - provided - - - - org.apache.logging.log4j - log4j-api - 2.20.0 - - - com.fasterxml.jackson.core - jackson-databind - 2.17.2 - - - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - 2.18.0 - - - - + com.github.mwiede jsch 0.2.19 - - - - com.zaxxer - HikariCP - ${HikariCP.version} - - - + org.apache.poi poi @@ -218,36 +206,31 @@ poi-ooxml ${poi.version} - + + org.yaml snakeyaml ${snakeyaml.version} - - + io.jsonwebtoken jjwt - 0.7.0 + ${jjwt.version} + - com.sun.xml.bind - jaxb-impl - 2.3.0 - - - com.sun.xml.bind - jaxb-core - 2.3.0 + org.projectlombok + lombok + ${lombok.version} + provided - dsRes - src/main/resources @@ -260,10 +243,10 @@ maven-compiler-plugin ${maven-compiler-plugin.version} + 21 21 UTF-8 - -parameters diff --git a/pom.xml b/pom.xml index 827ce0ad..c172a4e4 100644 --- a/pom.xml +++ b/pom.xml @@ -103,7 +103,20 @@ 1.18.38 - + + 2.3.1 + 2.3.3 + 1.1.1 + + 4.5.14 + + 0.2.19 + + 2.4 + + 2.18.0 + + 1.0.5 3.10.1 3.7.1