DATAMONGO-846 - Prepare Release 1.3.4.

Updated change log, notice, read me. Updated SD Commons dependency to 1.6.4.RELEASE. Tweaks in MongoRepositoryfactoryBeanUnitTests to adapt to changes introduced in Spring Data Commons 1.6.4. Related issues: DATACMNS-432.
2014-02-17 13:57:53 +01:00
parent b9c8b7b234
commit 1637f8d181
7 changed files with 83 additions and 18 deletions
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@ Add the Maven dependency:
 <dependency>
  <groupId>org.springframework.data</groupId>
  <artifactId>spring-data-mongodb</artifactId>
-  <version>1.3.2.RELEASE</version>
+  <version>1.3.4.RELEASE</version>
 </dependency>
 ```

--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.springframework.data.build</groupId>
 		<artifactId>spring-data-parent</artifactId>
-		<version>1.2.0.RELEASE</version>
+		<version>1.2.1.RELEASE</version>
 		<relativePath>../spring-data-build/parent/pom.xml</relativePath>
 	</parent>
 	
@@ -29,7 +29,7 @@
 	<properties>
 		<project.type>multi</project.type>
 		<dist.id>spring-data-mongodb</dist.id>
-		<springdata.commons>1.6.3.RELEASE</springdata.commons>
+		<springdata.commons>1.6.4.RELEASE</springdata.commons>
 		<mongo>2.10.1</mongo>
 	</properties>
 	
@@ -89,6 +89,17 @@
 			</roles>
 			<timezone>+1</timezone>
 		</developer>
+		<developer>
+			<id>cstrobl</id>
+			<name>Christoph Strobl</name>
+			<email>cstrobl at gopivotal.com</email>
+			<organization>Pivotal Inc.</organization>
+			<organizationUrl>http://www.gopivotal.com</organizationUrl>
+			<roles>
+				<role>Developer</role>
+			</roles>
+			<timezone>+1</timezone>
+		</developer>
 	</developers>

 	<dependencies>
@@ -103,8 +114,15 @@
 	<repositories>
 		<repository>
 			<id>spring-lib-release</id>
-			<url>http://repo.springsource.org/libs-release-local</url>
+			<url>http://repo.spring.io/libs-release</url>
 		</repository>
 	</repositories>
+	
+	<pluginRepositories>
+ 		<pluginRepository>
+ 			<id>spring-plugins-release</id>
+ 			<url>http://repo.spring.io/plugins-release</url>
+ 		</pluginRepository>
+ 	</pluginRepositories>

 </project>
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/MongoRepositoryFactoryBeanUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/MongoRepositoryFactoryBeanUnitTests.java
@@ -28,6 +28,7 @@ import org.mockito.runners.MockitoJUnitRunner;
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mongodb.core.MongoOperations;
 import org.springframework.data.mongodb.core.convert.MongoConverter;
+import org.springframework.data.mongodb.repository.PersonRepository;
 import org.springframework.data.repository.core.support.RepositoryFactorySupport;
 import org.springframework.test.util.ReflectionTestUtils;

@@ -39,15 +40,11 @@ import org.springframework.test.util.ReflectionTestUtils;
@RunWith(MockitoJUnitRunner.class)
 public class MongoRepositoryFactoryBeanUnitTests {

-	@Mock
-	MongoOperations operations;
+	@Mock MongoOperations operations;

-	@Mock
-	MongoConverter converter;
+	@Mock MongoConverter converter;

-	@Mock
-	@SuppressWarnings("rawtypes")
-	MappingContext context;
+	@Mock @SuppressWarnings("rawtypes") MappingContext context;

 	@Test
 	@SuppressWarnings("rawtypes")
@@ -75,6 +72,7 @@ public class MongoRepositoryFactoryBeanUnitTests {
 		when(operations.getConverter()).thenReturn(converter);
 		when(converter.getMappingContext()).thenReturn(context);

+		factoryBean.setRepositoryInterface(PersonRepository.class);
 		factoryBean.setMongoOperations(operations);
 		factoryBean.afterPropertiesSet();

--- a/src/docbkx/index.xml
+++ b/src/docbkx/index.xml
@@ -56,7 +56,7 @@
    <xi:include href="introduction/why-sd-doc.xml"/>
    <xi:include href="introduction/requirements.xml"/>
    <xi:include href="introduction/getting-started.xml"/>
-    <xi:include href="https://raw.github.com/SpringSource/spring-data-commons/1.6.3.RELEASE/src/docbkx/repositories.xml">
+    <xi:include href="https://raw.github.com/SpringSource/spring-data-commons/1.6.4.RELEASE/src/docbkx/repositories.xml">
      <xi:fallback href="../../../spring-data-commons/src/docbkx/repositories.xml" />
    </xi:include>
  </part>
@@ -76,10 +76,10 @@
  <part id="appendix">
    <title>Appendix</title>

-    <xi:include href="https://raw.github.com/SpringSource/spring-data-commons/1.6.3.RELEASE/src/docbkx/repository-namespace-reference.xml">
+    <xi:include href="https://raw.github.com/SpringSource/spring-data-commons/1.6.4.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.6.3.RELEASE/src/docbkx/repository-query-keywords-reference.xml">
+    <xi:include href="https://raw.github.com/SpringSource/spring-data-commons/1.6.4.RELEASE/src/docbkx/repository-query-keywords-reference.xml">
    	<xi:fallback href="../../../spring-data-commons/src/docbkx/repository-query-keywords-reference.xml" />
    </xi:include>
  </part>
--- a/src/main/resources/changelog.txt
+++ b/src/main/resources/changelog.txt
@@ -1,6 +1,55 @@
 Spring Data MongoDB Changelog
 =============================

+Changes in version 1.3.4.RELEASE (2014-02-17)
+---------------------------------------------
+** Bug
+    * [DATAMONGO-407] - Collection with generics losing element type after $set update
+    * [DATAMONGO-410] - Update with pushAll doesnt recognize defined Converter
+    * [DATAMONGO-686] - ClassCastException while reusing Query object
+    * [DATAMONGO-805] - Excluding DBRef field in a query causes a MappingException
+    * [DATAMONGO-807] - using findAndModify removes the _class field of encapsulated classes, causing MappingInstantiationException
+    * [DATAMONGO-808] - Spring data mongoDB not working with IPv6 address directly
+    * [DATAMONGO-811] - updateFirst methods do not increment @Version field
+    * [DATAMONGO-816] - Unable to execute query with DocumentCallbackHandler when query contains Criteria with enums.
+    * [DATAMONGO-828] - UpdateFirst throws OptimisticLockingFailureException when updating document that does not exist
+    * [DATAMONGO-830] - NPE during cache warmup in CustomConversions
+    * [DATAMONGO-842] - Documentation error in GRIDFS section
+** Improvement
+    * [DATAMONGO-813] - GridFsTemplate.getResource(location) throws NPE if don't find file
+** Task
+    * [DATAMONGO-824] - Add contribution guidelines
+    * [DATAMONGO-846] - Release 1.3.4
+
+Changes in version 1.4.0.RC1 (2014-01-29)
+-----------------------------------------
+** Bug
+    * [DATAMONGO-407] - Collection with generics losing element type after $set update
+    * [DATAMONGO-686] - ClassCastException while reusing Query object
+    * [DATAMONGO-726] - References to non existing classes in namespace XSD
+    * [DATAMONGO-804] - EnableMongoRepositories repositoryImplementationPostfix() default is empty String instead of "Impl"
+    * [DATAMONGO-805] - Excluding DBRef field in a query causes a MappingException
+    * [DATAMONGO-806] - Spring Data MongoDB - Aggregation Framework - No property _id found for type com.entity.User
+    * [DATAMONGO-807] - using findAndModify removes the _class field of encapsulated classes, causing MappingInstantiationException
+    * [DATAMONGO-808] - Spring data mongoDB not working with IPv6 address directly
+    * [DATAMONGO-811] - updateFirst methods do not increment @Version field
+    * [DATAMONGO-816] - Unable to execute query with DocumentCallbackHandler when query contains Criteria with enums.
+** Improvement
+    * [DATAMONGO-778] - Create geospatial index of type other than 2d with @GeoSpatialIndexed
+    * [DATAMONGO-785] - Add support for geospatial 2Dsphere and geohaystack index types
+    * [DATAMONGO-787] - Guard against SpEL issue in Spring 3.2.4
+    * [DATAMONGO-799] - Fix failing test in MongoTemplateTests on Mongo 2.5.x
+    * [DATAMONGO-802] - Change AbstractMongoConfiguration.mongoDbFactory() to return MongoDbFactory
+    * [DATAMONGO-813] - GridFsTemplate.getResource(location) throws NPE if don't find file
+    * [DATAMONGO-822] - Add support for eager CDI repository instantiation
+    * [DATAMONGO-823] - Add bucket attribute to <mongo:gridFsTemplate />
+    * [DATAMONGO-837] - Upgrade mongodb java driver to 2.11.4
+** Task
+    * [DATAMONGO-790] - Ensure compatibility with Spring Framework 4.0
+    * [DATAMONGO-824] - Add contribution guidelines
+    * [DATAMONGO-826] - Release Spring Data MongoDB 1.4.0.RC1
+    * [DATAMONGO-835] - Code cleanups
+
 Changes in version 1.3.3.RELEASE (2013-12-11)
 ---------------------------------------------
 ** Bug
@@ -19,7 +68,7 @@ Changes in version 1.3.3.RELEASE (2013-12-11)
    * [DATAMONGO-810] - Release 1.3.3

 Changes in version 1.4.0.M1 (2013-11-19)
---------------------------------------------
+----------------------------------------
 ** Bug
    * [DATAMONGO-534] - The GridFs query execution does not return sorted resources, when the sorting fields are defined in the query definition
    * [DATAMONGO-630] - Add support of $setOnInsert modifier for upsert
--- a/src/main/resources/notice.txt
+++ b/src/main/resources/notice.txt
@@ -1,5 +1,5 @@
-Spring Data Document 1.3.3.RELEASE
-Copyright (c) [2010-2013] Pivotal Inc.
+Spring Data MongoDB 1.3.4.RELEASE
+Copyright (c) [2010-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.  
--- a/src/main/resources/readme.txt
+++ b/src/main/resources/readme.txt
@@ -1,4 +1,4 @@
-SPRING DATA MongoDB 1.3.3.RELEASE
+Spring Data MongoDB 1.3.4.RELEASE
 -----------------------------

 Spring Data MongoDB is released under the terms of the Apache Software License Version 2.0 (see license.txt).