Merge branch 'master' of https://github.com/zhangdaiscott/MiniDao.git

lebin · Jan 3, 2014 · 9b974ec · 9b974ec
2 parents 71c5493 + fd6ca44
commit 9b974ec
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/minidao-framework/pom.xml b/minidao-framework/pom.xml
@@ -16,6 +16,7 @@
 		<commons-collections.version>3.2.1</commons-collections.version>
 		<commons-lang.version>2.6</commons-lang.version>
 		<commons-logging.version>1.0.4</commons-logging.version>
+		<commons-beanutils.version>1.7.0</commons-beanutils.version>
 		<dom4j.version>1.6.1</dom4j.version>
 		<druid.version>0.2.9</druid.version>
 		<freemarker.version>2.3.19</freemarker.version>
@@ -194,6 +195,17 @@
 			<artifactId>commons-collections</artifactId>
 			<version>${commons-collections.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>commons-beanutils</groupId>
+			<artifactId>commons-beanutils</artifactId>
+			<version>${commons-beanutils.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-logging</groupId>
+					<artifactId>commons-logging</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
 		<dependency>
 			<groupId>org.junit</groupId>
 			<artifactId>com.springsource.org.junit</artifactId>