Skip to content

Commit 407768a

Browse files
odrotbohmodrotbohm
committed
DATAES-90 - Prepare 1.0 GA.
Tweaked README.md. Replaced Docbook index.xml as it apparently used a different encoding scheme.
1 parent 8fbd00d commit 407768a

File tree

4 files changed

+74
-80
lines changed

4 files changed

+74
-80
lines changed

‎README.md

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,18 @@ The Spring Data Elasticsearch project provides integration with the [elasticsear
1010
Guide
1111
------------
1212

13-
* [Reference Documentation](http://docs.spring.io/spring-data/elasticsearch/docs/1.0.0.M2/reference/html/)
14-
* [PDF Documentation](http://docs.spring.io/spring-data/elasticsearch/docs/1.0.0.M2/reference/pdf/spring-data-elasticsearch-reference.pdf)
15-
* [API Documentation](http://docs.spring.io/spring-data/elasticsearch/docs/1.0.0.M2/api/)
13+
* [Reference Documentation](http://docs.spring.io/spring-data/elasticsearch/docs/current/reference/html/)
14+
* [PDF Documentation](http://docs.spring.io/spring-data/elasticsearch/docs/current/reference/pdf/spring-data-elasticsearch-reference.pdf)
15+
* [API Documentation](http://docs.spring.io/spring-data/elasticsearch/docs/current/api/)
1616
* [Spring Data Project](http://project.spring.io/spring-data)
1717
* [Sample Test Application](https://github.com/BioMedCentralLtd/spring-data-elasticsearch-sample-application)
18-
* [Spring Data Elasticsearch Google Group] (https://groups.google.com/d/forum/spring-data-elasticsearch-devs)
18+
* [Spring Data Elasticsearch Google Group](https://groups.google.com/d/forum/spring-data-elasticsearch-devs)
1919
* For more detailed questions, use the [forum](http://forum.springsource.org/forumdisplay.php?f=80).
2020

2121

2222
Quick Start
2323
-----------
24-
Wiki page for [Getting Started] (https://github.com/spring-projects/spring-data-elasticsearch/wiki/How-to-start-with-spring-data-elasticsearch)
24+
Wiki page for [Getting Started](https://github.com/spring-projects/spring-data-elasticsearch/wiki/How-to-start-with-spring-data-elasticsearch)
2525

2626
### Maven configuration
2727

@@ -31,14 +31,8 @@ Add the Maven dependency:
3131
<dependency>
3232
<groupId>org.springframework.data</groupId>
3333
<artifactId>spring-data-elasticsearch</artifactId>
34-
<version>1.0.0.RC1</version>
34+
<version>1.0.0.RELEASE</version>
3535
</dependency>
36-
37-
<repository>
38-
<id>spring-libs-milestone</id>
39-
<name>Spring Milestone Repository</name>
40-
<url>http://repo.spring.io/libs-milestone</url>
41-
</repository>
4236
```
4337

4438
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
193187
<beans xmlns="http://www.springframework.org/schema/beans"
194188
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
195189
xmlns:elasticsearch="http://www.springframework.org/schema/data/elasticsearch"
196-
xsi:schemaLocation="http://www.springframework.org/schema/data/elasticsearch http://www.springframework.org/schema/data/elasticsearch/spring-elasticsearch-1.0.xsd
197-
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
190+
xsi:schemaLocation="http://www.springframework.org/schema/data/elasticsearch http://www.springframework.org/schema/data/elasticsearch/spring-elasticsearch.xsd
191+
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
198192

199193
<elasticsearch:node-client id="client" local="true"/>
200194

@@ -212,8 +206,8 @@ Using Transport Client
212206
<beans xmlns="http://www.springframework.org/schema/beans"
213207
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
214208
xmlns:elasticsearch="http://www.springframework.org/schema/data/elasticsearch"
215-
xsi:schemaLocation="http://www.springframework.org/schema/data/elasticsearch http://www.springframework.org/schema/data/elasticsearch/spring-elasticsearch-1.0.xsd
216-
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
209+
xsi:schemaLocation="http://www.springframework.org/schema/data/elasticsearch http://www.springframework.org/schema/data/elasticsearch/spring-elasticsearch.xsd
210+
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
217211

218212
<elasticsearch:repositories base-package="com.xyz.acme"/>
219213

‎pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<groupId>org.springframework.data.build</groupId>
1111
<artifactId>spring-data-parent</artifactId>
12-
<version>1.4.0.BUILD-SNAPSHOT</version>
12+
<version>1.4.0.RELEASE</version>
1313
<relativePath>../spring-data-build/parent/pom.xml</relativePath>
1414
</parent>
1515

@@ -24,7 +24,7 @@
2424
<commonscollections>3.2.1</commonscollections>
2525
<commonslang>2.6</commonslang>
2626
<elasticsearch>1.1.1</elasticsearch>
27-
<springdata.commons>1.8.0.BUILD-SNAPSHOT</springdata.commons>
27+
<springdata.commons>1.8.0.RELEASE</springdata.commons>
2828

2929
</properties>
3030

@@ -146,8 +146,8 @@
146146

147147
<repositories>
148148
<repository>
149-
<id>spring-libs-snapshot</id>
150-
<url>http://repo.spring.io/libs-snapshot</url>
149+
<id>spring-libs-release</id>
150+
<url>http://repo.spring.io/libs-release</url>
151151
</repository>
152152
</repositories>
153153

‎src/docbkx/index.xml

Lines changed: 59 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,59 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
3-
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
4-
<book xmlns:xi="http://www.w3.org/2001/XInclude">
5-
<bookinfo>
6-
<title>Spring Data Elasticsearch</title>
7-
<authorgroup>
8-
<author>
9-
<firstname>BioMed Central</firstname>
10-
<surname>Development Team</surname>
11-
</author>
12-
</authorgroup>
13-
<legalnotice>
14-
<para>
15-
Copies of this document may be made for your own use and for
16-
distribution to others, provided that you do not
17-
charge any fee for
18-
such copies and further provided that each copy
19-
contains this
20-
Copyright Notice, whether
21-
distributed in print or electronically.
22-
</para>
23-
</legalnotice>
24-
25-
<copyright>
26-
<year>2013-2014</year>
27-
<holder>The original author(s)</holder>
28-
</copyright>
29-
</bookinfo>
30-
31-
<toc/>
32-
33-
<xi:include href="preface.xml"/>
34-
35-
<part id="reference">
36-
<title>Reference Documentation</title>
37-
38-
<xi:include href="https://raw.github.com/SpringSource/spring-data-commons/1.8.0.RC1/src/docbkx/repositories.xml">
39-
<xi:fallback
40-
href="../../../spring-data-commons/src/docbkx/repositories.xml"/>
41-
</xi:include>
42-
43-
<xi:include href="reference/data-elasticsearch.xml"/>
44-
<xi:include href="reference/elasticsearch-misc.xml"/>
45-
</part>
46-
47-
<part id="appendix">
48-
<title>Appendix</title>
49-
<xi:include href="https://raw.github.com/SpringSource/spring-data-commons/1.8.0.RC1/src/docbkx/repository-namespace-reference.xml">
50-
<xi:fallback
51-
href="../../../spring-data-commons/src/docbkx/repository-namespace-reference.xml"/>
52-
</xi:include>
53-
<xi:include href="https://raw.github.com/SpringSource/spring-data-commons/1.8.0.RC1/src/docbkx/repository-query-keywords-reference.xml">
54-
<xi:fallback
55-
href="../../../spring-data-commons/src/docbkx/repository-query-keywords-reference.xml"/>
56-
</xi:include>
57-
</part>
58-
59-
</book>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
3+
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
4+
<book xmlns:xi="http://www.w3.org/2001/XInclude">
5+
<bookinfo>
6+
<title>Spring Data Elasticsearch</title>
7+
<authorgroup>
8+
<author>
9+
<firstname>BioMed Central</firstname>
10+
<surname>Development Team</surname>
11+
</author>
12+
</authorgroup>
13+
<legalnotice>
14+
<para>
15+
Copies of this document may be made for your own use and for
16+
distribution to others, provided that you do not
17+
charge any fee for
18+
such copies and further provided that each copy
19+
contains this
20+
Copyright Notice, whether
21+
distributed in print or electronically.
22+
</para>
23+
</legalnotice>
24+
25+
<copyright>
26+
<year>2013-2014</year>
27+
<holder>The original author(s)</holder>
28+
</copyright>
29+
</bookinfo>
30+
31+
<toc/>
32+
33+
<xi:include href="preface.xml"/>
34+
35+
<part id="reference">
36+
<title>Reference Documentation</title>
37+
38+
<xi:include href="https://raw.github.com/SpringSource/spring-data-commons/1.8.0.RELEASE/src/docbkx/repositories.xml">
39+
<xi:fallback
40+
href="../../../spring-data-commons/src/docbkx/repositories.xml"/>
41+
</xi:include>
42+
43+
<xi:include href="reference/data-elasticsearch.xml"/>
44+
<xi:include href="reference/elasticsearch-misc.xml"/>
45+
</part>
46+
47+
<part id="appendix">
48+
<title>Appendix</title>
49+
<xi:include href="https://raw.github.com/SpringSource/spring-data-commons/1.8.0.RELEASE/src/docbkx/repository-namespace-reference.xml">
50+
<xi:fallback
51+
href="../../../spring-data-commons/src/docbkx/repository-namespace-reference.xml"/>
52+
</xi:include>
53+
<xi:include href="https://raw.github.com/SpringSource/spring-data-commons/1.8.0.RELEASE/src/docbkx/repository-query-keywords-reference.xml">
54+
<xi:fallback
55+
href="../../../spring-data-commons/src/docbkx/repository-query-keywords-reference.xml"/>
56+
</xi:include>
57+
</part>
58+
59+
</book>

‎src/main/resources/notice.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Spring Data Elasticsearch 1.0 RC1
1+
Spring Data Elasticsearch 1.0 GA
22
Copyright (c) [2013-2014] Pivotal Software, Inc.
33

44
This product is licensed to you under the Apache License, Version 2.0 (the "License").

0 commit comments

Comments
 (0)