updates to latest gradle and project plugin

introduces cats-test library with shared test code instead of building and consuming
test jars out of cats core and cats redis

Author: cfieber

build.gradle

@@ -27,14 +27,14 @@ buildscript {
     maven { url "http://dl.bintray.com/spinnaker/gradle" }
   }
   dependencies {
-    classpath 'com.netflix.spinnaker:spinnaker-gradle-project:1.12.115'
+    classpath 'com.netflix.spinnaker.gradle:spinnaker-gradle-project:2.2.0'
     classpath "org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}"
   }
 }
 
 allprojects {
   group = "com.netflix.spinnaker.clouddriver"
-  apply plugin: 'spinnaker-gradle-project'
+  apply plugin: 'spinnaker.project'
   apply plugin: 'idea'
 }
 
@@ -44,13 +44,14 @@ subprojects { project ->
   targetCompatibility = 1.8
   sourceCompatibility = 1.8
 
-
+/*
   repositories {
     maven { url 'http://oss.jfrog.org/repo' }
     jcenter()
     maven { url 'http://dl.bintray.com/spinnaker/spinnaker' }
     maven { url 'http://repo.spring.io/repo' }
   }
+*/
 
   configurations {
     all {
@@ -88,5 +89,4 @@ subprojects { project ->
   }
 }
 
-tasks.checkSnapshotDependencies.enabled = false
 defaultTasks ':clouddriver-web:bootRun'

cats/cats-core/cats-core.gradle

@@ -1,3 +1,5 @@
 dependencies {
   compile spinnaker.dependency("frigga")
-}
+
+  testCompile project(":cats:cats-test")
+}

cats/cats-redis/cats-redis.gradle

@@ -2,5 +2,5 @@ dependencies {
     compile project(':cats:cats-core')
     compile 'redis.clients:jedis:2.6.2'
     compile 'com.fasterxml.jackson.core:jackson-databind:2.5.3'
-    testCompile project(path: ':cats:cats-core', configuration: 'test')
+    testCompile project(':cats:cats-test')
 }

cats/cats-test/cats-test.gradle

@@ -0,0 +1,7 @@
+tasks.compileGroovy.enabled = true
+
+dependencies {
+  compile project(":cats:cats-core")
+  compile spinnaker.dependency('groovy')
+  compile spinnaker.dependency('spock')
+}

cats/cats-core/src/test/groovy/com/netflix/spinnaker/cats/cache/CacheSpec.groovy renamed to cats/cats-test/src/main/groovy/com/netflix/spinnaker/cats/cache/CacheSpec.groovy

@@ -1,10 +1,9 @@
 subprojects {
   apply plugin: 'findbugs'
   apply plugin: 'pmd'
-  apply plugin: 'nebula-test-jar'
 
   dependencies {
-    testCompile 'org.spockframework:spock-core:0.7-groovy-2.0'
+    testCompile 'org.spockframework:spock-core:1.0-groovy-2.3'
     testCompile 'cglib:cglib-nodep:3.1'
     testCompile 'org.objenesis:objenesis:2.1'
     pmd 'net.sourceforge.pmd:pmd:5.1.3'

cats/cats-core/src/test/groovy/com/netflix/spinnaker/cats/cache/WriteableCacheSpec.groovy renamed to cats/cats-test/src/main/groovy/com/netflix/spinnaker/cats/cache/WriteableCacheSpec.groovy

@@ -1,6 +1,5 @@
 dependencies {
   compile project(":clouddriver-core")
-  spinnaker.group('cf')
   compile spinnaker.dependency('frigga')
   compile spinnaker.dependency('bootActuator')
   compile spinnaker.dependency('bootWeb')

cats/cats-redis/src/test/groovy/com/netflix/spinnaker/cats/redis/test/LocalRedisCheck.groovy renamed to cats/cats-test/src/main/groovy/com/netflix/spinnaker/cats/redis/test/LocalRedisCheck.groovy

@@ -7,5 +7,5 @@ dependencies {
 
   testCompile project(':clouddriver-aws')
   testCompile project(':clouddriver-google')
-  testCompile project(path: ':cats:cats-core', configuration: 'test')
+  testCompile project(':cats:cats-test')
 }

cats/cats-core/src/test/groovy/com/netflix/spinnaker/cats/test/ManualRunnableScheduler.groovy renamed to cats/cats-test/src/main/groovy/com/netflix/spinnaker/cats/test/ManualRunnableScheduler.groovy

@@ -1,5 +1,5 @@
 apply plugin: 'spring-boot'
-apply plugin: 'spinnaker-debpublish'
+apply plugin: 'nebula.ospackage'
 apply plugin: 'groovy'
 
 ext {
@@ -61,7 +61,7 @@ startScripts {
 
 ospackage {
   packageName = project.applicationName
-  version = project.version.replaceAll('-SNAPSHOT', '')
+  version = project.version
   release '4'
   into "/opt/${project.applicationName}"
   from ("${project.buildDir}/install/${project.applicationName}")

cats/cats-core/src/test/groovy/com/netflix/spinnaker/cats/test/TestAccountAwareAgent.groovy renamed to cats/cats-test/src/main/groovy/com/netflix/spinnaker/cats/test/TestAccountAwareAgent.groovy

@@ -1,6 +1,6 @@
-#Thu Jul 24 15:06:33 PDT 2014
+#Thu Nov 12 16:18:37 PST 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-1.12-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-bin.zip

cats/cats-core/src/test/groovy/com/netflix/spinnaker/cats/test/TestAgent.groovy renamed to cats/cats-test/src/main/groovy/com/netflix/spinnaker/cats/test/TestAgent.groovy

@@ -42,11 +42,6 @@ case "`uname`" in
     ;;
 esac
 
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
 # Attempt to set APP_HOME
 # Resolve links: $0 may be a link
 PRG="$0"
@@ -61,9 +56,9 @@ while [ -h "$PRG" ] ; do
     fi
 done
 SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
+cd "`dirname \"$PRG\"`/" >/dev/null
 APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
+cd "$SAVED" >/dev/null
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
@@ -114,6 +109,7 @@ fi
 if $cygwin ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
     ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`

cats/cats-core/src/test/groovy/com/netflix/spinnaker/cats/test/TestAgentSchedulerAwareProvider.groovy renamed to cats/cats-test/src/main/groovy/com/netflix/spinnaker/cats/test/TestAgentSchedulerAwareProvider.groovy

@@ -5,6 +5,4 @@ dependencies {
   compile spinnaker.dependency('bootActuator')
   compile project(":clouddriver-cf")
   compile("org.cloudfoundry:cloudfoundry-client-lib:${cloudFoundryClientVersion}")
-
-  spinnaker.group("cf")
 }

cats/cats-core/src/test/groovy/com/netflix/spinnaker/cats/test/TestProvider.groovy renamed to cats/cats-test/src/main/groovy/com/netflix/spinnaker/cats/test/TestProvider.groovy

@@ -18,5 +18,5 @@ dependencies {
   compile project(":kato:kato-core")
   compile spinnaker.dependency('jedis')
 
-  testCompile project(path: ':cats:cats-redis', configuration: 'test')
+  testCompile project(':cats:cats-test')
 }

cats/cats-core/src/test/groovy/com/netflix/spinnaker/cats/test/TestProviderRegistry.groovy renamed to cats/cats-test/src/main/groovy/com/netflix/spinnaker/cats/test/TestProviderRegistry.groovy

@@ -36,45 +36,3 @@ dependencies {
   testCompile ("org.springframework.boot:spring-boot-starter-test")
 }
 
-/*
-applicationName = 'kato'
-applicationDefaultJvmArgs = ["-Djava.security.egd=file:/dev/./urandom"]
-applicationDistribution.from(project.file('config')) {
-  into 'config'
-}
-*/
-
-sourceSets {
-  main {
-    resources {
-      srcDir 'src/main/resources'
-      srcDir 'config'
-    }
-  }
-}
-
-jar {
-  doFirst {
-    exclude "${rootProject.name}.yml"
-  }
-}
-/*
-startScripts {
-  doLast {
-    unixScript.text = unixScript.text.replace('CLASSPATH=$APP_HOME', 'CLASSPATH=$APP_HOME/config:$APP_HOME')
-    windowsScript.text = windowsScript.text.replace('set CLASSPATH=', 'set CLASSPATH=%APP_HOME%\\config;')
-  }
-}
-
-ospackage {
-  packageName = project.applicationName
-  version = project.version.replaceAll('-SNAPSHOT', '')
-  release '3'
-  into "/opt/${project.applicationName}"
-  from ("${project.buildDir}/install/${project.applicationName}")
-}
-
-buildDeb {
-  dependsOn installApp
-}
-*/

cats/cats-core/src/test/groovy/com/netflix/spinnaker/cats/test/TestScheduler.groovy renamed to cats/cats-test/src/main/groovy/com/netflix/spinnaker/cats/test/TestScheduler.groovy

@@ -13,17 +13,3 @@ dependencies {
   compile spinnaker.dependency("korkSwagger")
 }
 
-sourceSets {
-  main {
-    resources {
-      srcDir 'src/main/resources'
-      srcDir 'config'
-    }
-  }
-}
-
-jar {
-  doFirst {
-    exclude "${rootProject.name}.yml"
-  }
-}

cats/cats.gradle

@@ -5,7 +5,5 @@ dependencies {
   compile project(":clouddriver-cf")
 
   spinnaker.group("bootWeb")
-  spinnaker.group("cf")
-
   compile spinnaker.dependency("frigga")
 }

clouddriver-cf/clouddriver-cf.gradle

@@ -16,47 +16,3 @@ dependencies {
   compile spinnaker.dependency('eurekaClient')
 }
 
-/*
-applicationName = 'oort'
-applicationDefaultJvmArgs = ["-Djava.security.egd=file:/dev/./urandom"]
-applicationDistribution.from(project.file('config')) {
-  into "config"
-}
-*/
-
-sourceSets {
-  main {
-    resources {
-      srcDir 'src/main/resources'
-      srcDir 'config'
-    }
-  }
-}
-
-jar {
-  doFirst {
-    exclude "${rootProject.name}.yml"
-  }
-}
-
-/*
-startScripts {
-  doLast {
-    unixScript.text = unixScript.text.replace('CLASSPATH=$APP_HOME', 'CLASSPATH=$APP_HOME/config:$APP_HOME')
-    windowsScript.text = windowsScript.text.replace('set CLASSPATH=', 'set CLASSPATH=%APP_HOME%\\config;')
-  }
-}
-
-ospackage {
-  packageName = project.applicationName
-  version = project.version.replaceAll("-SNAPSHOT", "")
-  release '3'
-  into "/opt/${project.applicationName}"
-  from "${project.buildDir}/install/${project.applicationName}"
-}
-
-buildDeb {
-  dependsOn installApp
-  requires("redis-server")
-}
-*/

clouddriver-security/clouddriver-security.gradle

@@ -20,7 +20,7 @@ def subs = [
   kato: ["kato-core", "kato-web", "kato-aws", "kato-gce", "kato-manual", "kato-jedis", "kato-docker", "kato-cf", "kato-titan"],
   oort: ["oort-core", "oort-web", "oort-aws", "oort-gce", "oort-bench", "oort-titan", "oort-cf"],
   mort: ["mort-web", "mort-core", "mort-aws", "mort-gce"],
-  cats: ["cats-core", "cats-redis"]
+  cats: ["cats-core", "cats-redis", "cats-test"]
 ]
 
 def topLevels = [ 'clouddriver-core', 'clouddriver-security', 'clouddriver-web', 'clouddriver-aws', 'clouddriver-titan', 'clouddriver-google', 'clouddriver-cf' ]