From a154ffc9b8cde74e29022e89a699a4954dd8b1f5 Mon Sep 17 00:00:00 2001
From: Calvin <calvinxiu@gmail.com>
Date: Wed, 19 Sep 2012 09:47:19 +0800
Subject: [PATCH] commons-codec 1.6->1.7, slf4j 1.7.0->1.7.1

---
 examples/quickstart/pom.xml | 10 +++++-----
 modules/parent/pom.xml      |  9 ++++-----
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/examples/quickstart/pom.xml b/examples/quickstart/pom.xml
index 43060cbd..1d25ba0a 100644
--- a/examples/quickstart/pom.xml
+++ b/examples/quickstart/pom.xml
@@ -12,7 +12,6 @@
 		<!-- 主要依赖库的版本定义 -->
 		<springside.version>4.0.0.GA-SNAPSHOT</springside.version>
 		<spring.version>3.1.2.RELEASE</spring.version>
-		<aspectj.version>1.7.0</aspectj.version>
 		<hibernate.version>4.1.7.Final</hibernate.version>
 		<spring-data-jpa.version>1.2.0.RC1</spring-data-jpa.version>
 		<commons-dbcp.version>1.4</commons-dbcp.version>
@@ -20,7 +19,7 @@
 		<shiro.version>1.2.1</shiro.version>
 		<hibernate-validator.version>4.3.0.Final</hibernate-validator.version>
 		<jackson.version>2.0.6</jackson.version>
-		<slf4j.version>1.7.0</slf4j.version>
+		<slf4j.version>1.7.1</slf4j.version>
 		<log4j.version>1.2.17</log4j.version>
 		<commons-lang3.version>3.1</commons-lang3.version>
 		<guava.version>13.0.1</guava.version>
@@ -99,12 +98,12 @@
 		<dependency>
 			<groupId>org.aspectj</groupId>
 			<artifactId>aspectjrt</artifactId>
-			<version>${aspectj.version}</version>
+			<version>1.7.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.aspectj</groupId>
 			<artifactId>aspectjweaver</artifactId>
-			<version>${aspectj.version}</version>
+			<version>1.7.0</version>
 		</dependency>		
 		<dependency>
 			<groupId>cglib</groupId>
@@ -210,7 +209,7 @@
 		<dependency>
 			<groupId>commons-codec</groupId>
 			<artifactId>commons-codec</artifactId>
-			<version>1.6</version>
+			<version>1.7</version>
 		</dependency>
 		<!-- SECURITY end -->
 		
@@ -370,6 +369,7 @@
 			</exclusions>
 		</dependency>
 
+		<!-- h2 -->
 		<dependency>
 			<groupId>com.h2database</groupId>
 			<artifactId>h2</artifactId>
diff --git a/modules/parent/pom.xml b/modules/parent/pom.xml
index def0317b..52570c35 100644
--- a/modules/parent/pom.xml
+++ b/modules/parent/pom.xml
@@ -12,7 +12,6 @@
 		<!-- 主要依赖库的版本定义 -->
 		<springside.version>4.0.0.GA-SNAPSHOT</springside.version>
 		<spring.version>3.1.2.RELEASE</spring.version>
-		<aspectj.version>1.7.0</aspectj.version>
 		<hibernate.version>4.1.7.Final</hibernate.version>
 		<mybatis.version>3.1.1</mybatis.version>
 		<spring-data-jpa.version>1.2.0.RC1</spring-data-jpa.version>
@@ -27,7 +26,7 @@
 		<hibernate-validator.version>4.3.0.Final</hibernate-validator.version>
 		<jolokia.version>1.0.5</jolokia.version>
 		<jackson.version>2.0.6</jackson.version>
-		<slf4j.version>1.7.0</slf4j.version>
+		<slf4j.version>1.7.1</slf4j.version>
 		<log4j.version>1.2.17</log4j.version>
 		<commons-lang3.version>3.1</commons-lang3.version>
 		<commons-io.version>2.4</commons-io.version>
@@ -158,12 +157,12 @@
 			<dependency>
 				<groupId>org.aspectj</groupId>
 				<artifactId>aspectjrt</artifactId>
-				<version>${aspectj.version}</version>
+				<version>1.7.0</version>
 			</dependency>
 			<dependency>
 				<groupId>org.aspectj</groupId>
 				<artifactId>aspectjweaver</artifactId>
-				<version>${aspectj.version}</version>
+				<version>1.7.0</version>
 			</dependency>
 			<dependency>
 				<groupId>cglib</groupId>
@@ -521,7 +520,7 @@
 			<dependency>
 				<groupId>commons-codec</groupId>
 				<artifactId>commons-codec</artifactId>
-				<version>1.6</version>
+				<version>1.7</version>
 			</dependency>
 			<dependency>
 				<groupId>commons-beanutils</groupId>
-- 
GitLab