update to kork bom (#376)

* gradle 5.x

* somebody set up us the BOM

build.gradle

@@ -22,43 +22,14 @@ buildscript {
   }
   dependencies {
     classpath 'com.netflix.spinnaker.gradle:spinnaker-dev-plugin:5.2.2'
-    classpath "org.springframework.boot:spring-boot-gradle-plugin:2.1.3.RELEASE"
   }
 }
 
 allprojects {
   group = "com.netflix.spinnaker.fiat"
   apply plugin: 'spinnaker.base-project'
-  apply plugin: 'java'
+  apply plugin: 'java-library'
   apply plugin: 'groovy'
-  apply plugin: 'io.spring.dependency-management'
-
-  ext {
-    spinnakerDependenciesVersion = '2.0.0-rc.24-springBoot2'
-    if (project.hasProperty('spinnakerDependenciesVersion')) {
-      spinnakerDependenciesVersion = project.property('spinnakerDependenciesVersion')
-    }
-  }
-
-  def checkLocalVersions = [spinnakerDependenciesVersion: spinnakerDependenciesVersion]
-  if (ext.has('versions')) {
-    def extVers = ext.get('versions')
-    if (extVers instanceof Map) {
-      checkLocalVersions.putAll(extVers)
-    }
-  }
-
-  def localVersions = checkLocalVersions.findAll { it.value.endsWith('-SNAPSHOT') }
-  if (localVersions) {
-    logger.info("Enabling mavenLocal repo for $localVersions")
-    repositories {
-      mavenLocal()
-    }
-  }
-
-  spinnaker {
-    dependenciesVersion = spinnakerDependenciesVersion
-  }
 
   test {
     testLogging {
@@ -80,28 +51,23 @@ allprojects {
 
 subprojects { project ->
   dependencies {
-    spinnaker.group('test')
-
-    runtime("org.springframework.boot:spring-boot-properties-migrator:${spinnaker.version("springBoot")}") 
+    implementation platform("com.netflix.spinnaker.kork:kork-bom:4.1.0-rc.3-springBoot2")
+    compileOnly "org.projectlombok:lombok"
+    annotationProcessor platform("com.netflix.spinnaker.kork:kork-bom:4.1.0-rc.3-springBoot2")
+    annotationProcessor "org.projectlombok:lombok"
+    testAnnotationProcessor platform("com.netflix.spinnaker.kork:kork-bom:4.1.0-rc.3-springBoot2")
+    testAnnotationProcessor "org.projectlombok:lombok"
 
-    testCompile spinnaker.dependency('groovy')
-  }
-
-  //c&p this because NetflixOss reverts it to 1.7 and ends up getting applied last..
-  project.plugins.withType(JavaBasePlugin) {
-    JavaPluginConvention convention = project.convention.getPlugin(JavaPluginConvention)
-    convention.sourceCompatibility = JavaVersion.VERSION_1_8
-    convention.targetCompatibility = JavaVersion.VERSION_1_8
-  }
+    implementation "org.springframework.boot:spring-boot-properties-migrator"
 
-  configurations.all {
-    resolutionStrategy {
-      eachDependency {
-        if (it.requested.group.startsWith("com.fasterxml.jackson")) {
-          it.useVersion spinnaker.version('jackson')
-        }
-      }
-    }
+    testImplementation "org.springframework.boot:spring-boot-starter-test"
+    testImplementation "org.spockframework:spock-core"
+    testImplementation "org.spockframework:spock-spring"
+    testImplementation "org.springframework:spring-test"
+    testImplementation "org.hamcrest:hamcrest-core"
+    testRuntimeOnly "cglib:cglib-nodep"
+    testRuntimeOnly "org.objenesis:objenesis"
+    testImplementation "org.codehaus.groovy:groovy-all"
   }
 }
 

fiat-api/fiat-api.gradle

@@ -17,30 +17,29 @@
 dependencies {
   compile project(":fiat-core")
 
-  compileOnly spinnaker.dependency("bootWeb")
-  compileOnly spinnaker.dependency("frigga")
-  compileOnly spinnaker.dependency("korkSecurity")
-  compileOnly spinnaker.dependency("korkWeb")
-  compileOnly spinnaker.dependency("kork")
-  compileOnly spinnaker.dependency("lombok")
-  compileOnly spinnaker.dependency("okHttp")
-  compileOnly spinnaker.dependency("okHttpUrlconnection")
-  compileOnly spinnaker.dependency("okHttpApache")
-  compileOnly spinnaker.dependency("retrofit")
-  compileOnly spinnaker.dependency("retrofitJackson")
-  compileOnly spinnaker.dependency("spectatorApi")
+  compileOnly "org.springframework.boot:spring-boot-starter-web"
+  compileOnly "com.netflix.frigga:frigga"
+  compileOnly "com.netflix.spinnaker.kork:kork-security"
+  compileOnly "com.netflix.spinnaker.kork:kork-web"
+  compileOnly "com.netflix.spinnaker.kork:kork-core"
+  compileOnly "com.squareup.okhttp:okhttp"
+  compileOnly "com.squareup.okhttp:okhttp-urlconnection"
+  compileOnly "com.squareup.okhttp:okhttp-apache"
+  compileOnly "com.squareup.retrofit:retrofit"
+  compileOnly "com.squareup.retrofit:converter-jackson"
+  compileOnly "com.netflix.spectator:spectator-api"
 
-  compile spinnaker.dependency("guava")
-  compile spinnaker.dependency("springSecurityConfig")
-  compile spinnaker.dependency("springSecurityCore")
-  compile spinnaker.dependency("springSecurityWeb")
+  implementation "com.github.ben-manes.caffeine:guava"
+  implementation "org.springframework.security:spring-security-config"
+  implementation "org.springframework.security:spring-security-core"
+  implementation "org.springframework.security:spring-security-web"
 
-  testCompile spinnaker.dependency("retrofit")
-  testCompile spinnaker.dependency("okHttp")
-  testCompile spinnaker.dependency("slf4jApi")
-  testCompile spinnaker.dependency("frigga")
-  testCompile spinnaker.dependency("korkSecurity")
-  testCompile spinnaker.dependency("kork")
-  testCompile spinnaker.dependency("bootAutoConfigure")
-  testCompile spinnaker.dependency("spectatorApi")
+  testImplementation "com.squareup.retrofit:retrofit"
+  testImplementation "com.squareup.okhttp:okhttp"
+  testImplementation "com.netflix.frigga:frigga"
+  testImplementation "com.netflix.spinnaker.kork:kork-security"
+  testImplementation "com.netflix.spinnaker.kork:kork-core"
+  testImplementation "com.netflix.spectator:spectator-api"
+  testImplementation "org.slf4j:slf4j-api"
+  testImplementation "org.springframework.boot:spring-boot-autoconfigure"
 }

fiat-core/fiat-core.gradle

@@ -1,21 +1,17 @@
 dependencies {
 
-  compileOnly spinnaker.dependency("retrofit")
-  compileOnly spinnaker.dependency("okHttp")
-  compileOnly spinnaker.dependency("okHttpUrlconnection")
-  compileOnly spinnaker.dependency("okHttpApache")
-  compileOnly spinnaker.dependency("retrofitJackson")
+  compileOnly "com.squareup.retrofit:retrofit"
+  compileOnly "com.squareup.okhttp:okhttp"
+  compileOnly "com.squareup.okhttp:okhttp-urlconnection"                                            
+  compileOnly "com.squareup.okhttp:okhttp-apache"
+  compileOnly "com.squareup.retrofit:converter-jackson"
 
-  compileOnly spinnaker.dependency("lombok")
+  implementation "org.apache.commons:commons-lang3"
+  implementation "org.slf4j:slf4j-api"
+  implementation "com.github.ben-manes.caffeine:guava"
 
-  compile spinnaker.dependency("commonsLang")
-  compile spinnaker.dependency("slf4jApi")
-  compile spinnaker.dependency("guava")
-
-  testCompile spinnaker.dependency("spockSpring")
-  testCompile spinnaker.dependency("commonsIo")
-  testCompile spinnaker.dependency("retrofitJackson")
-  spinnaker.group("test")
-  testCompile spinnaker.dependency("bootAutoConfigure")
-  testCompile spinnaker.dependency("bootActuator")
+  testImplementation "commons-io:commons-io"
+  testImplementation "com.squareup.retrofit:converter-jackson"
+  testImplementation "org.springframework.boot:spring-boot-autoconfigure"
+  testImplementation "org.springframework.boot:spring-boot-starter-actuator"
 }

fiat-file/fiat-file.gradle

@@ -15,9 +15,15 @@
  */
 
 dependencies {
-  compile project(":fiat-roles")
-  compile "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${spinnaker.version('jackson')}"
+  implementation project(":fiat-roles")
+  implementation project(":fiat-api")
+  implementation "com.fasterxml.jackson.core:jackson-core"
+  implementation "com.fasterxml.jackson.core:jackson-databind"
+  implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml"
+  implementation "commons-io:commons-io"
+  implementation "org.springframework.boot:spring-boot-autoconfigure"
+  implementation "org.slf4j:slf4j-api"
 
-  compileOnly spinnaker.dependency("lombok")
+  testImplementation "com.github.ben-manes.caffeine:guava"
 
 }

fiat-github/fiat-github.gradle

@@ -1,12 +1,10 @@
 dependencies {
-  compile project(":fiat-core")
-  compile project(":fiat-roles")
+  implementation project(":fiat-core")
+  implementation project(":fiat-roles")
 
-  compile spinnaker.dependency("bootWeb")
-  compile spinnaker.dependency("commonsLang")
-  compile spinnaker.dependency("guava")
-  compile spinnaker.dependency("retrofit")
-  compile spinnaker.dependency("retrofitJackson")
-
-  compileOnly spinnaker.dependency("lombok")
+  implementation "org.springframework.boot:spring-boot-starter-web"
+  implementation "org.apache.commons:commons-lang3"
+  implementation "com.github.ben-manes.caffeine:guava"
+  implementation "com.squareup.retrofit:retrofit"
+  implementation "com.squareup.retrofit:converter-jackson"
 }

fiat-google-groups/fiat-google-groups.gradle

@@ -15,14 +15,11 @@
  */
 
 dependencies {
-  compile project(":fiat-roles")
-  compile project(":fiat-core")
+  implementation project(":fiat-roles")
+  implementation project(":fiat-core")
 
-  compileOnly spinnaker.dependency("lombok")
-
-  compile spinnaker.dependency("bootWeb")
-  compile spinnaker.dependency("commonsLang")
-  compile spinnaker.dependency("googleApiClient")
-
-  compile "com.google.apis:google-api-services-admin-directory:directory_v1-rev105-1.25.0"
+  implementation "org.springframework.boot:spring-boot-starter-web"
+  implementation "org.apache.commons:commons-lang3"
+  implementation "com.google.api-client:google-api-client"
+  implementation "com.google.apis:google-api-services-admin-directory:directory_v1-rev105-1.25.0"
 }

fiat-ldap/fiat-ldap.gradle

@@ -15,17 +15,16 @@
  */
 
 dependencies {
-  compile project(":fiat-roles")
+  implementation project(":fiat-roles")
+  implementation project(":fiat-api")
 
-  compileOnly spinnaker.dependency("retrofit")
-  compileOnly spinnaker.dependency("okHttp")
-  compileOnly spinnaker.dependency("okHttpUrlconnection")
-  compileOnly spinnaker.dependency("okHttpApache")
-  compileOnly spinnaker.dependency("retrofitJackson")
+  compileOnly "com.squareup.retrofit:retrofit"
+  compileOnly "com.squareup.okhttp:okhttp"
+  compileOnly "com.squareup.okhttp:okhttp-urlconnection"
+  compileOnly "com.squareup.okhttp:okhttp-apache"
+  compileOnly "com.squareup.retrofit:converter-jackson"
 
-  compileOnly spinnaker.dependency("lombok")
-
-  compile "org.springframework.security:spring-security-ldap:${spinnaker.version('springSecurity')}"
-
-  spinnaker.group("spockBase")
+  implementation "org.apache.commons:commons-lang3"
+  implementation "org.springframework.boot:spring-boot-autoconfigure"
+  implementation "org.springframework.security:spring-security-ldap"
 }

fiat-roles/fiat-roles.gradle

@@ -15,20 +15,23 @@
  */
 
 dependencies {
-  compile project(":fiat-core")
+  implementation project(":fiat-core")
 
-  spinnaker.group("retrofitDefault")
+  implementation "com.squareup.retrofit:retrofit"
+  implementation "com.squareup.retrofit:converter-jackson"
+  implementation "com.squareup.okhttp:okhttp"
+  implementation "com.squareup.okhttp:okhttp-urlconnection"
+  implementation "com.squareup.okhttp:okhttp-apache"
 
-  compileOnly spinnaker.dependency("lombok")
+  implementation "org.springframework.boot:spring-boot-starter-actuator"
+  implementation "org.springframework.boot:spring-boot-starter-web"
 
-  compile spinnaker.dependency("bootActuator")
-  compile spinnaker.dependency("bootWeb")
-  compile spinnaker.dependency("googleApiClient")
-  compile spinnaker.dependency("korkDynomite")
-  compile spinnaker.dependency("korkHystrix")
-  compile spinnaker.dependency("korkJedis")
-  compile "redis.clients:jedis:2.9.3"
+  implementation "com.netflix.spinnaker.kork:kork-dynomite"
+  implementation "com.netflix.spinnaker.kork:kork-hystrix"
+  implementation "com.netflix.spinnaker.kork:kork-jedis"
+  implementation "redis.clients:jedis"
+  implementation "com.google.api-client:google-api-client:1.28.0"
 
-  testCompile spinnaker.dependency("korkJedisTest")
-  testCompile "org.apache.commons:commons-collections4:4.1"
+  testImplementation "com.netflix.spinnaker.kork:kork-jedis-test"
+  testImplementation "org.apache.commons:commons-collections4:4.1"
 }

fiat-web/fiat-web.gradle

@@ -17,27 +17,31 @@ configurations.all {
 }
 
 dependencies {
-  spinnaker.group('retrofitDefault')
-
-  compileOnly spinnaker.dependency("lombok")
-
-  compile spinnaker.dependency('bootActuator')
-  compile spinnaker.dependency('bootWeb')
-  compile spinnaker.dependency('kork')
-  compile spinnaker.dependency('korkWeb')
-  compile spinnaker.dependency("korkStackdriver")
-  compile spinnaker.dependency("korkSwagger")
-
-  compile project(':fiat-core')
-  compile project(':fiat-api')
-  compile project(':fiat-roles')
+  implementation "com.squareup.retrofit:retrofit"
+  implementation "com.squareup.retrofit:converter-jackson"
+  implementation "com.squareup.okhttp:okhttp"
+  implementation "com.squareup.okhttp:okhttp-urlconnection"
+  implementation "com.squareup.okhttp:okhttp-apache"
+
+  implementation "org.springframework.boot:spring-boot-starter-actuator"
+  implementation "org.springframework.boot:spring-boot-starter-web"
+  implementation "com.netflix.spinnaker.kork:kork-core"
+  implementation "com.netflix.spinnaker.kork:kork-web"
+  implementation "com.netflix.spinnaker.kork:kork-stackdriver"
+  implementation "com.netflix.spinnaker.kork:kork-swagger"
+
+  implementation project(':fiat-core')
+  implementation project(':fiat-api')
+  implementation project(':fiat-roles')
 
   // Add each included authz provider as a runtime dependency
   gradle.includedProviderProjects.each {
-    runtime project(it)
+    implementation project(it)
   }
 
-  testCompile spinnaker.dependency('korkJedisTest')
+  testImplementation "com.netflix.spinnaker.kork:kork-jedis"
+  testImplementation "com.netflix.spinnaker.kork:kork-jedis-test"
+  testImplementation "com.netflix.spinnaker.kork:kork-hystrix"
 }
 
 applicationName = 'fiat'

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,5 +1,21 @@
 #!/usr/bin/env sh
 
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"