Merge 7e91830 into ff70750

build.gradle

@@ -217,6 +217,7 @@ dependencies {
   compile("org.springframework.boot:spring-boot-starter-security")
   compile("org.springframework.boot:spring-boot-starter-thymeleaf")
   compile("org.springframework.boot:spring-boot-starter-mail")
+  compile("de.codecentric:spring-boot-admin-starter-client:${springBootAdminClientVersion}")
 
   compile("com.github.ben-manes.caffeine:caffeine")
   compile("com.github.FAForever:faf-java-commons:${fafCommonsVersion}")
@@ -238,9 +239,6 @@ dependencies {
   compile("com.yahoo.elide:elide-swagger:${elideVersion}")
   compile("com.yahoo.elide:elide-datastore-hibernate5:${elideVersion}")
 //  compile("org.glassfish.jersey.core:jersey-common:2.26")
-  compile("com.zaxxer:HikariCP:${hikariCpVersion}") {
-    exclude(module: 'tools')
-  }
 
   compile("org.luaj:luaj-jse:${luajVersion}")
   compile("com.github.micheljung:nocatch:${nocatchVersion}")

gradle.properties

@@ -1,5 +1,5 @@
 profile=dev
-springBootVersion=2.0.4.RELEASE
+springBootVersion=2.0.5.RELEASE
 jjwtVersion=0.7.0
 javaxInjectVersion=1
 elideVersion=4.2.3
@@ -8,13 +8,12 @@ propdepsVersion=0.0.7
 swaggerVersion=2.6.1
 swaggerCoreVersion=1.5.8
 coverallsGradlePluginVersion=2.4.0
-hikariCpVersion=2.4.6
 springSecurityJwtVersion=1.0.9.RELEASE
 springSecurityOauth2AutoConfigureVersion=2.0.1.RELEASE
 springSecurityOauth2Version=2.3.3.RELEASE
 guavaVersion=21.0-rc1
 jetbrainsAnnotationsVersion=13.0
-springBootAdminClientVersion=2.0.0
+springBootAdminClientVersion=2.0.3
 luajVersion=3.0.1
 nocatchVersion=1.1
 junitAddonsVersion=1.4
@@ -33,4 +32,4 @@ thymeleafVersion=3.0.5.RELEASE
 jsonapiConverterVersion=0.8
 codacyCoverageReporterVersion=4.0.0
 jsonVersion=20180130
-javaxInterceptorApiVersion=1.2
+javaxInterceptorApiVersion=1.2