Skip to content

Commit

Permalink
chore(dependencies): replace kork dependencies with kork-runtime (#3802)
Browse files Browse the repository at this point in the history
cleans up some configuration imports in Main that get discovered via auto configuration or
component scanning as well

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
  • Loading branch information
cfieber and mergify[bot] committed Jul 8, 2020
1 parent 786a365 commit cfe7f88
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 16 deletions.
6 changes: 2 additions & 4 deletions orca-web/orca-web.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -63,23 +63,21 @@ dependencies {
implementation(project(":orca-sql"))
implementation(project(":orca-webhook"))
implementation("com.netflix.spinnaker.kork:kork-exceptions")
implementation("com.netflix.spinnaker.kork:kork-stackdriver")
implementation("com.netflix.spinnaker.kork:kork-web")
implementation("com.netflix.spinnaker.kork:kork-plugins")
implementation("net.logstash.logback:logstash-logback-encoder")
implementation("com.netflix.spinnaker.fiat:fiat-api:$fiatVersion")
implementation("com.netflix.spinnaker.fiat:fiat-core:$fiatVersion")

runtimeOnly("com.netflix.spinnaker.kork:kork-runtime")

if (!rootProject.hasProperty("excludeSqlDrivers")) {
runtimeOnly(project(":orca-sql-mysql"))
}

compileOnly("org.projectlombok:lombok")
annotationProcessor("org.projectlombok:lombok")

runtimeOnly("com.netflix.spinnaker.kork:kork-core")
runtimeOnly("com.netflix.spinnaker.kork:kork-secrets-aws")
runtimeOnly("com.netflix.spinnaker.kork:kork-secrets-gcp")
//this brings in the jetty GzipFilter which boot will autoconfigure
runtimeOnly("org.eclipse.jetty:jetty-servlets:9.2.11.v20150529")

Expand Down
12 changes: 0 additions & 12 deletions orca-web/src/main/groovy/com/netflix/spinnaker/orca/Main.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,6 @@

package com.netflix.spinnaker.orca

import com.netflix.spinnaker.config.ErrorConfiguration
import com.netflix.spinnaker.config.InterlinkConfiguration
import com.netflix.spinnaker.config.QosConfiguration
import com.netflix.spinnaker.config.StackdriverConfig
import com.netflix.spinnaker.config.TomcatConfiguration
import com.netflix.spinnaker.kork.PlatformComponents
import com.netflix.spinnaker.orca.applications.config.ApplicationConfig
import com.netflix.spinnaker.orca.bakery.config.BakeryConfiguration
import com.netflix.spinnaker.orca.clouddriver.config.CloudDriverConfiguration
Expand Down Expand Up @@ -53,9 +47,7 @@ import org.springframework.scheduling.annotation.EnableAsync

@EnableAsync
@Import([
PlatformComponents,
WebConfiguration,
ErrorConfiguration,
OrcaConfiguration,
RedisConfiguration,
BakeryConfiguration,
Expand All @@ -66,18 +58,14 @@ import org.springframework.scheduling.annotation.EnableAsync
ClouddriverJobConfiguration,
IgorConfiguration,
DiscoveryPollingConfiguration,
TomcatConfiguration,
MineConfiguration,
ApplicationConfig,
StackdriverConfig,
PipelineTemplateConfiguration,
KayentaConfiguration,
WebhookConfiguration,
KeelConfiguration,
QosConfiguration,
CloudFoundryConfiguration,
GremlinConfiguration,
InterlinkConfiguration
])
@SpringBootApplication(
scanBasePackages = [
Expand Down

0 comments on commit cfe7f88

Please sign in to comment.