From 2859fd2e9e1b499730e2475e6e2aa54c0df80b1b Mon Sep 17 00:00:00 2001 From: Brutus5000 Date: Sat, 27 Oct 2018 23:42:15 +0200 Subject: [PATCH] Security maintenance dependency upgrade --- gradle.properties | 26 +++++++++---------- .../swagger/ElideSwaggerResourceProvider.java | 5 ++-- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/gradle.properties b/gradle.properties index b45a1a2e1..70bfdcfc5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,19 +1,18 @@ profile=dev -springBootVersion=2.0.5.RELEASE -jjwtVersion=0.7.0 +springBootVersion=2.0.6.RELEASE javaxInjectVersion=1 -elideVersion=4.2.8 -mysqlConnectorVersion=6.0.5 +elideVersion=4.2.10 +mysqlConnectorVersion=6.0.6 propdepsVersion=0.0.7 -swaggerVersion=2.6.1 -swaggerCoreVersion=1.5.8 +swaggerVersion=2.9.2 +swaggerCoreVersion=1.5.21 coverallsGradlePluginVersion=2.4.0 springSecurityJwtVersion=1.0.9.RELEASE -springSecurityOauth2AutoConfigureVersion=2.0.1.RELEASE -springSecurityOauth2Version=2.3.3.RELEASE -guavaVersion=21.0-rc1 +springSecurityOauth2AutoConfigureVersion=2.0.6.RELEASE +springSecurityOauth2Version=2.3.4.RELEASE +guavaVersion=27.0-jre jetbrainsAnnotationsVersion=13.0 -springBootAdminClientVersion=2.0.3 +springBootAdminClientVersion=2.0.4 luajVersion=3.0.1 nocatchVersion=1.1 junitAddonsVersion=1.4 @@ -22,14 +21,13 @@ githubApiVersion=1.84 jgitVersionn=4.5.0.201609210915-r fafCommonsVersion=8dd4a6c991fd607153d8f7cd4bf43180c1f8a912 h2Version=1.4.193 -jacksonDatatypeJsr310Version=2.8.11 +jacksonDatatypeJsr310Version=2.9.7 mockitoVersion=2.19.0 lutungVersion=0.0.7 commonsCompressVersion=1.13 jsonPath=2.2.0 jsonPathAssert=2.2.0 -thymeleafVersion=3.0.5.RELEASE -jsonapiConverterVersion=0.8 +jsonapiConverterVersion=0.9 codacyCoverageReporterVersion=4.0.0 -jsonVersion=20180130 +jsonVersion=20180813 javaxInterceptorApiVersion=1.2 diff --git a/src/main/java/com/faforever/api/config/swagger/ElideSwaggerResourceProvider.java b/src/main/java/com/faforever/api/config/swagger/ElideSwaggerResourceProvider.java index de6847625..f7ac8b6ed 100644 --- a/src/main/java/com/faforever/api/config/swagger/ElideSwaggerResourceProvider.java +++ b/src/main/java/com/faforever/api/config/swagger/ElideSwaggerResourceProvider.java @@ -1,6 +1,7 @@ package com.faforever.api.config.swagger; import org.springframework.context.annotation.Primary; +import org.springframework.core.env.Environment; import org.springframework.stereotype.Component; import springfox.documentation.spring.web.DocumentationCache; import springfox.documentation.swagger.web.InMemorySwaggerResourcesProvider; @@ -11,8 +12,8 @@ @Component @Primary public class ElideSwaggerResourceProvider extends InMemorySwaggerResourcesProvider { - public ElideSwaggerResourceProvider(DocumentationCache documentationCache) { - super(documentationCache); + public ElideSwaggerResourceProvider(Environment environment, DocumentationCache documentationCache) { + super(environment, documentationCache); } @Override