root
/
spring-boot
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch '1.4.x' into 1.5.x

Browse Source
pull/8274/head
Andy Wilkinson 8 years ago
parent d42a54e880 06017f688a
commit e891fe0584
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File

6
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/social/SocialWebAutoConfiguration.java
Unescape Escape View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2016 the original author or authors. * Copyright 2012-2017 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -18,7 +18,7 @@ package org.springframework.boot.autoconfigure.social;
import java.util.List; import java.util.List;
import org.thymeleaf.spring4.SpringTemplateEngine; import org.thymeleaf.spring4.resourceresolver.SpringResourceResourceResolver;
import org.springframework.beans.factory.ObjectProvider; import org.springframework.beans.factory.ObjectProvider;
import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.AutoConfigureAfter;
@ -164,7 +164,7 @@ public class SocialWebAutoConfiguration {
} }
@Configuration @Configuration
@ConditionalOnClass(SpringTemplateEngine.class) @ConditionalOnClass(SpringResourceResourceResolver.class)
protected static class SpringSocialThymeleafConfig { protected static class SpringSocialThymeleafConfig {
@Bean @Bean

Write Preview
Loading…
Cancel
Save