Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.2.x'

Browse Source
This commit is contained in:
Andy Wilkinson
2015-04-08 15:57:13 +01:00
parent 507520aab9 b45bb6d082
commit 2a5eecaf4a
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/GsonHttpMessageConvertersConfiguration.java
View File

@@ -36,10 +36,10 @@ import com.google.gson.Gson;
* @since 1.2.2 * @since 1.2.2
*/ */
@Configuration @Configuration
@ConditionalOnClass(Gson.class)
class GsonHttpMessageConvertersConfiguration { class GsonHttpMessageConvertersConfiguration {
@Configuration @Configuration
@ConditionalOnClass(Gson.class)
@ConditionalOnBean(Gson.class) @ConditionalOnBean(Gson.class)
@Conditional(PreferGsonOrMissingJacksonCondition.class) @Conditional(PreferGsonOrMissingJacksonCondition.class)
protected static class GsonHttpMessageConverterConfiguration { protected static class GsonHttpMessageConverterConfiguration {