Release version 3.4 RC1 (2021.2.0).

See #4002

Jenkinsfile

@@ -9,7 +9,7 @@ pipeline {
 
 	triggers {
 		pollSCM 'H/10 * * * *'
-		upstream(upstreamProjects: "spring-data-commons/main", threshold: hudson.model.Result.SUCCESS)
+		upstream(upstreamProjects: "spring-data-commons/2.7.x", threshold: hudson.model.Result.SUCCESS)
 	}
 
 	options {

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-mongodb-parent</artifactId>
-	<version>3.4.0-M4</version>
+	<version>3.4.0-RC1</version>
 	<packaging>pom</packaging>
 
 	<name>Spring Data MongoDB</name>
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.springframework.data.build</groupId>
 		<artifactId>spring-data-parent</artifactId>
-		<version>2.7.0-M4</version>
+		<version>2.7.0-RC1</version>
 	</parent>
 
 	<modules>
@@ -26,8 +26,8 @@
 	<properties>
 		<project.type>multi</project.type>
 		<dist.id>spring-data-mongodb</dist.id>
-		<springdata.commons>2.7.0-M4</springdata.commons>
-		<mongo>4.5.0</mongo>
+		<springdata.commons>2.7.0-RC1</springdata.commons>
+		<mongo>4.6.0</mongo>
 		<mongo.reactivestreams>${mongo}</mongo.reactivestreams>
 		<jmh.version>1.19</jmh.version>
 	</properties>

spring-data-mongodb-benchmarks/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>3.4.0-M4</version>
+		<version>3.4.0-RC1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

spring-data-mongodb-distribution/pom.xml

@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>3.4.0-M4</version>
+		<version>3.4.0-RC1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

spring-data-mongodb/pom.xml

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>3.4.0-M4</version>
+		<version>3.4.0-RC1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MappingMongoConverter.java

@@ -44,6 +44,7 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.core.CollectionFactory;
 import org.springframework.core.convert.ConversionService;
+import org.springframework.core.convert.TypeDescriptor;
 import org.springframework.core.convert.support.DefaultConversionService;
 import org.springframework.data.annotation.Reference;
 import org.springframework.data.convert.CustomConversions;
@@ -2189,6 +2190,11 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 		public org.springframework.data.util.TypeInformation<? extends S> specialize(ClassTypeInformation type) {
 			return delegate.specialize(type);
 		}
+
+		@Override
+		public TypeDescriptor toTypeDescriptor() {
+			return delegate.toTypeDescriptor();
+		}
 	}
 
 	/**

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoCustomConversions.java

@@ -166,7 +166,8 @@ public class MongoCustomConversions extends org.springframework.data.convert.Cus
 		private boolean useNativeDriverJavaTimeCodecs = false;
 		private final List<Object> customConverters = new ArrayList<>();
 
-		private PropertyValueConversions propertyValueConversions = new SimplePropertyValueConversions();
+		private final PropertyValueConversions internalValueConversion = PropertyValueConversions.simple(it -> {});
+		private PropertyValueConversions propertyValueConversions = internalValueConversion;
 
 		/**
 		 * Create a {@link MongoConverterConfigurationAdapter} using the provided {@code converters} and our own codecs for
@@ -187,7 +188,7 @@ public class MongoCustomConversions extends org.springframework.data.convert.Cus
 		}
 
 		/**
-		 * Set whether or not to use the native MongoDB Java Driver {@link org.bson.codecs.Codec codes} for
+		 * Set whether to or not to use the native MongoDB Java Driver {@link org.bson.codecs.Codec codes} for
 		 * {@link org.bson.codecs.jsr310.LocalDateCodec LocalDate}, {@link org.bson.codecs.jsr310.LocalTimeCodec LocalTime}
 		 * and {@link org.bson.codecs.jsr310.LocalDateTimeCodec LocalDateTime} using a {@link ZoneOffset#UTC}.
 		 *
@@ -327,7 +328,7 @@ public class MongoCustomConversions extends org.springframework.data.convert.Cus
 		PropertyValueConversions valueConversions() {
 
 			if (this.propertyValueConversions == null) {
-				this.propertyValueConversions = new SimplePropertyValueConversions();
+				this.propertyValueConversions = internalValueConversion;
 			}
 
 			return this.propertyValueConversions;
@@ -335,6 +336,10 @@ public class MongoCustomConversions extends org.springframework.data.convert.Cus
 
 		ConverterConfiguration createConverterConfiguration() {
 
+			if (hasDefaultPropertyValueConversions() && propertyValueConversions instanceof SimplePropertyValueConversions) {
+				((SimplePropertyValueConversions) propertyValueConversions).init();
+			}
+
 			if (!useNativeDriverJavaTimeCodecs) {
 				return new ConverterConfiguration(STORE_CONVERSIONS, this.customConverters, convertiblePair -> true,
 						this.propertyValueConversions);
@@ -391,5 +396,9 @@ public class MongoCustomConversions extends org.springframework.data.convert.Cus
 				return DateToUtcLocalDateTimeConverter.INSTANCE.convert(source).toLocalDate();
 			}
 		}
+
+		private boolean hasDefaultPropertyValueConversions() {
+			return propertyValueConversions == internalValueConversion;
+		}
 	}
 }

src/main/resources/notice.txt

@@ -1,4 +1,4 @@
-Spring Data MongoDB 3.4 M4 (2021.2.0)
+Spring Data MongoDB 3.4 RC1 (2021.2.0)
 Copyright (c) [2010-2019] Pivotal Software, Inc.
 
 This product is licensed to you under the Apache License, Version 2.0 (the "License").
@@ -34,5 +34,6 @@ conditions of the subcomponent's license, as noted in the LICENSE file.
 
 
 
+