From 1170f93261bb46b72130e8f0c8f51d7c12c43a73 Mon Sep 17 00:00:00 2001
From: "Michael J. Simons" <michael@simons.ac>
Date: Fri, 21 Sep 2018 10:24:02 +0200
Subject: [PATCH 1/2] DATAJDBC-267 - Prepare branch

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 9b63bcc527..0c35643e03 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>org.springframework.data</groupId>
     <artifactId>spring-data-jdbc</artifactId>
-    <version>1.0.0.BUILD-SNAPSHOT</version>
+    <version>1.0.0.DATAJDBC-267-SNAPSHOT</version>
 
 	<name>Spring Data JDBC</name>
 	<description>Spring Data module for JDBC repositories.</description>

From 255b03c5f3c582fc66697300e9043f80f79aad2c Mon Sep 17 00:00:00 2001
From: "Michael J. Simons" <michael@simons.ac>
Date: Fri, 21 Sep 2018 11:04:50 +0200
Subject: [PATCH 2/2] DATAJDBC-267 - Explicitly use the own custom conversions
 bean.

---
 .../jdbc/repository/config/JdbcConfiguration.java   | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/springframework/data/jdbc/repository/config/JdbcConfiguration.java b/src/main/java/org/springframework/data/jdbc/repository/config/JdbcConfiguration.java
index 5432325edb..b1157d5cc7 100644
--- a/src/main/java/org/springframework/data/jdbc/repository/config/JdbcConfiguration.java
+++ b/src/main/java/org/springframework/data/jdbc/repository/config/JdbcConfiguration.java
@@ -33,31 +33,30 @@
  * @author Greg Turnquist
  * @author Jens Schauder
  * @author Mark Paluch
+ * @author Michael Simons
  */
 @Configuration
 public class JdbcConfiguration {
 
 	@Bean
-	protected RelationalMappingContext jdbcMappingContext(Optional<NamingStrategy> namingStrategy,
-			CustomConversions customConversions) {
+	protected RelationalMappingContext jdbcMappingContext(Optional<NamingStrategy> namingStrategy) {
 
 		RelationalMappingContext mappingContext = new RelationalMappingContext(
 				namingStrategy.orElse(NamingStrategy.INSTANCE));
-		mappingContext.setSimpleTypeHolder(customConversions.getSimpleTypeHolder());
+		mappingContext.setSimpleTypeHolder(jdbcCustomConversions().getSimpleTypeHolder());
 
 		return mappingContext;
 	}
 
 	@Bean
-	protected RelationalConverter relationalConverter(RelationalMappingContext mappingContext,
-			CustomConversions customConversions) {
-		return new BasicRelationalConverter(mappingContext, customConversions);
+	protected RelationalConverter relationalConverter(RelationalMappingContext mappingContext) {
+		return new BasicRelationalConverter(mappingContext, jdbcCustomConversions());
 	}
 
 	/**
 	 * Register custom {@link Converter}s in a {@link CustomConversions} object if required. These
 	 * {@link CustomConversions} will be registered with the
-	 * {@link #relationalConverter(RelationalMappingContext, CustomConversions)}. Returns an empty
+	 * {@link #relationalConverter(RelationalMappingContext)}. Returns an empty
 	 * {@link JdbcCustomConversions} instance by default.
 	 *
 	 * @return must not be {@literal null}.