From eb97a13273b47e4d572a716fc59e8055b7312f82 Mon Sep 17 00:00:00 2001
From: Greg Turnquist <gturnquist@pivotal.io>
Date: Fri, 2 Nov 2018 11:09:57 -0500
Subject: [PATCH 1/2] DATAJDBC-288 - Prepare branch

---
 pom.xml                        | 2 +-
 spring-data-jdbc/pom.xml       | 4 ++--
 spring-data-relational/pom.xml | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index bb3e4a50ef..58ef64fca1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-relational-parent</artifactId>
-	<version>1.1.0.BUILD-SNAPSHOT</version>
+	<version>1.1.0.DATAJDBC-288-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>Spring Data Relational Parent</name>
diff --git a/spring-data-jdbc/pom.xml b/spring-data-jdbc/pom.xml
index 9458230173..02cc2183df 100644
--- a/spring-data-jdbc/pom.xml
+++ b/spring-data-jdbc/pom.xml
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<artifactId>spring-data-jdbc</artifactId>
-	<version>1.1.0.BUILD-SNAPSHOT</version>
+	<version>1.1.0.DATAJDBC-288-SNAPSHOT</version>
 
 	<name>Spring Data JDBC</name>
 	<description>Spring Data module for JDBC repositories.</description>
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-relational-parent</artifactId>
-		<version>1.1.0.BUILD-SNAPSHOT</version>
+		<version>1.1.0.DATAJDBC-288-SNAPSHOT</version>
 	</parent>
 
 	<properties>
diff --git a/spring-data-relational/pom.xml b/spring-data-relational/pom.xml
index 11e7db737c..0bfe9a8f04 100644
--- a/spring-data-relational/pom.xml
+++ b/spring-data-relational/pom.xml
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<artifactId>spring-data-relational</artifactId>
-	<version>1.1.0.BUILD-SNAPSHOT</version>
+	<version>1.1.0.DATAJDBC-288-SNAPSHOT</version>
 
 	<name>Spring Data Relational</name>
 	<description>Spring Data Relational support</description>
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-relational-parent</artifactId>
-		<version>1.1.0.BUILD-SNAPSHOT</version>
+		<version>1.1.0.DATAJDBC-288-SNAPSHOT</version>
 	</parent>
 
 	<properties>

From b0579cb1386833f40aee38004f6b726f10081b01 Mon Sep 17 00:00:00 2001
From: Greg Turnquist <gturnquist@pivotal.io>
Date: Fri, 2 Nov 2018 11:41:47 -0500
Subject: [PATCH 2/2] DATAJDBC-288 - Make JdbcConfiguration methods public.

---
 .../data/jdbc/repository/config/JdbcConfiguration.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/config/JdbcConfiguration.java b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/config/JdbcConfiguration.java
index 334bd2af43..d053452b45 100644
--- a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/config/JdbcConfiguration.java
+++ b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/config/JdbcConfiguration.java
@@ -15,8 +15,6 @@
  */
 package org.springframework.data.jdbc.repository.config;
 
-import java.util.Optional;
-
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.convert.converter.Converter;
@@ -27,6 +25,8 @@
 import org.springframework.data.relational.core.mapping.NamingStrategy;
 import org.springframework.data.relational.core.mapping.RelationalMappingContext;
 
+import java.util.Optional;
+
 /**
  * Beans that must be registered for Spring Data JDBC to work.
  *
@@ -46,7 +46,7 @@ public class JdbcConfiguration {
 	 * @return must not be {@literal null}.
 	 */
 	@Bean
-	protected JdbcMappingContext jdbcMappingContext(Optional<NamingStrategy> namingStrategy) {
+	public JdbcMappingContext jdbcMappingContext(Optional<NamingStrategy> namingStrategy) {
 
 		JdbcMappingContext mappingContext = new JdbcMappingContext(namingStrategy.orElse(NamingStrategy.INSTANCE));
 		mappingContext.setSimpleTypeHolder(jdbcCustomConversions().getSimpleTypeHolder());
@@ -63,7 +63,7 @@ protected JdbcMappingContext jdbcMappingContext(Optional<NamingStrategy> namingS
 	 * @return must not be {@literal null}.
 	 */
 	@Bean
-	protected RelationalConverter relationalConverter(RelationalMappingContext mappingContext) {
+	public RelationalConverter relationalConverter(RelationalMappingContext mappingContext) {
 		return new BasicJdbcConverter(mappingContext, jdbcCustomConversions());
 	}
 
@@ -75,7 +75,7 @@ protected RelationalConverter relationalConverter(RelationalMappingContext mappi
 	 * @return must not be {@literal null}.
 	 */
 	@Bean
-	protected JdbcCustomConversions jdbcCustomConversions() {
+	public JdbcCustomConversions jdbcCustomConversions() {
 		return new JdbcCustomConversions();
 	}
 }