From d1b8778c1a750cfb970d2f9210d0dcfa440fcce5 Mon Sep 17 00:00:00 2001
From: Oliver Gierke <info@olivergierke.de>
Date: Mon, 31 Mar 2014 09:52:00 +0200
Subject: [PATCH] #58 - Prepare 1.4.0.M1.

Updated BOM to include new modules and fixed them to the appropriate version numbers. Minor polishes on the parent pom.xml.
---
 bom/pom.xml    | 37 +++++++++++++++++++++++++++++++------
 parent/pom.xml | 20 ++++++++++----------
 2 files changed, 41 insertions(+), 16 deletions(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index 3b10dc60..7db113da 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -19,35 +19,60 @@
 
 	<dependencyManagement>
 		<dependencies>
+			<dependency>
+				<groupId>org.springframework.data</groupId>
+				<artifactId>spring-data-cassandra</artifactId>
+				<version>1.0.0.M1</version>
+			</dependency>
 			<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-data-commons</artifactId>
-				<version>1.8.0.BUILD-SNAPSHOT</version>
+				<version>1.8.0.M1</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework.data</groupId>
+				<artifactId>spring-data-couchbase</artifactId>
+				<version>1.1.0.M1</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework.data</groupId>
+				<artifactId>spring-data-elasticsearch</artifactId>
+				<version>1.0.0.M2</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework.data</groupId>
+				<artifactId>spring-data-gemfire</artifactId>
+				<version>1.4.0.M1</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-data-jpa</artifactId>
-				<version>1.6.0.BUILD-SNAPSHOT</version>
+				<version>1.6.0.M1</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-data-mongodb</artifactId>
-				<version>1.5.0.BUILD-SNAPSHOT</version>
+				<version>1.5.0.M1</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-data-neo4j</artifactId>
-				<version>3.1.0.BUILD-SNAPSHOT</version>
+				<version>3.1.0.M1</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework.data</groupId>
+				<artifactId>spring-data-redis</artifactId>
+				<version>1.3.0.M1</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-data-rest</artifactId>
-				<version>2.1.0.BUILD-SNAPSHOT</version>
+				<version>2.1.0.M1</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-data-solr</artifactId>
-				<version>1.2.0.BUILD-SNAPSHOT</version>
+				<version>1.2.0.M1</version>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>
diff --git a/parent/pom.xml b/parent/pom.xml
index 16e9cd4c..64f616ac 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1,13 +1,13 @@
 <?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">
 
-	<!-- 
+	<!--
 	
 	Global parent pom.xml for Spring Data modules to inherit from.
 	
 	- Shared resources are pulled in from the spring-data-build-resources dependency (images, CSS, XSLTs for documentation generation)
 	- Renders reference documentation from Docbook file named index.xml within src/docbkx
-	- In the "distribute" profile, two assemblies are generated: 
+	- In the "distribute" profile, two assemblies are generated:
 	  - one to be published on the download portal (incl. binaries, sources, javadoc (jarred and browsable), reference documentation in pdf, html and html single page)
 	  - one to be uploaded to static.springsource.org (incl. javadoc (browsable), reference docs as described before)
 	
@@ -33,12 +33,12 @@
 
 	<name>Spring Data Build - General parent module</name>
 	<description>Global parent pom.xml to be used by Spring Data modules</description>
-	<url>http://www.springsource.org/spring-data</url>
-	<inceptionYear>2011-2013</inceptionYear>
+	<url>http://www.spring.io/spring-data</url>
+	<inceptionYear>2011-2014</inceptionYear>
 	
 	<organization>
-		<name>Pivotal</name>
-		<url>http://www.springsource.org</url>
+		<name>Pivotal Software, Inc.</name>
+		<url>http://www.spring.io</url>
 	</organization>
 	
 	<developers>
@@ -46,7 +46,7 @@
 			<id>ogierke</id>
 			<name>Oliver Gierke</name>
 			<email>ogierke at gopivotal.com</email>
-			<organization>Pivotal</organization>
+			<organization>Pivotal Software, Inc.</organization>
 			<organizationUrl>http://www.gopivotal.com</organizationUrl>
 			<roles>
 				<role>Project lead</role>
@@ -61,7 +61,7 @@
 			<url>http://www.apache.org/licenses/LICENSE-2.0</url>
 			<comments>
 			Copyright 2008-2013 the original author or authors.
-			 
+			
 			Licensed under the Apache License, Version 2.0 (the "License");
 			you may not use this file except in compliance with the License.
 			You may obtain a copy of the License at
@@ -107,7 +107,7 @@
 		<aspectj>1.7.4</aspectj>
 		<cdi>1.0</cdi>
 		<hamcrest>1.3</hamcrest>
-		<jackson>2.3.1</jackson>
+		<jackson>2.3.2</jackson>
 		<jodatime>2.3</jodatime>
 		<junit>4.11</junit>
 		<logback>1.1.1</logback>
@@ -166,7 +166,7 @@
 				<dependency>
 					<groupId>org.springframework.data.build</groupId>
 					<artifactId>spring-data-build-resources</artifactId>
-					<version>1.3.0.RELEASE</version>
+					<version>1.4.0.M1</version>
 					<scope>provided</scope>
 					<type>zip</type>
 				</dependency>