From 50518514b08078ffc65fcffac50e33717a2ae642 Mon Sep 17 00:00:00 2001
From: Johnny Lim <izeye@naver.com>
Date: Wed, 10 Jan 2018 22:33:12 +0900
Subject: [PATCH] Make GsonAutoConfiguration align with
 JacksonAutoConfiguration

See gh-11591
---
 .../boot/autoconfigure/gson/GsonAutoConfiguration.java           | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/gson/GsonAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/gson/GsonAutoConfiguration.java
index c3e2e564728..815add30fbf 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/gson/GsonAutoConfiguration.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/gson/GsonAutoConfiguration.java
@@ -43,6 +43,7 @@ import org.springframework.core.Ordered;
 public class GsonAutoConfiguration {
 
 	@Bean
+	@ConditionalOnMissingBean(GsonBuilder.class)
 	public GsonBuilder gsonBuilder(List<GsonBuilderCustomizer> customizers) {
 		GsonBuilder builder = new GsonBuilder();
 		customizers.forEach(c -> c.customize(builder));