latest gradle and project plugin.

Some real wierdness around Spectator Registry throwing ArrayIndexOutOfBoundExceptions when running tests at the CLI
Switched tests to just do a Stub(Registry)

build.gradle

@@ -15,58 +15,22 @@
  */
 
 buildscript {
+    ext {
+        springBootVersion = "1.2.5.RELEASE"
+    }
     repositories {
-        if (project.hasProperty('internalArtifactory')) {
-            maven { url project.internalArtifactory }
-        } else {
-            jcenter()
-        }
+        jcenter()
         maven { url 'http://dl.bintray.com/spinnaker/gradle/' }
     }
     dependencies {
-        classpath 'com.netflix.spinnaker:spinnaker-gradle-project:1.12.102'
+        classpath 'com.netflix.spinnaker.gradle:spinnaker-gradle-project:2.2.0'
+        classpath "org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}"
     }
 }
 
-ext {
-    springBootVersion = "1.2.5.RELEASE"
-
-    versions = [
-        batch   : "3.0.1.RELEASE",
-        guava   : "14.0.1",
-        jackson : "2.3.3",
-        okhttp  : "2.0.0",
-        retrofit: "1.6.1",
-        rx      : "0.20.2",
-        slf4j   : "1.7.5",
-        spock   : "1.0-groovy-2.3",
-        spring  : "4.0.6.RELEASE"
-    ]
-
-    commonDependencies = [
-        guava          : dependencies.create("com.google.guava:guava:$versions.guava"),
-        hamcrest       : dependencies.create("org.hamcrest:hamcrest-all:1.3"),
-        jacksonDatabind: dependencies.create("com.fasterxml.jackson.core:jackson-databind:$versions.jackson"),
-        jacksonGuava   : dependencies.create("com.fasterxml.jackson.datatype:jackson-datatype-guava:$versions.jackson"),
-        logback        : dependencies.create("ch.qos.logback:logback-classic:$versions.logback"),
-        okHttp         : dependencies.create("com.squareup.okhttp:okhttp-urlconnection:$versions.okhttp"),
-        retrofit       : dependencies.create("com.squareup.retrofit:retrofit:$versions.retrofit"),
-        rxJava         : dependencies.create("com.netflix.rxjava:rxjava-core:$versions.rx"),
-        slf4j          : dependencies.create("org.slf4j:slf4j-api:$versions.slf4j"),
-        slf4jJcl       : dependencies.create("org.slf4j:jcl-over-slf4j:$versions.slf4j"),
-        slf4jSimple    : dependencies.create("org.slf4j:slf4j-simple:$versions.slf4j"),
-        spock          : dependencies.create("org.spockframework:spock-core:$versions.spock"),
-        spockSpring    : dependencies.create("org.spockframework:spock-spring:$versions.spock"),
-        springBatch    : dependencies.create("org.springframework.batch:spring-batch-core:$versions.batch"),
-        springBatchTest: dependencies.create("org.springframework.batch:spring-batch-test:$versions.batch"),
-        springTest     : dependencies.create("org.springframework:spring-test:$versions.spring"),
-        springWeb      : dependencies.create("org.springframework:spring-web:$versions.spring"),
-        objenesis      : dependencies.create("org.objenesis:objenesis:2.1")
-    ]
-}
-
 allprojects {
-    apply plugin: "spinnaker-gradle-project"
+    apply plugin: "spinnaker.project"
+    apply plugin: "groovy"
     apply plugin: 'jacoco'
     group = "com.netflix.spinnaker.echo"
 
@@ -83,13 +47,6 @@ allprojects {
 }
 
 subprojects {
-    repositories {
-        if (project.hasProperty('internalArtifactory')) {
-            maven { url project.internalArtifactory }
-        } else {
-            jcenter()
-        }
-    }
     plugins.withType(JavaPlugin) {
         sourceCompatibility = "1.8"
         targetCompatibility = "1.8"
@@ -98,8 +55,16 @@ subprojects {
     jacoco {
         toolVersion = '0.7.0.201403182114'
     }
+
+    dependencies {
+        compile spinnaker.dependency('groovy')
+        compile spinnaker.dependency('guava')
+        compile spinnaker.dependency('slf4j')
+        testCompile spinnaker.dependency('spock')
+        testRuntime spinnaker.dependency('slf4jSimple')
+        testRuntime "org.slf4j:jcl-over-slf4j:${spinnaker.version('slf4j')}"
+    }
 }
 
-tasks.checkSnapshotDependencies.enabled = false
 
 defaultTasks ':echo-web:bootRun'

echo-cassandra/echo-cassandra.gradle

@@ -14,16 +14,14 @@
  * limitations under the License.
  */
 
-apply from: "$rootDir/gradle/groovy-module.gradle"
-
 dependencies {
     compile project(':echo-model')
     compile spinnaker.dependency('bootWeb')
     compile spinnaker.dependency("kork")
     compile spinnaker.dependency("korkCassandra")
-    compile commonDependencies.jacksonDatabind
-    testCompile commonDependencies.spockSpring
-    testCompile commonDependencies.springTest
+    compile spinnaker.dependency('jacksonDatabind')
+    testCompile spinnaker.dependency('spockSpring')
+    testCompile spinnaker.dependency('springTest')
 }
 
 test {

echo-core/echo-core.gradle

@@ -14,13 +14,11 @@
  * limitations under the License.
  */
 
-apply from: "$rootDir/gradle/groovy-module.gradle"
-
 dependencies {
     spinnaker.group("retrofitDefault")
 
     compile project(":echo-model")
-    compile commonDependencies.rxJava
-    testCompile commonDependencies.spockSpring
-    testCompile commonDependencies.springTest
+    compile spinnaker.dependency('rxJava')
+    testCompile spinnaker.dependency('spockSpring')
+    testCompile spinnaker.dependency('springTest')
 }

echo-model/echo-model.gradle

@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-apply from: "$rootDir/gradle/groovy-module.gradle"
-
 dependencies {
   spinnaker.group("lombok")
 

echo-notifications/echo-notifications.gradle

@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-apply from: "$rootDir/gradle/groovy-module.gradle"
-
 dependencies {
     compile project(':echo-core')
     spinnaker.group("test")
@@ -25,7 +23,7 @@ dependencies {
     compile spinnaker.dependency("kork")
     compile spinnaker.dependency("rxJava")
     compile "javax.mail:mail:1.4.1"
-    compile "org.springframework:spring-context-support:4.0.8.RELEASE"
+    compile "org.springframework:spring-context-support:${spinnaker.version('spring')}"
     compile "org.apache.velocity:velocity:1.7"
     compile "org.jsoup:jsoup:1.8.2"
     testCompile "com.icegreen:greenmail:1.4.0"

echo-pipelinetriggers/echo-pipelinetriggers.gradle

@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-apply from: "$rootDir/gradle/groovy-module.gradle"
-
 dependencies {
   spinnaker.group("test")
   spinnaker.group("lombok")

echo-pipelinetriggers/src/main/java/com/netflix/spinnaker/echo/pipelinetriggers/BuildEventMonitor.java

@@ -6,7 +6,7 @@
 import java.util.function.Predicate;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.netflix.spectator.api.ExtendedRegistry;
+import com.netflix.spectator.api.Registry;
 import com.netflix.spinnaker.echo.events.EchoEventListener;
 import com.netflix.spinnaker.echo.model.BuildEvent;
 import com.netflix.spinnaker.echo.model.Event;
@@ -16,7 +16,6 @@
 import lombok.extern.slf4j.Slf4j;
 import lombok.val;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 import rx.Observable;
 import rx.functions.Action1;
@@ -36,12 +35,12 @@ public class BuildEventMonitor implements EchoEventListener {
 
   private final PipelineCache pipelineCache;
   private final Action1<Pipeline> subscriber;
-  private final ExtendedRegistry registry;
+  private final Registry registry;
 
   @Autowired
   public BuildEventMonitor(@NonNull PipelineCache pipelineCache,
                            @NonNull Action1<Pipeline> subscriber,
-                           @NonNull @Qualifier("extendedRegistry") ExtendedRegistry registry) {
+                           @NonNull Registry registry) {
     this.pipelineCache = pipelineCache;
     this.subscriber = subscriber;
     this.registry = registry;

echo-pipelinetriggers/src/main/java/com/netflix/spinnaker/echo/pipelinetriggers/LogError.java

@@ -0,0 +1,14 @@
+package com.netflix.spinnaker.echo.pipelinetriggers;
+
+import lombok.extern.slf4j.Slf4j;
+import rx.functions.Action1;
+
+@Slf4j
+public class LogError implements Action1<Throwable> {
+  @Override
+  public void call(Throwable throwable) {
+    log.error("Observable Failed", throwable);
+  }
+}
+
+

echo-pipelinetriggers/src/main/java/com/netflix/spinnaker/echo/pipelinetriggers/PipelineCache.java

@@ -16,18 +16,16 @@
 
 package com.netflix.spinnaker.echo.pipelinetriggers;
 
-import com.netflix.spectator.api.ExtendedRegistry;
+import com.netflix.spectator.api.Registry;
 import com.netflix.spinnaker.echo.model.Pipeline;
 import com.netflix.spinnaker.echo.services.Front50Service;
 import lombok.NonNull;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 import rx.Observable;
 import rx.Scheduler;
 import rx.Subscription;
-import rx.functions.Action1;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
@@ -45,7 +43,7 @@ public class PipelineCache implements MonitoredPoller {
   private final Scheduler scheduler;
   private final int pollingIntervalSeconds;
   private final Front50Service front50;
-  private final ExtendedRegistry registry;
+  private final Registry registry;
 
   private transient Instant lastPollTimestamp;
   private transient Subscription subscription;
@@ -56,7 +54,7 @@ public class PipelineCache implements MonitoredPoller {
   public PipelineCache(@NonNull Scheduler scheduler,
                        int pollingIntervalSeconds,
                        @NonNull Front50Service front50,
-                       @NonNull @Qualifier("extendedRegistry") ExtendedRegistry registry) {
+                       @NonNull Registry registry) {
     this.scheduler = scheduler;
     this.pollingIntervalSeconds = pollingIntervalSeconds;
     this.front50 = front50;

echo-pipelinetriggers/src/test/groovy/com/netflix/spinnaker/echo/pipelinetriggers/BuildEventMonitorSpec.groovy

@@ -1,28 +1,27 @@
 package com.netflix.spinnaker.echo.pipelinetriggers
 
 import com.fasterxml.jackson.databind.ObjectMapper
-import com.netflix.spectator.api.ExtendedRegistry
-import com.netflix.spectator.api.NoopRegistry
+import com.netflix.spectator.api.Counter
+import com.netflix.spectator.api.Id
+import com.netflix.spectator.api.Registry
 import com.netflix.spinnaker.echo.model.Event
 import com.netflix.spinnaker.echo.model.Pipeline
-import com.netflix.spinnaker.echo.services.Front50Service
 import com.netflix.spinnaker.echo.test.RetrofitStubs
 import rx.functions.Action1
-import rx.schedulers.Schedulers
-import spock.lang.Shared
 import spock.lang.Specification
 import spock.lang.Subject
 import spock.lang.Unroll
 import static com.netflix.spinnaker.echo.model.BuildEvent.Result.*
-import static java.util.concurrent.TimeUnit.SECONDS
-import static rx.Observable.empty
-import static rx.Observable.just
 
 class BuildEventMonitorSpec extends Specification implements RetrofitStubs {
   def objectMapper = new ObjectMapper()
   def pipelineCache = Mock(PipelineCache)
   def subscriber = Mock(Action1)
-  def registry = new ExtendedRegistry(new NoopRegistry())
+  def registry = Stub(Registry) {
+    createId(*_) >> Stub(Id)
+    counter(*_) >> Stub(Counter)
+    gauge(*_) >> Integer.valueOf(1)
+  }
 
   @Subject
   def monitor = new BuildEventMonitor(pipelineCache, subscriber, registry)

echo-pipelinetriggers/src/test/groovy/com/netflix/spinnaker/echo/pipelinetriggers/PipelineCacheSpec.groovy

@@ -17,8 +17,9 @@
 
 package com.netflix.spinnaker.echo.pipelinetriggers
 
-import com.netflix.spectator.api.ExtendedRegistry
-import com.netflix.spectator.api.NoopRegistry
+import com.netflix.spectator.api.Counter
+import com.netflix.spectator.api.Id
+import com.netflix.spectator.api.Registry
 import com.netflix.spinnaker.echo.model.Pipeline
 import com.netflix.spinnaker.echo.services.Front50Service
 import com.netflix.spinnaker.echo.test.RetrofitStubs
@@ -35,7 +36,12 @@ import static rx.Observable.just
 class PipelineCacheSpec extends Specification implements RetrofitStubs {
   def scheduler = Schedulers.test()
   def front50 = Mock(Front50Service)
-  def registry = new ExtendedRegistry(new NoopRegistry())
+  def registry = Stub(Registry) {
+    createId(*_) >> Stub(Id)
+    counter(*_) >> Stub(Counter)
+    gauge(*_) >> Integer.valueOf(1)
+  }
+
 
   @Shared
   def interval = 30

echo-rest/echo-rest.gradle

@@ -14,13 +14,11 @@
  * limitations under the License.
  */
 
-apply from: "$rootDir/gradle/groovy-module.gradle"
-
 dependencies {
   spinnaker.group('retrofitDefault')
   compile project(':echo-model')
   compile spinnaker.dependency('korkWeb')
-  compile commonDependencies.jacksonDatabind
-  testCompile commonDependencies.spockSpring
-  testCompile commonDependencies.springTest
+  compile spinnaker.dependency('jacksonDatabind')
+  testCompile spinnaker.dependency('spockSpring')
+  testCompile spinnaker.dependency('springTest')
 }

echo-scheduler/echo-scheduler.gradle

@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-apply from: "$rootDir/gradle/groovy-module.gradle"
-
 dependencies {
   compile project(':echo-pipelinetriggers')