aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--build.gradle2
-rw-r--r--juick-api/build.gradle2
-rw-r--r--juick-server-web/src/main/java/com/juick/server/configuration/BaseWebConfiguration.java5
3 files changed, 4 insertions, 5 deletions
diff --git a/build.gradle b/build.gradle
index c1188e89..78dbed67 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,7 +21,7 @@ allprojects {
}
project.ext {
- springFrameworkVersion = '4.3.11.RELEASE'
+ springFrameworkVersion = '5.0.0.RELEASE'
springSecurityVersion = '4.2.3.RELEASE'
jacksonVersion = '2.9.1'
slf4jVersion = '1.7.25'
diff --git a/juick-api/build.gradle b/juick-api/build.gradle
index 99c35b93..0f351387 100644
--- a/juick-api/build.gradle
+++ b/juick-api/build.gradle
@@ -24,7 +24,7 @@ dependencies {
testCompile project(path: ':juick-server-web', configuration: 'testArtifacts')
testCompile project(path: ':juick-server-jdbc', configuration: 'testArtifacts')
- testRuntime 'org.apache.tomcat:tomcat-websocket:8.5.21'
+ testRuntime 'org.apache.tomcat:tomcat-websocket:8.5.23'
testRuntime 'com.jayway.jsonpath:json-path:2.4.0'
}
diff --git a/juick-server-web/src/main/java/com/juick/server/configuration/BaseWebConfiguration.java b/juick-server-web/src/main/java/com/juick/server/configuration/BaseWebConfiguration.java
index b702a5f1..a2422df9 100644
--- a/juick-server-web/src/main/java/com/juick/server/configuration/BaseWebConfiguration.java
+++ b/juick-server-web/src/main/java/com/juick/server/configuration/BaseWebConfiguration.java
@@ -28,7 +28,7 @@ import org.springframework.http.converter.json.MappingJackson2HttpMessageConvert
import org.springframework.web.multipart.MultipartResolver;
import org.springframework.web.multipart.commons.CommonsMultipartResolver;
import org.springframework.web.servlet.config.annotation.PathMatchConfigurer;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
import java.util.List;
@@ -36,7 +36,7 @@ import java.util.List;
* Created by vitalyster on 28.06.2016.
*/
@Configuration
-public class BaseWebConfiguration extends WebMvcConfigurerAdapter {
+public class BaseWebConfiguration implements WebMvcConfigurer {
@Override
@@ -48,7 +48,6 @@ public class BaseWebConfiguration extends WebMvcConfigurerAdapter {
public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter(jsonMapper());
converters.add(converter);
- super.configureMessageConverters(converters);
}
@Bean