Merge pull request #286 from dacrome/update-gradle-and-spring-boot

Update Gradle and Spring Boot

build.gradle

@@ -1,12 +1,3 @@
-buildscript {
-    repositories {
-        jcenter()
-    }
-    dependencies {
-        classpath("org.springframework.boot:spring-boot-gradle-plugin:1.4.1.RELEASE")
-    }
-}
-
 plugins {
     id 'antlr'
     id 'java'
@@ -16,13 +7,12 @@ plugins {
     id 'maven'
     id 'maven-publish'
     id 'com.github.hierynomus.license' version '0.13.1'
-    id 'com.github.kt3k.coveralls' version '2.7.1'
+    id 'com.github.kt3k.coveralls' version '2.8.1'
     id 'com.jfrog.bintray' version '1.7.3'
-    id 'com.github.ben-manes.versions' version '0.13.0'
+    id 'com.github.ben-manes.versions' version '0.14.0'
+    id 'org.springframework.boot' version '1.5.1.RELEASE'
 }
 
-apply plugin: 'spring-boot'
-
 group = 'org.osiam'
 
 sourceCompatibility = 1.8
@@ -106,6 +96,8 @@ configurations {
     jpaModelGen
 }
 
+ext['spock.version'] = '1.1-groovy-2.4-rc-3'
+
 dependencies {
     compile 'org.springframework.boot:spring-boot-starter-web'
     compile 'org.springframework.boot:spring-boot-starter-data-jpa'
@@ -125,8 +117,8 @@ dependencies {
     compile 'org.aspectj:aspectjweaver'
     compile 'org.hibernate:hibernate-validator'
     compile 'org.apache.tika:tika-core:1.14'
-    compile 'com.google.guava:guava:20.0'
-    compile 'org.antlr:antlr4:4.5.3'
+    compile 'com.google.guava:guava:21.0'
+    compile 'org.antlr:antlr4:4.6'
     testCompile 'org.codehaus.groovy:groovy-all'
     testCompile 'org.springframework.boot:spring-boot-starter-test'
     testCompile 'org.spockframework:spock-core'

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Nov 23 22:08:48 CET 2016
+#Fri Feb 10 15:57:45 CET 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

src/main/resources/application.yml

@@ -36,6 +36,7 @@ spring.main.banner-mode: 'off'
 spring.thymeleaf.prefix: file:${osiam.home}/templates/web/
 spring.jpa.hibernate.ddl-auto: none
 server.port: ${osiam.port:8080}
+security.oauth2.resource.filterOrder: 3
 
 management.context-path: /management