From 3c30ba2bbadfcdf0a41c418abaa37f11b97fb63b Mon Sep 17 00:00:00 2001
From: Thomas Darimont <tdarimont@gopivotal.com>
Date: Mon, 24 Feb 2014 10:42:44 +0100
Subject: [PATCH] DATAJPA-469 - Prepare 1.5.0.RELEASE.

Updated change log, readme, notice. Updated links in index.xml to point to SD Commons documentation.

Original pull request: #60.
---
 pom.xml                          | 73 ++++++++++++++++----------------
 readme.md                        |  2 +-
 src/docbkx/index.xml             | 22 +++++-----
 src/main/resources/changelog.txt | 24 +++++++++++
 src/main/resources/notice.txt    |  4 +-
 src/main/resources/readme.txt    |  6 +--
 6 files changed, 78 insertions(+), 53 deletions(-)

diff --git a/pom.xml b/pom.xml
index d55165f3d..2868367fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
 	<modelVersion>4.0.0</modelVersion>
-	
+
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-jpa</artifactId>
 	<version>1.5.0.BUILD-SNAPSHOT</version>
@@ -14,25 +15,25 @@
 	<parent>
 		<groupId>org.springframework.data.build</groupId>
 		<artifactId>spring-data-parent</artifactId>
-		<version>1.3.0.BUILD-SNAPSHOT</version>
+		<version>1.3.0.RELEASE</version>
 		<relativePath>../spring-data-build/parent/pom.xml</relativePath>
 	</parent>
-	
+
 	<properties>
 
 		<dist.key>DATAJPA</dist.key>
-		
+
 		<eclipselink>2.5.1</eclipselink>
 		<hibernate>3.6.10.Final</hibernate>
 		<hsqldb1>1.8.0.10</hsqldb1>
 		<jpa>2.0.0</jpa>
 		<openjpa>2.2.1</openjpa>
-		<springdata.commons>1.7.0.BUILD-SNAPSHOT</springdata.commons>
+		<springdata.commons>1.7.0.RELEASE</springdata.commons>
 
 		<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
-		
+
 	</properties>
-	
+
 	<profiles>
 		<profile>
 			<id>hibernate-41</id>
@@ -55,44 +56,44 @@
 	</profiles>
 
 	<dependencies>
-	
+
 		<dependency>
 			<groupId>${project.groupId}</groupId>
 			<artifactId>spring-data-commons</artifactId>
 			<version>${springdata.commons}</version>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-orm</artifactId>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context</artifactId>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-aop</artifactId>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-tx</artifactId>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-beans</artifactId>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-instrument</artifactId>
 			<scope>provided</scope>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-core</artifactId>
@@ -103,7 +104,7 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.aspectj</groupId>
 			<artifactId>aspectjrt</artifactId>
@@ -115,28 +116,28 @@
 			<version>${aspectj}</version>
 			<scope>test</scope>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-aspects</artifactId>
 			<scope>compile</scope>
 			<optional>true</optional>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
 			<version>2.2.8</version>
 			<scope>test</scope>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>joda-time</groupId>
 			<artifactId>joda-time</artifactId>
 			<version>${jodatime}</version>
 			<optional>true</optional>
 		</dependency>
-		
+
 		<!-- Persistence providers -->
 		<dependency>
 			<groupId>org.hibernate</groupId>
@@ -144,14 +145,14 @@
 			<version>${hibernate}</version>
 			<optional>true</optional>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.eclipse.persistence</groupId>
 			<artifactId>org.eclipse.persistence.jpa</artifactId>
 			<version>${eclipselink}</version>
 			<optional>true</optional>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.apache.openjpa</groupId>
 			<artifactId>openjpa-persistence-jdbc</artifactId>
@@ -170,7 +171,7 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-		
+
 		<!-- QueryDsl -->
 		<dependency>
 			<groupId>com.mysema.querydsl</groupId>
@@ -178,14 +179,14 @@
 			<version>${querydsl}</version>
 			<scope>provided</scope>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>com.mysema.querydsl</groupId>
 			<artifactId>querydsl-jpa</artifactId>
 			<version>${querydsl}</version>
 			<optional>true</optional>
 		</dependency>
-		
+
 		<!-- CDI -->
 		<dependency>
 			<groupId>javax.enterprise</groupId>
@@ -194,30 +195,30 @@
 			<scope>provided</scope>
 			<optional>true</optional>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>javax.el</groupId>
 			<artifactId>el-api</artifactId>
 			<version>${cdi}</version>
 			<scope>test</scope>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.apache.openwebbeans.test</groupId>
 			<artifactId>cditest-owb</artifactId>
 			<version>${webbeans}</version>
 			<scope>test</scope>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>servlet-api</artifactId>
 			<version>2.5</version>
 			<scope>test</scope>
 		</dependency>
-		
+
 	</dependencies>
-	
+
 	<build>
 		<plugins>
 			<plugin>
@@ -324,7 +325,7 @@
 					</execution>
 				</executions>
 			</plugin>
-			
+
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>aspectj-maven-plugin</artifactId>
@@ -363,7 +364,7 @@
 					<target>${source.level}</target>
 				</configuration>
 			</plugin>
-			
+
 			<plugin>
 				<groupId>com.mysema.maven</groupId>
 				<artifactId>apt-maven-plugin</artifactId>
@@ -420,11 +421,11 @@
 			</plugin>
 		</plugins>
 	</build>
-	
+
 	<repositories>
 		<repository>
-			<id>spring-libs-snapshot</id>
-			<url>http://repo.spring.io/libs-snapshot</url>
+			<id>spring-libs-release</id>
+			<url>http://repo.spring.io/libs-release</url>
 		</repository>
 	</repositories>
 
diff --git a/readme.md b/readme.md
index 13b75a851..977a2d88c 100644
--- a/readme.md
+++ b/readme.md
@@ -30,7 +30,7 @@ Download the jar though Maven:
 <dependency>
   <groupId>org.springframework.data</groupId>
   <artifactId>spring-data-jpa</artifactId>
-  <version>1.4.3.RELEASE</version>
+  <version>1.5.0.RELEASE</version>
 </dependency>
 ```
 
diff --git a/src/docbkx/index.xml b/src/docbkx/index.xml
index b2a6fc4de..2657b723f 100644
--- a/src/docbkx/index.xml
+++ b/src/docbkx/index.xml
@@ -74,9 +74,9 @@
   <part id="reference">
     <title>Reference Documentation</title>
 
-    <xi:include href="https://raw.github.com/spring-projects/spring-data-commons/1.7.0.RC1/src/docbkx/repositories.xml"
-                xmlns:xi="http://www.w3.org/2001/XInclude">
-      <xi:fallback href="../../../spring-data-commons/src/docbkx/repositories.xml"/>
+    <xi:include href="https://raw.github.com/SpringSource/spring-data-commons/1.7.0.RELEASE/src/docbkx/repositories.xml" 
+    			xmlns:xi="http://www.w3.org/2001/XInclude">
+    	<xi:fallback href="../../../spring-data-commons/src/docbkx/repositories.xml" />
     </xi:include>
 
     <xi:include href="jpa.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
@@ -84,15 +84,15 @@
 
   <part id="appendix">
     <title>Appendix</title>
-
-    <xi:include href="https://raw.github.com/spring-projects/spring-data-commons/1.7.0.RC1/src/docbkx/repository-namespace-reference.xml"
-                xmlns:xi="http://www.w3.org/2001/XInclude">
-      <xi:fallback href="../../../spring-data-commons/src/docbkx/repository-namespace-reference.xml"/>
+    
+    <xi:include href="https://raw.github.com/SpringSource/spring-data-commons/1.7.0.RELEASE/src/docbkx/repository-namespace-reference.xml" 
+    			xmlns:xi="http://www.w3.org/2001/XInclude">
+    	<xi:fallback href="../../../spring-data-commons/src/docbkx/repository-namespace-reference.xml" />
     </xi:include>
-
-    <xi:include href="https://raw.github.com/spring-projects/spring-data-commons/1.7.0.RC1/src/docbkx/repository-query-keywords-reference.xml"
-                xmlns:xi="http://www.w3.org/2001/XInclude">
-      <xi:fallback href="../../../spring-data-commons/src/docbkx/repository-query-keywords-reference.xml"/>
+    
+    <xi:include href="https://raw.github.com/SpringSource/spring-data-commons/1.7.0.RELEASE/src/docbkx/repository-query-keywords-reference.xml" 
+    			xmlns:xi="http://www.w3.org/2001/XInclude">
+    	<xi:fallback href="../../../spring-data-commons/src/docbkx/repository-query-keywords-reference.xml" />
     </xi:include>
 
     <xi:include href="faq.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
diff --git a/src/main/resources/changelog.txt b/src/main/resources/changelog.txt
index 315f19f27..d258500c4 100644
--- a/src/main/resources/changelog.txt
+++ b/src/main/resources/changelog.txt
@@ -1,6 +1,30 @@
 Spring Data JPA Changelog
 =========================
 
+Changes in version 1.5.0.RELEASE (2014-02-24)
+-----------------------------------------
+
+* Query on byte array fails (DATAJPA-454)
+* Regression in parameter binding (DATAJPA-461)
+* Nullpointer when using @Query (DATAJPA-465)
+* Build fails against Spring 4 (DATAJPA-471)
+* When used "LIKE expression" and "other expression" at the same time, occurred the QuerySyntaxException of Hibernate. (DATAJPA-473)
+* Improve FAQ, C2.1 on the SessionFactory replacement (DATAJPA-462)
+* Documentation on CDI setup is incomplete (DATAJPA-474)
+* Add aop.xml to prevent Eclipse from weaving unnecessary aspects (DATAJPA-458)
+* Reduce log output for Querydsl APT processor (DATAJPA-459)
+* Release 1.5 GA (DATAJPA-469)
+* Documentation overhaul (DATAJPA-470)
+
+Changes in version 1.4.4.RELEASE (2014-02-17)
+---------------------------------------------
+* PersistenceProvider enum should also match org.hibernate.jpa.HibernateEntityManager (DATAJPA-444)
+* Query on byte array fails (DATAJPA-454)
+* Regression in parameter binding (DATAJPA-461)
+* Upgrade Hibernate 4 build to latest versions (DATAJPA-443)
+* Add contribution guidelines (DATAJPA-448)
+* Release 1.4.4 (DATAJPA-463)
+
 Changes in version 1.5.0.RC1 (2014-01-29)
 -----------------------------------------
 * Add Sort implementations that use JPA Metamodel API and/or QueryDsl API (DATAJPA-12)
diff --git a/src/main/resources/notice.txt b/src/main/resources/notice.txt
index f08a8136c..d38a749cf 100644
--- a/src/main/resources/notice.txt
+++ b/src/main/resources/notice.txt
@@ -1,5 +1,5 @@
-Spring Data JPA 1.5.0 RC1
-Copyright (c) [2011-2014] Pivotal Inc.
+Spring Data JPA 1.5.0 RELEASE
+Copyright (c) [2011-2014] Pivotal Software, Inc.
 
 This product is licensed to you under the Apache License, Version 2.0 (the "License").  
 You may not use this product except in compliance with the License.  
diff --git a/src/main/resources/readme.txt b/src/main/resources/readme.txt
index 7a60ce195..786da8b87 100644
--- a/src/main/resources/readme.txt
+++ b/src/main/resources/readme.txt
@@ -1,5 +1,5 @@
-SPRING DATA JPA 1.5.0 RC1 (Jan 29th, 2014)
-------------------------------------------
+Spring Data JPA 1.5.0 RELEASE (Feb 24th, 2014)
+----------------------------------------------
 
 Spring Data Jpa is released under the terms of the Apache Software License Version 2.0 (see license.txt).
 
@@ -14,4 +14,4 @@ The reference manual and javadoc are located in the 'docs' directory.
 ADDITIONAL RESOURCES:
 
 Spring Data Homepage: http://projects.spring.io/spring-data
-Spring Data Forum:    http://forum.spring.io/forum/jpa-orm
\ No newline at end of file
+Spring Data Forum:    http://forum.spring.io/forum/jpa-orm