Skip to content

Commit

Permalink
Use correct dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
IDragonfire committed May 13, 2017
1 parent 32a3f38 commit b13db73
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 14 deletions.
4 changes: 1 addition & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@ dependencies {
compile("org.springframework.boot:spring-boot-starter-web")
compile("org.springframework.boot:spring-boot-starter-jetty")
compile("org.springframework.boot:spring-boot-starter-security")
compile("org.springframework.boot:spring-boot-starter-thymeleaf")
compile("de.codecentric:spring-boot-admin-starter-client:${springBootAdminClientVersion}")

compile("com.github.FAForever:faf-java-commons:${fafCommonsVersion}")
Expand Down Expand Up @@ -191,9 +192,6 @@ dependencies {

optional("org.springframework.boot:spring-boot-configuration-processor")

compile("org.thymeleaf:thymeleaf:${thymeleafVersion}")
compile("org.thymeleaf:thymeleaf-spring4:${thymeleafVersion}")

testCompile("org.springframework.boot:spring-boot-starter-test")
testCompile("org.springframework.restdocs:spring-restdocs-mockmvc")
testCompile("org.springframework.security:spring-security-test")
Expand Down
11 changes: 0 additions & 11 deletions src/main/java/com/faforever/api/config/MvcConfig.java
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
package com.faforever.api.config;

import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.Ordered;
import org.springframework.web.servlet.config.annotation.EnableWebMvc;
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
import org.thymeleaf.templateresolver.ClassLoaderTemplateResolver;

@EnableWebMvc
@Configuration
Expand All @@ -24,13 +22,4 @@ public void addResourceHandlers(ResourceHandlerRegistry registry) {
registry.addResourceHandler("swagger-ui.html").addResourceLocations("classpath:/META-INF/resources/");
registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/");
}

@Bean
public ClassLoaderTemplateResolver templateResolver() {
ClassLoaderTemplateResolver result = new ClassLoaderTemplateResolver();
result.setPrefix("views/");
result.setSuffix(".html");
result.setTemplateMode("HTML5");
return result;
}
}
File renamed without changes.

0 comments on commit b13db73

Please sign in to comment.