From 407768ac7f942b6d8a19fba35e9230aaced9637b Mon Sep 17 00:00:00 2001
From: Oliver Gierke <ogierke@gopivotal.com>
Date: Tue, 20 May 2014 16:26:44 +0200
Subject: [PATCH] DATAES-90 - Prepare 1.0 GA.

Tweaked README.md. Replaced Docbook index.xml as it apparently used a different encoding scheme.
---
 README.md                     |  26 +++-----
 pom.xml                       |   8 +--
 src/docbkx/index.xml          | 118 +++++++++++++++++-----------------
 src/main/resources/notice.txt |   2 +-
 4 files changed, 74 insertions(+), 80 deletions(-)

diff --git a/README.md b/README.md
index a6cf96d2b..9a1d887d2 100644
--- a/README.md
+++ b/README.md
@@ -10,18 +10,18 @@ The Spring Data Elasticsearch project provides integration with the [elasticsear
 Guide
 ------------
 
-* [Reference Documentation](http://docs.spring.io/spring-data/elasticsearch/docs/1.0.0.M2/reference/html/)
-* [PDF Documentation](http://docs.spring.io/spring-data/elasticsearch/docs/1.0.0.M2/reference/pdf/spring-data-elasticsearch-reference.pdf)
-* [API Documentation](http://docs.spring.io/spring-data/elasticsearch/docs/1.0.0.M2/api/)
+* [Reference Documentation](http://docs.spring.io/spring-data/elasticsearch/docs/current/reference/html/)
+* [PDF Documentation](http://docs.spring.io/spring-data/elasticsearch/docs/current/reference/pdf/spring-data-elasticsearch-reference.pdf)
+* [API Documentation](http://docs.spring.io/spring-data/elasticsearch/docs/current/api/)
 * [Spring Data Project](http://project.spring.io/spring-data)
 * [Sample Test Application](https://github.com/BioMedCentralLtd/spring-data-elasticsearch-sample-application)
-* [Spring Data Elasticsearch Google Group] (https://groups.google.com/d/forum/spring-data-elasticsearch-devs)
+* [Spring Data Elasticsearch Google Group](https://groups.google.com/d/forum/spring-data-elasticsearch-devs)
 * For more detailed questions, use the [forum](http://forum.springsource.org/forumdisplay.php?f=80).
 
 
 Quick Start
 -----------
-Wiki page for [Getting Started] (https://github.com/spring-projects/spring-data-elasticsearch/wiki/How-to-start-with-spring-data-elasticsearch)
+Wiki page for [Getting Started](https://github.com/spring-projects/spring-data-elasticsearch/wiki/How-to-start-with-spring-data-elasticsearch)
 
 ### Maven configuration
 
@@ -31,14 +31,8 @@ Add the Maven dependency:
 <dependency>
     <groupId>org.springframework.data</groupId>
     <artifactId>spring-data-elasticsearch</artifactId>
-    <version>1.0.0.RC1</version>
+    <version>1.0.0.RELEASE</version>
 </dependency>
-
-<repository>
-  <id>spring-libs-milestone</id>
-  <name>Spring Milestone Repository</name>
-  <url>http://repo.spring.io/libs-milestone</url>
-</repository>
 ```
 
 If you'd rather like the latest snapshots of the upcoming major version, use our Maven snapshot repository and declare
@@ -193,8 +187,8 @@ Using Node Client
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:elasticsearch="http://www.springframework.org/schema/data/elasticsearch"
-       xsi:schemaLocation="http://www.springframework.org/schema/data/elasticsearch http://www.springframework.org/schema/data/elasticsearch/spring-elasticsearch-1.0.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
+       xsi:schemaLocation="http://www.springframework.org/schema/data/elasticsearch http://www.springframework.org/schema/data/elasticsearch/spring-elasticsearch.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
     <elasticsearch:node-client id="client" local="true"/>
 
@@ -212,8 +206,8 @@ Using Transport Client
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:elasticsearch="http://www.springframework.org/schema/data/elasticsearch"
-       xsi:schemaLocation="http://www.springframework.org/schema/data/elasticsearch http://www.springframework.org/schema/data/elasticsearch/spring-elasticsearch-1.0.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
+       xsi:schemaLocation="http://www.springframework.org/schema/data/elasticsearch http://www.springframework.org/schema/data/elasticsearch/spring-elasticsearch.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
     <elasticsearch:repositories base-package="com.xyz.acme"/>
 
diff --git a/pom.xml b/pom.xml
index 66ba72c06..d24176722 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>org.springframework.data.build</groupId>
 		<artifactId>spring-data-parent</artifactId>
-		<version>1.4.0.BUILD-SNAPSHOT</version>
+		<version>1.4.0.RELEASE</version>
 		<relativePath>../spring-data-build/parent/pom.xml</relativePath>
 	</parent>
 
@@ -24,7 +24,7 @@
 		<commonscollections>3.2.1</commonscollections>
 		<commonslang>2.6</commonslang>
 		<elasticsearch>1.1.1</elasticsearch>
-		<springdata.commons>1.8.0.BUILD-SNAPSHOT</springdata.commons>
+		<springdata.commons>1.8.0.RELEASE</springdata.commons>
 
 	</properties>
 
@@ -146,8 +146,8 @@
 
 	<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/src/docbkx/index.xml b/src/docbkx/index.xml
index e5e4f15f1..4d2bf93cd 100644
--- a/src/docbkx/index.xml
+++ b/src/docbkx/index.xml
@@ -1,59 +1,59 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-        "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<book xmlns:xi="http://www.w3.org/2001/XInclude">
-    <bookinfo>
-        <title>Spring Data Elasticsearch</title>
-        <authorgroup>
-            <author>
-                <firstname>BioMed Central</firstname>
-                <surname>Development Team</surname>
-            </author>
-        </authorgroup>
-        <legalnotice>
-            <para>
-                Copies of this document may be made for your own use and for
-                distribution to others, provided that you do not
-                charge any fee for
-                such copies and further provided that each copy
-                contains this
-                Copyright Notice, whether
-                distributed in print or electronically.
-            </para>
-        </legalnotice>
-
-        <copyright>
-            <year>2013-2014</year>
-            <holder>The original author(s)</holder>
-        </copyright>
-    </bookinfo>
-
-    <toc/>
-
-    <xi:include href="preface.xml"/>
-
-    <part id="reference">
-        <title>Reference Documentation</title>
-
-        <xi:include href="https://raw.github.com/SpringSource/spring-data-commons/1.8.0.RC1/src/docbkx/repositories.xml">
-            <xi:fallback
-                    href="../../../spring-data-commons/src/docbkx/repositories.xml"/>
-        </xi:include>
-
-        <xi:include href="reference/data-elasticsearch.xml"/>
-        <xi:include href="reference/elasticsearch-misc.xml"/>
-    </part>
-
-    <part id="appendix">
-        <title>Appendix</title>
-        <xi:include href="https://raw.github.com/SpringSource/spring-data-commons/1.8.0.RC1/src/docbkx/repository-namespace-reference.xml">
-            <xi:fallback
-                    href="../../../spring-data-commons/src/docbkx/repository-namespace-reference.xml"/>
-        </xi:include>
-        <xi:include href="https://raw.github.com/SpringSource/spring-data-commons/1.8.0.RC1/src/docbkx/repository-query-keywords-reference.xml">
-            <xi:fallback
-                    href="../../../spring-data-commons/src/docbkx/repository-query-keywords-reference.xml"/>
-        </xi:include>
-    </part>
-
-</book>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+        "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+<book xmlns:xi="http://www.w3.org/2001/XInclude">
+    <bookinfo>
+        <title>Spring Data Elasticsearch</title>
+        <authorgroup>
+            <author>
+                <firstname>BioMed Central</firstname>
+                <surname>Development Team</surname>
+            </author>
+        </authorgroup>
+        <legalnotice>
+            <para>
+                Copies of this document may be made for your own use and for
+                distribution to others, provided that you do not
+                charge any fee for
+                such copies and further provided that each copy
+                contains this
+                Copyright Notice, whether
+                distributed in print or electronically.
+            </para>
+        </legalnotice>
+
+        <copyright>
+            <year>2013-2014</year>
+            <holder>The original author(s)</holder>
+        </copyright>
+    </bookinfo>
+
+    <toc/>
+
+    <xi:include href="preface.xml"/>
+
+    <part id="reference">
+        <title>Reference Documentation</title>
+
+        <xi:include href="https://raw.github.com/SpringSource/spring-data-commons/1.8.0.RELEASE/src/docbkx/repositories.xml">
+            <xi:fallback
+                    href="../../../spring-data-commons/src/docbkx/repositories.xml"/>
+        </xi:include>
+
+        <xi:include href="reference/data-elasticsearch.xml"/>
+        <xi:include href="reference/elasticsearch-misc.xml"/>
+    </part>
+
+    <part id="appendix">
+        <title>Appendix</title>
+        <xi:include href="https://raw.github.com/SpringSource/spring-data-commons/1.8.0.RELEASE/src/docbkx/repository-namespace-reference.xml">
+            <xi:fallback
+                    href="../../../spring-data-commons/src/docbkx/repository-namespace-reference.xml"/>
+        </xi:include>
+        <xi:include href="https://raw.github.com/SpringSource/spring-data-commons/1.8.0.RELEASE/src/docbkx/repository-query-keywords-reference.xml">
+            <xi:fallback
+                    href="../../../spring-data-commons/src/docbkx/repository-query-keywords-reference.xml"/>
+        </xi:include>
+    </part>
+
+</book>
diff --git a/src/main/resources/notice.txt b/src/main/resources/notice.txt
index b1965ccde..420426165 100644
--- a/src/main/resources/notice.txt
+++ b/src/main/resources/notice.txt
@@ -1,4 +1,4 @@
-Spring Data Elasticsearch 1.0 RC1
+Spring Data Elasticsearch 1.0 GA
 Copyright (c) [2013-2014] Pivotal Software, Inc.
 
 This product is licensed to you under the Apache License, Version 2.0 (the "License").