Undo spinnaker (#45)

Remove spinnaker Gradle magic, so we can use nebula's magic per usual netflix-oss project.

build.gradle

@@ -17,23 +17,17 @@
 buildscript {
   repositories {
     jcenter()
-    maven { url "http://spinnaker.bintray.com/gradle" }
   }
   dependencies {
-    classpath 'com.netflix.spinnaker.gradle:spinnaker-gradle-project:3.10.0'
     classpath "org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion"
     classpath "com.netflix.nebula:nebula-kotlin-plugin:$kotlinVersion"
   }
 }
 
 allprojects {
   group = "com.netflix.kayenta"
-  apply plugin: 'spinnaker.project'
   apply plugin: 'groovy'
 
-  spinnaker {
-    dependenciesVersion = "0.71.0"
-  }
   test {
     testLogging {
       exceptionFormat = 'full'
@@ -44,9 +38,20 @@ allprojects {
 }
 
 subprojects { project ->
+  repositories {
+    jcenter()
+    maven { url "https://dl.bintray.com/spinnaker/spinnaker"}
+  }
   dependencies {
-    spinnaker.group('test')
-    testCompile spinnaker.dependency('groovy')
+    // spinnaker.group('test')
+    testCompile "org.springframework.boot:spring-boot-starter-test:1.2.8.RELEASE"
+    testCompile "org.spockframework:spock-core:1.1-groovy-2.4-rc-2"
+    testCompile "org.spockframework:spock-spring:1.1-groovy-2.4-rc-2"
+    testCompile "org.springframework:spring-test:4.1.9.RELEASE"
+    testCompile "cglib:cglib-nodep:3.2.0"
+    testCompile "org.objenesis:objenesis:2.1"
+    testCompile "junit:junit:4.11"
+    testCompile "org.hamcrest:hamcrest-core:1.3"
   }
 }
 

kayenta-atlas/kayenta-atlas.gradle

@@ -1,12 +1,27 @@
 dependencies {
   compile project(":kayenta-core")
-  compile spinnaker.dependency('bootWeb')
-  compile spinnaker.dependency("korkSwagger")
-  compile spinnaker.dependency('lombok')
+
+  // compile spinnaker.dependency('bootWeb')
+  compile "org.springframework.boot:spring-boot-starter-web:1.2.8.RELEASE"
+
+  // compile spinnaker.dependency("korkSwagger")
+  compile "com.netflix.spinnaker.kork:kork-swagger:1.93.0"
+
+  // compile spinnaker.dependency('lombok')
+  compile "org.projectlombok:lombok:1.16.10"
+
   compile 'com.netflix.spinnaker.orca:orca-core:2.8.3'
-  spinnaker.group('retrofitDefault')
+
+  // spinnaker.group('retrofitDefault')
+  compile "com.squareup.retrofit:retrofit:1.9.0"
+  compile "com.squareup.okhttp:okhttp:2.7.0"
+  compile "com.squareup.okhttp:okhttp-urlconnection:2.7.0"
+  compile "com.squareup.okhttp:okhttp-apache:2.7.0"
+  compile "com.squareup.retrofit:converter-jackson:1.9.0"
+  testCompile "com.squareup.retrofit:retrofit-mock:1.9.0"
 
   compile "org.apache.commons:commons-io:1.3.2"
 
-  testCompile spinnaker.dependency('groovy')
+  // testCompile spinnaker.dependency('groovy')
+  testCompile "org.codehaus.groovy:groovy-all:2.4.7"
 }

kayenta-core/kayenta-core.gradle

@@ -1,13 +1,41 @@
 dependencies {
-  compile spinnaker.dependency('jedis')
-  compile spinnaker.dependency('korkJedisTest')
-  compile spinnaker.dependency("korkWeb")
-  compile spinnaker.dependency('lombok')
+  //compile spinnaker.dependency('jedis')
+  compile "redis.clients:jedis:2.8.1"
+
+  // compile spinnaker.dependency('korkJedisTest')
+  compile "com.netflix.spinnaker.kork:kork-jedis-test:1.93.0"
+
+  // compile spinnaker.dependency("korkSwagger")
+  compile "com.netflix.spinnaker.kork:kork-swagger:1.93.0"
+
+  // this was magically pulled in before, not sure how...
+  compile "com.netflix.spinnaker.kork:kork-web:1.93.0"
+
+  // compile spinnaker.dependency('lombok')
+  compile "org.projectlombok:lombok:1.16.10"
+
   compile 'com.netflix.spinnaker.orca:orca-core:2.8.3'
   compile 'net.lariverosc:jesque-spring:1.0.1'
   compile 'net.greghaines:jesque:1.3.1'
-  spinnaker.group('bootWeb')
-  spinnaker.group('jackson')
-  spinnaker.group('retrofitDefault')
-  testCompile spinnaker.dependency('groovy')
+
+  // spinnaker.group('bootWeb')
+  compile "org.springframework.boot:spring-boot-starter-actuator:1.2.8.RELEASE"
+  compile "org.springframework.boot:spring-boot-starter-web:1.2.8.RELEASE"
+  compile "org.springframework.boot:spring-boot-starter-data-rest:1.2.8.RELEASE"
+
+  // spinnaker.group('jackson')
+  compile "com.fasterxml.jackson.core:jackson-core:2.8.7"
+  compile "com.fasterxml.jackson.core:jackson-databind:2.8.7"
+  compile "com.fasterxml.jackson.core:jackson-databind:2.8.7"
+
+  // spinnaker.group('retrofitDefault')
+  compile "com.squareup.retrofit:retrofit:1.9.0"
+  compile "com.squareup.okhttp:okhttp:2.7.0"
+  compile "com.squareup.okhttp:okhttp-urlconnection:2.7.0"
+  compile "com.squareup.okhttp:okhttp-apache:2.7.0"
+  compile "com.squareup.retrofit:converter-jackson:1.9.0"
+  testCompile "com.squareup.retrofit:retrofit-mock:1.9.0"
+
+  // testCompile spinnaker.dependency('groovy')
+  testCompile "org.codehaus.groovy:groovy-all:2.4.7"
 }

kayenta-gcs/kayenta-gcs.gradle

@@ -1,7 +1,15 @@
 dependencies {
   compile project(":kayenta-core")
   compile project(":kayenta-google")
-  compile spinnaker.dependency('bootWeb')
-  compile spinnaker.dependency('lombok')
-  spinnaker.group('google')
+
+  // compile spinnaker.dependency('bootWeb')
+  compile "org.springframework.boot:spring-boot-starter-web:1.2.8.RELEASE"
+
+  // compile spinnaker.dependency('lombok')
+  compile "org.projectlombok:lombok:1.16.10"
+
+  // spinnaker.group('google')
+  compile "com.google.apis:google-api-services-compute:alpha-rev44-1.22.0"
+  compile "com.google.http-client:google-http-client-jackson2:1.20.0"
+  compile "com.google.apis:google-api-services-storage:v1-rev86-1.22.0"
 }

kayenta-google/kayenta-google.gradle

@@ -1,8 +1,16 @@
 dependencies {
   compile project(":kayenta-core")
-  compile spinnaker.dependency('bootWeb')
-  compile spinnaker.dependency('lombok')
-  spinnaker.group('google')
+
+  // compile spinnaker.dependency('bootWeb')
+  compile "org.springframework.boot:spring-boot-starter-web:1.2.8.RELEASE"
+
+  // compile spinnaker.dependency('lombok')
+  compile "org.projectlombok:lombok:1.16.10"
+
+  // spinnaker.group('google')
+  compile "com.google.apis:google-api-services-compute:alpha-rev44-1.22.0"
+  compile "com.google.http-client:google-http-client-jackson2:1.20.0"
+  compile "com.google.apis:google-api-services-storage:v1-rev86-1.22.0"
 
   compile 'com.google.apis:google-api-services-monitoring:v3-rev35-1.22.0'
 }

kayenta-judge-netflix/kayenta-judge-netflix.gradle

@@ -1,4 +1,6 @@
 dependencies {
   compile project(":kayenta-core")
-  compile spinnaker.dependency('lombok')
+
+  // compile spinnaker.dependency('lombok')
+  compile "org.projectlombok:lombok:1.16.10"
 }

kayenta-objectstore-memory/kayenta-objectstore-memory.gradle

@@ -1,6 +1,12 @@
 dependencies {
   compile project(":kayenta-core")
-  compile spinnaker.dependency('bootWeb')
-  compile spinnaker.dependency("korkSwagger")
-  compile spinnaker.dependency('lombok')
+
+  // compile spinnaker.dependency('bootWeb')
+  compile "org.springframework.boot:spring-boot-starter-web:1.2.8.RELEASE"
+
+  // compile spinnaker.dependency("korkSwagger")
+  compile "com.netflix.spinnaker.kork:kork-swagger:1.93.0"
+
+  // compile spinnaker.dependency('lombok')
+  compile "org.projectlombok:lombok:1.16.10"
 }

kayenta-orca/kayenta-orca.gradle

@@ -4,9 +4,14 @@ dependencies {
   compile 'com.netflix.spinnaker.orca:orca-queue:2.8.3'
   compile 'com.netflix.spinnaker.orca:orca-queue-redis:2.8.3'
 
-  compile spinnaker.dependency('bootWeb')
-  compile spinnaker.dependency("korkSwagger")
-  compile spinnaker.dependency('lombok')
+  // compile spinnaker.dependency('bootWeb')
+  compile "org.springframework.boot:spring-boot-starter-web:1.2.8.RELEASE"
+
+  // compile spinnaker.dependency("korkSwagger")
+  compile "com.netflix.spinnaker.kork:kork-swagger:1.93.0"
+
+  // compile spinnaker.dependency('lombok')
+  compile "org.projectlombok:lombok:1.16.10"
 
   // TODO(duftler): Move these to spinnaker-dependencies.
   testCompile 'com.netflix.spinnaker.orca:orca-queue:2.8.3'

kayenta-stackdriver/kayenta-stackdriver.gradle

@@ -1,11 +1,22 @@
 dependencies {
   compile project(":kayenta-core")
   compile project(":kayenta-google")
-  compile spinnaker.dependency('bootWeb')
-  compile spinnaker.dependency("korkSwagger")
-  compile spinnaker.dependency('lombok')
+
+  // compile spinnaker.dependency('bootWeb')
+  compile "org.springframework.boot:spring-boot-starter-web:1.2.8.RELEASE"
+
+  // compile spinnaker.dependency("korkSwagger")
+  compile "com.netflix.spinnaker.kork:kork-swagger:1.93.0"
+
+  // compile spinnaker.dependency('lombok')
+  compile "org.projectlombok:lombok:1.16.10"
+
   compile 'com.netflix.spinnaker.orca:orca-core:2.8.3'
-  spinnaker.group('google')
+
+  // spinnaker.group('google')
+  compile "com.google.apis:google-api-services-compute:alpha-rev44-1.22.0"
+  compile "com.google.http-client:google-http-client-jackson2:1.20.0"
+  compile "com.google.apis:google-api-services-storage:v1-rev86-1.22.0"
 
   compile 'com.google.apis:google-api-services-monitoring:v3-rev35-1.22.0'
 }

kayenta-web/kayenta-web.gradle

@@ -1,5 +1,4 @@
 apply plugin: 'spring-boot'
-apply plugin: 'spinnaker.package'
 
 ext {
   springConfigLocation = System.getProperty('spring.config.location', "${System.getProperty('user.home')}/.kayenta/")
@@ -24,10 +23,17 @@ dependencies {
   compile project(':kayenta-orca')
   compile project(':kayenta-stackdriver')
 
-  compile spinnaker.dependency('bootActuator')
-  compile spinnaker.dependency('bootWeb')
-  compile spinnaker.dependency("korkSwagger")
-  compile spinnaker.dependency("korkWeb")
+  // compile spinnaker.dependency('bootActuator')
+  compile "org.springframework.boot:spring-boot-starter-actuator:1.2.8.RELEASE"
+
+  //compile spinnaker.dependency('bootWeb')
+  compile "org.springframework.boot:spring-boot-starter-web:1.2.8.RELEASE"
+
+  //compile spinnaker.dependency("korkSwagger")
+  compile "com.netflix.spinnaker.kork:kork-swagger:1.93.0"
+
+  //compile spinnaker.dependency("korkWeb")
+  compile "com.netflix.spinnaker.kork:kork-web:1.93.0"
 }
 
 tasks.bootRepackage.enabled = project.repackage