Merge pull request #57 from cfieber/master

update to newer kork-cassandra which fixes bean init ordering issues

build.gradle

@@ -35,7 +35,7 @@ allprojects {
     group = "com.netflix.spinnaker.echo"
 
     spinnaker {
-        dependenciesVersion = "0.19.0"
+        dependenciesVersion = "0.26.0"
     }
     test {
       testLogging {
@@ -48,19 +48,13 @@ allprojects {
         exclude group: 'javax.servlet', module: 'servlet-api'
         exclude group: 'org.slf4j', module: 'slf4j-log4j12'
         exclude group: 'org.slf4j', module: 'slf4j-simple'
-
         resolutionStrategy {
-            force 'org.apache.httpcomponents:httpclient:4.3.2'
+            force 'com.google.guava:guava:15.0'
         }
     }
 }
 
 subprojects {
-    plugins.withType(JavaPlugin) {
-        sourceCompatibility = "1.8"
-        targetCompatibility = "1.8"
-    }
-
     jacoco {
         toolVersion = '0.7.0.201403182114'
     }

echo-scheduler/src/main/groovy/com/netflix/spinnaker/echo/config/CassandraConfig.groovy

@@ -41,7 +41,7 @@ class CassandraConfig {
     @Autowired
     Environment environment
 
-    @Autowired(required = false)
+    @Autowired
     AstyanaxKeyspaceFactory factory
 
     @Bean

echo-scheduler/src/main/groovy/com/netflix/spinnaker/echo/config/SchedulerConfiguration.groovy

@@ -27,9 +27,7 @@ import com.netflix.scheduledactions.persistence.cassandra.CassandraActionInstanc
 import com.netflix.scheduledactions.persistence.cassandra.CassandraExecutionDao
 import com.netflix.scheduledactions.persistence.cassandra.CassandraTriggerDao
 import com.netflix.scheduledactions.web.controllers.ActionInstanceController
-import com.netflix.spinnaker.kork.astyanax.AstyanaxComponents
 import com.squareup.okhttp.OkHttpClient
-import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression
 import org.springframework.context.annotation.Bean
@@ -44,11 +42,6 @@ import java.util.concurrent.TimeUnit
 @ConditionalOnExpression('${scheduler.enabled:false}')
 @ComponentScan(["com.netflix.spinnaker.echo.scheduler", "com.netflix.scheduledactions"])
 class SchedulerConfiguration {
-  /*
-    * Dirty, make sure EmbeddedCass is loaded before our @Bean classes
-    */
-    @Autowired(required = false)
-    AstyanaxComponents.EmbeddedCassandraRunner embeddedCassandra
 
     @Bean
     ActionInstanceDao actionInstanceDao(Keyspace keyspace) {

echo-web/echo-web.gradle

@@ -32,13 +32,6 @@ springBoot {
     mainClass = 'com.netflix.spinnaker.echo.Application'
 }
 
-configurations.all {
-    resolutionStrategy {
-        force 'org.antlr:antlr-runtime:3.4'
-        force 'com.google.guava:guava:14.0.1'
-    }
-}
-
 dependencies {
     compile project(':echo-core')
     compile project(':echo-model')