diff --git a/README.md b/README.md index 97ed4a99e..92358421e 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ Spring Data Elasticsearch -========================= +========================= Spring Data implementation for ElasticSearch @@ -10,10 +10,10 @@ The Spring Data Elasticsearch project provides integration with the [elasticsear Guide ------------ -* [Reference Documentation](http://docs.spring.io/spring-data/elasticsearch/docs/1.0.0.M1/reference/html/) -* [PDF Documentation](http://docs.spring.io/spring-data/elasticsearch/docs/1.0.0.M1/reference/pdf/spring-data-elasticsearch-reference.pdf) -* [API Documentation](http://docs.spring.io/spring-data/elasticsearch/docs/1.0.0.M1/api/) -* [Spring Data Project](http://www.springsource.org/spring-data) +* [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/) +* [Spring Data Project](http://project.spring.io/spring-data) * [Sample Test Application](https://github.com/BioMedCentralLtd/spring-data-elasticsearch-sample-application) * for more detailed questions, use the [forum](http://forum.springsource.org/forumdisplay.php?f=80). @@ -30,13 +30,13 @@ Add the Maven dependency: org.springframework.data spring-data-elasticsearch - 1.0.0.M1 + 1.1.0.M1 spring-libs-milestone Spring Milestone Repository - http://repo.springsource.org/libs-milestone + http://repo.spring.io/libs-milestone ``` @@ -53,7 +53,7 @@ the appropriate dependency version. spring-libs-snapshot Spring Snapshot Repository - http://repo.springsource.org/libs-snapshot + http://repo.spring.io/libs-snapshot ``` diff --git a/pom.xml b/pom.xml index 9d2c94da6..73199fba2 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ org.springframework.data.build spring-data-parent - 1.4.0.BUILD-SNAPSHOT + 1.4.0.M1 ../spring-data-build/parent/pom.xml @@ -25,7 +25,7 @@ 3.2.1 2.6 1.1.0 - 1.8.0.BUILD-SNAPSHOT + 1.8.0.M1 @@ -147,8 +147,8 @@ - spring-libs-snapshot - http://repo.spring.io/libs-snapshot/ + spring-libs-milestone + http://repo.spring.io/libs-milestone diff --git a/src/docbkx/index.xml b/src/docbkx/index.xml index d5aff1fcd..8adb7db36 100644 --- a/src/docbkx/index.xml +++ b/src/docbkx/index.xml @@ -23,7 +23,7 @@ - 2013 + 2013-2014 The original author(s) @@ -36,7 +36,7 @@ Reference Documentation + href="https://raw.github.com/SpringSource/spring-data-commons/1.8.0.M1/src/docbkx/repositories.xml"> @@ -48,12 +48,12 @@ Appendix + href="https://raw.github.com/SpringSource/spring-data-commons/1.8.0.M1/src/docbkx/repository-namespace-reference.xml"> + href="https://raw.github.com/SpringSource/spring-data-commons/1.8.0.M1/src/docbkx/repository-query-keywords-reference.xml"> diff --git a/src/main/resources/changelog.txt b/src/main/resources/changelog.txt index 4f53558f3..13c526710 100644 --- a/src/main/resources/changelog.txt +++ b/src/main/resources/changelog.txt @@ -28,13 +28,13 @@ Issues maintaine in GitHub tracker: - #40 - how to create index for json objects? - #38 - Configure with native Client with embedded elasticsearch - #37 - embedded elasticsearch client - how to recover data after process is restarted? -- #36 - FieldType.Date annotation +- #36 - FieldType.Date annotation - #35 - @Transient property still inserted into elastic - #33 - timestamp mapping - #32 - BigDecimal @Field(type = FieldType.Double) - #31 - DATAES-33: Mapping of parent-child relationships - #29 - Added DefaultMapper support to map only partial fields from result instead of whole source field. -- #28 - Documentation (README.md) for Geo Location / Filter Feature +- #28 - Documentation (README.md) for Geo Location / Filter Feature - #27 - Adding support for letting Elasticsearch generate Id for document - #25 - Aliases - #24 - DATAES-31 Adding ability to use ES Java API setSource directly diff --git a/src/main/resources/notice.txt b/src/main/resources/notice.txt index e8d8e638a..08021d003 100644 --- a/src/main/resources/notice.txt +++ b/src/main/resources/notice.txt @@ -1,8 +1,8 @@ -Spring Data Elasticsearch 1.0 M1 -Copyright (c) [2013-2014] Pivotal Inc. +Spring Data Elasticsearch 1.0 M2 +Copyright (c) [2013-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. +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. This product may include a number of subcomponents with separate copyright notices and license terms. Your use of the source diff --git a/template.mf b/template.mf index 4e814750b..aaac86fc7 100644 --- a/template.mf +++ b/template.mf @@ -1,15 +1,15 @@ Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.springframework.data.elasticsearch Bundle-Name: ${project.name} -Bundle-Vendor: SpringSource +Bundle-Vendor: Pivotal Software, Inc. Bundle-Version: ${project.version} Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Export-Template: +Export-Template: org.springframework.data.elasticsearch.*;version="${project.version}" Import-Template: javax.enterprise.*;version="${cdi:[=.=.=,+1.0.0)}";resolution:=optional, - org.apache.commons.collections.*;version="${commonscollections:[=.=.=,+1.0.0)}";resolution:=optional, - org.apache.commons.lang.*;version="${commonslang:[=.=.=,+1.0.0)}", + org.apache.commons.collections.*;version="${commonscollections:[=.=.=,+1.0.0)}";resolution:=optional, + org.apache.commons.lang.*;version="${commonslang:[=.=.=,+1.0.0)}", com.fasterxml.jackson.*;version="${jackson:[=.=.=,+1.0.0)}";resolution:=optional, org.elasticsearch.*;version="${elasticsearch:[=.=.=,+1.0.0)}", org.apache.lucene.*;version="4.6.1",