From cc8bc978f49c771d10b78e1d81e4f117646617b6 Mon Sep 17 00:00:00 2001
From: Calvin <calvinxiu@gmail.com>
Date: Fri, 7 Sep 2012 16:52:55 +0800
Subject: [PATCH] =?UTF-8?q?Spring=20Data=20JPA=201.1.0->=201.2.0=20RC1=20f?=
 =?UTF-8?q?ix=E6=97=A9=E4=B8=8Apom.xml=E6=94=B9=E5=8A=A8=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98,?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 examples/quickstart/pom.xml | 29 ++++++++++++++++++++---------
 modules/core/pom.xml        |  2 +-
 modules/extension/pom.xml   |  2 +-
 modules/parent/pom.xml      | 14 +++++++++++---
 modules/test/pom.xml        |  2 +-
 pom.xml                     |  2 +-
 6 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/examples/quickstart/pom.xml b/examples/quickstart/pom.xml
index 10bf6085..b7e32c94 100644
--- a/examples/quickstart/pom.xml
+++ b/examples/quickstart/pom.xml
@@ -14,7 +14,7 @@
 		<spring.version>3.1.2.RELEASE</spring.version>
 		<aspectj.version>1.7.0</aspectj.version>
 		<hibernate.version>4.1.6.Final</hibernate.version>
-		<spring-data-jpa.version>1.1.0.RELEASE</spring-data-jpa.version>
+		<spring-data-jpa.version>1.2.0.RC1</spring-data-jpa.version>
 		<commons-dbcp.version>1.4</commons-dbcp.version>
 		<sitemesh.version>2.4.2</sitemesh.version>
 		<shiro.version>1.2.1</shiro.version>
@@ -38,12 +38,6 @@
 		<jdbc.driver.groupId>com.h2database</jdbc.driver.groupId>
 		<jdbc.driver.artifactId>h2</jdbc.driver.artifactId>
 		<jdbc.driver.version>${h2.version}</jdbc.driver.version>
-		<!-- 需要从Oracle网站手工下载 : 
-			 http://www.oracle.com/technetwork/database/features/jdbc/index-091264.html
-			<jdbc.driver.groupId>com.oracle</jdbc.driver.groupId>
-			<jdbc.driver.artifactId>ojdbc6</jdbc.driver.artifactId>
-			<jdbc.driver.version>11.2.0.3</jdbc.driver.version>
-		-->
 		<!--
 			<jdbc.driver.groupId>mysql</jdbc.driver.groupId>
 			<jdbc.driver.artifactId>mysql-connector-java</jdbc.driver.artifactId>
@@ -51,15 +45,32 @@
 		-->	
 	</properties>
 	
-	<!-- 设定仓库 如有Nexus私服, 取消注释并指向正确的服务器地址. 
 	<repositories>
+		<!-- 如有Nexus私服, 取消注释并指向正确的服务器地址.
 		<repository>
 			<id>nexus</id>
 			<name>Team Nexus Repository</name>
 			<url>http://localhost:8081/nexus/content/groups/public</url> 
 		</repository>
+		-->
+		<repository>
+			<id>central</id>
+			<name>Central Repository</name>
+			<url>http://repo.maven.apache.org/maven2</url>	
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+		
+		<repository>
+			<id>repo.springsource.org</id>
+			<name>repo.springsource.org-releases</name>
+			<url>http://repo.springsource.org/libs-milestone-local</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+	    </repository>
 	</repositories>
-	-->
 
 	<!-- 设定插件仓库 如有Nexus私服, 取消注释并指向正确的服务器地址. 
 	<pluginRepositories> 
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index c26ba669..7ed908cd 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -6,7 +6,7 @@
 		<groupId>org.springside</groupId>
 		<artifactId>springside-parent</artifactId>
 		<version>4.0.0.GA-SNAPSHOT</version>
-		<relativePath>../../modules/parent/</relativePath>
+		<relativePath>../parent/</relativePath>
 	</parent>
 	<artifactId>springside-core</artifactId>
 	<packaging>jar</packaging>
diff --git a/modules/extension/pom.xml b/modules/extension/pom.xml
index 6539e823..3ce47b95 100644
--- a/modules/extension/pom.xml
+++ b/modules/extension/pom.xml
@@ -6,7 +6,7 @@
 		<groupId>org.springside</groupId>
 		<artifactId>springside-parent</artifactId>
 		<version>4.0.0.GA-SNAPSHOT</version>
-		<relativePath>../../modules/parent/</relativePath>
+		<relativePath>../parent/</relativePath>
 	</parent>
 	<artifactId>springside-extension</artifactId>
 	<packaging>jar</packaging>
diff --git a/modules/parent/pom.xml b/modules/parent/pom.xml
index 9e41aad0..a48f2723 100644
--- a/modules/parent/pom.xml
+++ b/modules/parent/pom.xml
@@ -5,7 +5,7 @@
 	<groupId>org.springside</groupId>
 	<artifactId>springside-parent</artifactId>
 	<version>4.0.0.GA-SNAPSHOT</version>
-	<name>Springside :: Parent</name>
+	<name>Springside :: Modules :: Parent</name>
 	<packaging>pom</packaging>
 
 	<properties>
@@ -15,7 +15,7 @@
 		<aspectj.version>1.7.0</aspectj.version>
 		<hibernate.version>4.1.6.Final</hibernate.version>
 		<mybatis.version>3.1.1</mybatis.version>
-		<spring-data-jpa.version>1.1.0.RELEASE</spring-data-jpa.version>
+		<spring-data-jpa.version>1.2.0.RC1</spring-data-jpa.version>
 		<commons-dbcp.version>1.4</commons-dbcp.version>
 		<sitemesh.version>2.4.2</sitemesh.version>
 		<shiro.version>1.2.1</shiro.version>
@@ -66,10 +66,18 @@
 			</snapshots>
 		</repository>
 		
+		<repository>
+			<id>repo.springsource.org</id>
+			<name>repo.springsource.org-releases</name>
+			<url>http://repo.springsource.org/libs-milestone-local</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+	    </repository>
+		
 		<repository>
 			<id>spy</id>
 			<name>Spy Repository</name>
-			<layout>default</layout>
 			<url>http://files.couchbase.com/maven2/</url>
 			<snapshots>
 				<enabled>false</enabled>
diff --git a/modules/test/pom.xml b/modules/test/pom.xml
index 0c29ce86..75d147c4 100644
--- a/modules/test/pom.xml
+++ b/modules/test/pom.xml
@@ -6,7 +6,7 @@
 		<groupId>org.springside</groupId>
 		<artifactId>springside-parent</artifactId>
 		<version>4.0.0.GA-SNAPSHOT</version>
-		<relativePath>../../modules/parent/</relativePath>
+		<relativePath>../parent/</relativePath>
 	</parent>
 	<artifactId>springside-test</artifactId>
 	<packaging>jar</packaging>
diff --git a/pom.xml b/pom.xml
index 029a7d2e..e95f0bb5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@
 			<name>Apache License, Version 2.0</name>
 			<url>http://www.apache.org/licenses/LICENSE-2.0</url>
 		</license>
-	</license>
+	</licenses>
 
 	<modules>
 		<module>modules</module>
-- 
GitLab