diff --git a/.gitignore b/.gitignore index 57912cd..3a4d1a2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /target/ -*.iml \ No newline at end of file +*.iml +/.idea* \ No newline at end of file diff --git a/pom.xml b/pom.xml index 769cdf0..58fcc7b 100644 --- a/pom.xml +++ b/pom.xml @@ -1,18 +1,18 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.ylp.common ylp-common-parent - 3.0-SNAPSHOT + 1.0-Release pom ylp-common-parent http://maven.apache.org - + - + main @@ -27,7 +27,7 @@ true - + test @@ -37,7 +37,7 @@ 3.0-SNAPSHOT - + qa @@ -48,7 +48,7 @@ - + prod @@ -57,77 +57,48 @@ 1.0-Release - + nexus-releases Nexus Release Repository - http://172.16.8.222:8081/nexus/content/repositories/releases/ + http://nexus.vipzhuang.cn/content/repositories/releases/ nexus-snapshots Nexus Snapshot Repository - http://172.16.8.222:8081/nexus/content/repositories/snapshots/ + http://nexus.vipzhuang.cn/content/repositories/snapshots/ - + + + + nexus + http://nexus.vipzhuang.cn/content/groups/public + + true + + + false + + + + nexus-snapshots + http://nexus.vipzhuang.cn/content/repositories/snapshots/ + + false + + + true + + + + UTF-8 - - - - 3.0-SNAPSHOT - 3.0-SNAPSHOT - 3.0-SNAPSHOT - 3.0-SNAPSHOT - - - 3.0-SNAPSHOT - 3.0-SNAPSHOT - 3.0-SNAPSHOT - 3.0-SNAPSHOT - 3.0-SNAPSHOT - 3.0-SNAPSHOT - 3.0-SNAPSHOT - 3.0-SNAPSHOT - 3.0-SNAPSHOT - 3.0-SNAPSHOT - - - 3.0-SNAPSHOT - 3.0-SNAPSHOT - 3.0-SNAPSHOT - 3.0-SNAPSHOT - 3.0-SNAPSHOT - 3.0-SNAPSHOT - 3.0-SNAPSHOT - 3.0-SNAPSHOT - 3.0-SNAPSHOT - - - 3.0-SNAPSHOT - 3.0-SNAPSHOT - 3.0-SNAPSHOT - - - 3.0-SNAPSHOT - - - - 3.0-SNAPSHOT - - - 3.0-SNAPSHOT - 3.0-SNAPSHOT - - - 3.0-SNAPSHOT - - - 3.2.4.RELEASE @@ -536,11 +507,11 @@ org.slf4j - slf4j-log4j12 + slf4j-log4j12 - +