DATAES-78 - Prepare 1.0 M2.

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/)
+* [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.M1/reference/pdf/spring-data-elasticsearch-reference.pdf)
+* [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.M1/api/)
+* [API Documentation](http://docs.spring.io/spring-data/elasticsearch/docs/1.0.0.M2/api/)
-* [Spring Data Project](http://www.springsource.org/spring-data)
+* [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:
 <dependency>
     <groupId>org.springframework.data</groupId>
     <artifactId>spring-data-elasticsearch</artifactId>
-    <version>1.0.0.M1</version>
+    <version>1.1.0.M1</version>
 </dependency>
 
 <repository>
   <id>spring-libs-milestone</id>
   <name>Spring Milestone Repository</name>
-  <url>http://repo.springsource.org/libs-milestone</url>
+  <url>http://repo.spring.io/libs-milestone</url>
 </repository>
 ```
 
@@ -53,7 +53,7 @@ the appropriate dependency version.
 <repository>
   <id>spring-libs-snapshot</id>
   <name>Spring Snapshot Repository</name>
-  <url>http://repo.springsource.org/libs-snapshot</url>
+  <url>http://repo.spring.io/libs-snapshot</url>
 </repository>
 ```
 

pom.xml

@@ -10,7 +10,7 @@
     <parent>
         <groupId>org.springframework.data.build</groupId>
         <artifactId>spring-data-parent</artifactId>
-        <version>1.4.0.BUILD-SNAPSHOT</version>
+        <version>1.4.0.M1</version>
         <relativePath>../spring-data-build/parent/pom.xml</relativePath>
     </parent>
 
@@ -25,7 +25,7 @@
         <commonscollections>3.2.1</commonscollections>
         <commonslang>2.6</commonslang>
         <elasticsearch>1.1.0</elasticsearch>
-        <springdata.commons>1.8.0.BUILD-SNAPSHOT</springdata.commons>
+        <springdata.commons>1.8.0.M1</springdata.commons>
 
     </properties>
 
@@ -147,8 +147,8 @@
 
     <repositories>
         <repository>
-            <id>spring-libs-snapshot</id>
+            <id>spring-libs-milestone</id>
-            <url>http://repo.spring.io/libs-snapshot/</url>
+            <url>http://repo.spring.io/libs-milestone</url>
         </repository>
     </repositories>
 

src/docbkx/index.xml

@@ -23,7 +23,7 @@
         </legalnotice>
 
         <copyright>
-            <year>2013</year>
+            <year>2013-2014</year>
             <holder>The original author(s)</holder>
         </copyright>
     </bookinfo>
@@ -36,7 +36,7 @@
         <title>Reference Documentation</title>
 
         <xi:include
-                href="https://raw.github.com/SpringSource/spring-data-commons/1.4.0.RC1/src/docbkx/repositories.xml">
+                href="https://raw.github.com/SpringSource/spring-data-commons/1.8.0.M1/src/docbkx/repositories.xml">
             <xi:fallback
                     href="../../../spring-data-commons/src/docbkx/repositories.xml"/>
         </xi:include>
@@ -48,12 +48,12 @@
     <part id="appendix">
         <title>Appendix</title>
         <xi:include
-                href="https://raw.github.com/SpringSource/spring-data-commons/1.4.0.RC1/src/docbkx/repository-namespace-reference.xml">
+                href="https://raw.github.com/SpringSource/spring-data-commons/1.8.0.M1/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.4.0.RC1/src/docbkx/repository-query-keywords-reference.xml">
+                href="https://raw.github.com/SpringSource/spring-data-commons/1.8.0.M1/src/docbkx/repository-query-keywords-reference.xml">
             <xi:fallback
                     href="../../../spring-data-commons/src/docbkx/repository-query-keywords-reference.xml"/>
         </xi:include>

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

src/main/resources/notice.txt

@@ -1,8 +1,8 @@
-Spring Data Elasticsearch 1.0 M1
+Spring Data Elasticsearch 1.0 M2
-Copyright (c) [2013-2014] Pivotal Inc.
+Copyright (c) [2013-2014] Pivotal Software, Inc.
 
-This product is licensed to you under the Apache License, Version 2.0 (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.  
+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

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.collections.*;version="${commonscollections:[=.=.=,+1.0.0)}";resolution:=optional,
- org.apache.commons.lang.*;version="${commonslang:[=.=.=,+1.0.0)}", 
+ 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",