diff --git a/.classpath b/.classpath
deleted file mode 100644
index 464509f..0000000
--- a/.classpath
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
diff --git a/.project b/.project
deleted file mode 100644
index 6e7fa0a..0000000
--- a/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
- ylp-common-parent
-
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
- org.eclipse.m2e.core.maven2Builder
-
-
-
-
-
- org.eclipse.jdt.core.javanature
- org.eclipse.m2e.core.maven2Nature
-
-
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99f26c0..0000000
--- a/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/=UTF-8
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 7b4ef03..0000000
--- a/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=
-org.eclipse.jdt.core.compiler.compliance=
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=
diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f..0000000
--- a/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/pom.xml b/pom.xml
index 9cd0636..74a94f4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
com.ylp.common
ylp-common-parent
- 1.0-Release
+ 2.0.0-Release
pom
ylp-common-parent
@@ -44,7 +44,7 @@
qa
- 1.0-Release
+ 2.0.0-Release
@@ -54,7 +54,7 @@
prod
- 1.0-Release
+ 2.0.0-Release
@@ -98,10 +98,6 @@
UTF-8
-
-
- 3.2.4.RELEASE
-
@@ -114,406 +110,406 @@
-
-
-
-
- xalan
- xalan
- 2.7.1
-
-
- antlr
- antlr
- 2.7.6
-
-
- aopalliance
- aopalliance
- 1.0
-
-
- org.aspectj
- aspectjweaver
- 1.7.3
-
-
- cglib
- cglib
- 2.2.2
-
-
- asm
- asm
- 3.3.1
-
-
- net.sf.json-lib
- json-lib
- 2.3
- jdk15
- compile
-
-
- org.codehaus.jackson
- jackson-core-asl
- 1.9.13
-
-
- org.codehaus.jackson
- jackson-mapper-asl
- 1.9.13
-
-
- ognl
- ognl
- 3.0.6
-
-
- oro
- oro
- 2.0.8
-
-
- commons-net
- commons-net
- 3.2
-
-
- commons-beanutils
- commons-beanutils
- 1.8.0
-
-
- commons-codec
- commons-codec
- 1.8
-
-
- commons-collections
- commons-collections
- 3.2
-
-
- commons-digester
- commons-digester
- 2.0
-
-
- commons-fileupload
- commons-fileupload
- 1.3.1
-
-
- commons-io
- commons-io
- 2.4
-
-
- commons-lang
- commons-lang
- 2.5
-
-
- org.apache.commons
- commons-lang3
- 3.1
-
-
- commons-logging
- commons-logging
- 1.1.3
-
-
- commons-validator
- commons-validator
- 1.1.4
-
-
- commons-cli
- commons-cli
- 1.2
-
-
- dom4j
- dom4j
- 1.6.1
-
-
- net.sf.ezmorph
- ezmorph
- 1.0.6
-
-
- javassist
- javassist
- 3.12.1.GA
-
-
- jstl
- jstl
- 1.2
-
-
- javax.transaction
- jta
- 1.1
-
-
- log4j
- log4j
- 1.2.17
-
-
- org.slf4j
- slf4j-api
- 1.7.5
-
-
- org.slf4j
- slf4j-log4j12
- 1.7.5
-
-
- net.sourceforge.jexcelapi
- jxl
- 2.6.12
-
-
-
- org.jdom
- jdom
- 1.1.3
-
-
- jaxen
- jaxen
- 1.1.1
-
-
- com.alibaba
- dubbo
- 2.5.3
-
-
- redis.clients
- jedis
- 2.8.1
-
-
-
-
-
-
- org.apache.zookeeper
- zookeeper
- 3.4.5
-
-
- com.101tec
- zkclient
- 0.3
-
-
-
-
-
-
- org.springframework
- spring-aop
- ${org.springframework.version}
-
-
- org.springframework
- spring-aspects
- ${org.springframework.version}
-
-
- org.springframework
- spring-beans
- ${org.springframework.version}
-
-
- org.springframework
- spring-context
- ${org.springframework.version}
-
-
- org.springframework
- spring-context-support
- ${org.springframework.version}
-
-
- org.springframework
- spring-core
- ${org.springframework.version}
-
-
- org.springframework
- spring-expression
- ${org.springframework.version}
-
-
- org.springframework
- spring-instrument
- ${org.springframework.version}
-
-
- org.springframework
- spring-instrument-tomcat
- ${org.springframework.version}
-
-
- org.springframework
- spring-jdbc
- ${org.springframework.version}
-
-
- org.springframework
- spring-jms
- ${org.springframework.version}
-
-
- org.springframework
- spring-orm
- ${org.springframework.version}
-
-
- org.springframework
- spring-oxm
- ${org.springframework.version}
-
-
- org.springframework
- spring-struts
- ${org.springframework.version}
-
-
- org.springframework
- spring-test
- ${org.springframework.version}
- test
-
-
- org.springframework
- spring-tx
- ${org.springframework.version}
-
-
- org.springframework
- spring-web
- ${org.springframework.version}
-
-
- org.springframework
- spring-webmvc
- ${org.springframework.version}
-
-
- org.springframework
- spring-webmvc-portlet
- ${org.springframework.version}
-
-
-
-
-
- org.mybatis
- mybatis
- 3.2.8
-
-
- org.mybatis
- mybatis-spring
- 1.2.2
-
-
-
-
-
- mysql
- mysql-connector-java
- 5.1.32
-
-
-
-
-
- com.google.code
- kaptcha
- 2.3.2
-
-
- org.apache.tomcat
- servlet-api
- 6.0.37
-
-
- org.apache.tomcat
- jsp-api
- 6.0.37
-
-
- org.freemarker
- freemarker
- 2.3.19
-
-
- com.alibaba
- druid
- 1.0.12
-
-
- com.alibaba
- fastjson
- 1.1.41
-
-
- org.apache.httpcomponents
- httpclient
- 4.5.2
-
-
- org.jboss.netty
- netty
- 3.2.5.Final
-
-
- org.apache.activemq
- activemq-all
- 5.8.0
-
-
- org.apache.activemq
- activemq-pool
- 5.8.0
-
-
-
-
-
- org.jsoup
- jsoup
- 1.7.3
-
-
-
-
- net.sf.dozer
- dozer
- ${dozer.version}
-
-
- org.slf4j
- slf4j-log4j12
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+