diff --git a/pom.xml b/pom.xml index 6f10e3a..ac2bed0 100644 --- a/pom.xml +++ b/pom.xml @@ -1,169 +1,129 @@ + 4.0.0 com.flysoloing code-parent pom - 1.0 - code-parent - https://github.com/flysoloing/code-parent - - - - flysoloing - Lai Tao - flysoloing(at)gmail.com - - Owner - - +8 - - - - - FlySoloing - http://flysoloing.github.io/ - - - - - - flysoloing-maven-libs-repo - FlySoloing Maven Libs Repository - http://flysoloing.github.io/repo/libs - - true - - - true - - - - - - - - flysoloing-maven-plugins-repo - FlySoloing Maven Plugins Repository - http://flysoloing.github.io/repo/plugins - - true - - - true - - - - - - 3.0 - + 1.1-SNAPSHOT 4.12 1.2.17 - 1.1.7 - 1.7.21 + 2.12.1 + 1.2.3 + 1.7.28 - 4.1.9.Final - 4.5.3 - - 4.3.20.RELEASE + 4.1.39.Final + 4.5.9 + + 4.3.25.RELEASE + + 5.0.15.RELEASE + + 5.1.9.RELEASE - 3.2.1 + 4.2.0 - 2.9.0 + 3.1.0 - 3.0.19.Final + 3.8.1.Final + 3.0.12.Final + 2.1.1 - 3.4.1 - 1.3.0 + 3.5.2 + 2.0.2 - 1.4.0 + 1.4.1 1.7 2.0 - 2.3.23 + 2.3.29 + 3.0.11.RELEASE - 3.1.0 + 4.0.1 1.2 - 1.1.2 + 1.2.5 - [2.9.8,) - 1.8.9 + [2.9.9,) + 1.9.4 - 5.1.20 - 1.4.192 + + 5.1.48 + 6.0.6 + 8.0.17 + 1.4.199 1.6.1 - 1.4.9 + 1.4.11.1 - 1.0.26 - 1.2.38 + 1.1.20 + 1.2.59 - 2.2.4 - 19.0 - 3.2.0 + 2.8.5 + 28.1-jre + 3.9.1 2.3.3 0.0.9 - 2.1.1 - 3.4 + 2.7.0 + 3.9 3.2 - 2.4.2 - 4.1 - 1.18 + 2.7.0 + 2.5 + 4.4 + 1.19 1.4 2.1 - 2.5 + 2.6 1.2 - 1.10 - 1.9.2 + 1.13 + 1.9.4 2.6 1.6 - [1.3.3,) + 1.4 1.10 3.2.2 - 1.5.1 + 1.6 3.6 - 0.1.29 + 0.1.32 - 3.3.3 + 3.6.1 3.0-alpha-2 - 3.3.3 - 3.4 + 3.6.1 + 3.6.0 3.3.0 - 0.9.10 - 2.9.7 + 0.9.11 + 2.10.3 1.1.3 - 2.2.1 + 2.3.1 2.0.1.Final - 5.2.4.Final - 1.16.20 + 6.0.17.Final + 1.18.8 - 3.0.0 - 3.7.0 - 2.8.2 - 2.5.2 - 3.0.2 - 3.6 + 3.1.0 + 3.8.1 + 3.0.0-M1 + 3.0.0-M1 + 3.1.0 + 3.8.2 - 2.6 - 2.4 - 3.4 + 3.1.2 + 3.1.0 + 3.6.1 9.4.7.v20170914 2.2 2.2 - 2.5 + 2.7 1.0-SNAPSHOT UTF-8 @@ -186,6 +146,11 @@ log4j ${log4j.version} + + org.apache.logging.log4j + log4j-core + ${log4j2.version} + @@ -232,58 +197,58 @@ org.springframework spring-core - ${spring.version} + ${spring5.1.x.version} org.springframework spring-context - ${spring.version} + ${spring5.1.x.version} org.springframework spring-context-support - ${spring.version} + ${spring5.1.x.version} org.springframework spring-beans - ${spring.version} + ${spring5.1.x.version} org.springframework spring-web - ${spring.version} + ${spring5.1.x.version} org.springframework spring-webmvc - ${spring.version} + ${spring5.1.x.version} org.springframework spring-jdbc - ${spring.version} + ${spring5.1.x.version} org.springframework spring-tx - ${spring.version} + ${spring5.1.x.version} org.springframework spring-test - ${spring.version} + ${spring5.1.x.version} test org.springframework spring-aop - ${spring.version} + ${spring5.1.x.version} org.springframework spring-aspects - ${spring.version} + ${spring5.1.x.version} @@ -325,23 +290,23 @@ org.jboss.resteasy - jaxrs-api + resteasy-jaxb-provider ${resteasy.version} org.jboss.resteasy - resteasy-jaxb-provider + resteasy-spring ${resteasy.version} org.jboss.resteasy - resteasy-spring - ${resteasy.version} + jaxrs-api + ${jaxrs-api.version} javax.ws.rs javax.ws.rs-api - 2.0.1 + ${javax.ws.rs-api.version} compile @@ -385,6 +350,11 @@ freemarker ${freemarker.version} + + org.thymeleaf + thymeleaf + ${thymeleaf.version} + @@ -400,9 +370,9 @@ provided - taglibs - standard - ${standard.version} + org.apache.taglibs + taglibs-standard-impl + ${taglibs.version} provided @@ -439,7 +409,7 @@ mysql mysql-connector-java - ${mysql-connector-java.version} + ${mysql-connector-java5.1.x.version} jar compile @@ -523,6 +493,11 @@ commons-pool2 ${new-commons-pool2.version} + + org.apache.commons + commons-configuration2 + ${new-commons-configuration2.version} + org.apache.commons commons-collections4 @@ -605,7 +580,17 @@ com.facebook.jcommon util - ${util.version} + ${facebook.jcommon.version} + + + com.facebook.jcommon + collections + ${facebook.jcommon.version} + + + com.facebook.jcommon + concurrency + ${facebook.jcommon.version} @@ -676,6 +661,7 @@ + @@ -871,6 +857,59 @@ + + code-parent + https://github.com/flysoloing/code-parent + + FlySoloing + http://flysoloing.github.io/ + + + + flysoloing + Lai Tao + flysoloing(at)gmail.com + + Owner + + +8 + + + + + + 3.0 + + + + + + flysoloing-maven-libs-repo + FlySoloing Maven Libs Repository + http://flysoloing.github.io/repo/libs + + true + + + true + + + + + + + flysoloing-maven-plugins-repo + FlySoloing Maven Plugins Repository + http://flysoloing.github.io/repo/plugins + + true + + + true + + + + @@ -887,4 +926,19 @@ - + + + + + + + + + + + + + + + + \ No newline at end of file