From a8b02d9658f922dd81b198776e5008326b996169 Mon Sep 17 00:00:00 2001
From: David Crome <davcrome@gmail.com>
Date: Fri, 10 Feb 2017 15:58:44 +0100
Subject: [PATCH 1/3] Update Gradle to version 3.3

---
 gradle/wrapper/gradle-wrapper.jar        | Bin 54227 -> 54208 bytes
 gradle/wrapper/gradle-wrapper.properties |   4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 51288f9c2f05faf8d42e1a751a387ca7923882c3..a3cd7cb8f5943e797121238f3f517f04520be106 100644
GIT binary patch
delta 4720
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

delta 4781
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
N!iC)e?3Fc$=D$uhE=&Lb

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 624d9a81d..fbd7b485e 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/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

From c96469c676aa0971dbfa372f788ede76c16b5ca1 Mon Sep 17 00:00:00 2001
From: David Crome <davcrome@gmail.com>
Date: Fri, 10 Feb 2017 16:00:08 +0100
Subject: [PATCH 2/3] Update Spring Boot to 1.5.1

Set OAuth 2 Resource Filter to order 3 because it is changed with
Spring Boot 1.5.1.
---
 build.gradle                       | 12 +-----------
 src/main/resources/application.yml |  1 +
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/build.gradle b/build.gradle
index ed81af2f2..f75bff7e1 100644
--- a/build.gradle
+++ b/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'
@@ -19,10 +10,9 @@ plugins {
     id 'com.github.kt3k.coveralls' version '2.7.1'
     id 'com.jfrog.bintray' version '1.7.3'
     id 'com.github.ben-manes.versions' version '0.13.0'
+    id 'org.springframework.boot' version '1.5.1.RELEASE'
 }
 
-apply plugin: 'spring-boot'
-
 group = 'org.osiam'
 
 sourceCompatibility = 1.8
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 39d36bf0e..abf6d6cf4 100644
--- a/src/main/resources/application.yml
+++ b/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
 

From a34007f375835194e0f5d0dd443ecd122c16d6ca Mon Sep 17 00:00:00 2001
From: David Crome <davcrome@gmail.com>
Date: Fri, 10 Feb 2017 16:01:17 +0100
Subject: [PATCH 3/3] Update dependencies and plugins

---
 build.gradle | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index f75bff7e1..bb2cbca8b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,9 +7,9 @@ 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'
 }
 
@@ -96,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'
@@ -115,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'