Skip to content

Commit

Permalink
feat(plugins): Add kork-plugins dependency and import PluginsAutoConf…
Browse files Browse the repository at this point in the history
…iguration in echo-core (#756)
  • Loading branch information
jonsie authored Jan 22, 2020
1 parent bce1e9e commit 83c10cc
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 2 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@ data
.project
.settings/
bin/
plugins/
2 changes: 2 additions & 0 deletions echo-core/echo-core.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
dependencies {
implementation project(":echo-model")

api "com.netflix.spinnaker.kork:kork-plugins"

implementation "com.squareup.retrofit:retrofit"
implementation "com.squareup.retrofit:converter-jackson"
implementation "com.jakewharton.retrofit:retrofit1-okhttp3-client:1.1.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

package com.netflix.spinnaker.echo.config;

import com.netflix.spinnaker.config.PluginsAutoConfiguration;
import com.netflix.spinnaker.echo.discovery.DiscoveryPollingConfiguration;
import com.netflix.spinnaker.echo.events.EchoEventListener;
import com.netflix.spinnaker.echo.events.EventPropagator;
Expand All @@ -38,7 +39,11 @@
"com.netflix.spinnaker.echo.build",
"com.netflix.spinnaker.echo.events",
})
@Import({PlatformComponents.class, DiscoveryPollingConfiguration.class})
@Import({
PlatformComponents.class,
DiscoveryPollingConfiguration.class,
PluginsAutoConfiguration.class
})
public class EchoCoreConfig {
private ApplicationContext context;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@
@EnableScheduling
@ComponentScan({"com.netflix.spinnaker.echo.config", "com.netflix.spinnaker.config"})
public class Application extends SpringBootServletInitializer {
private static final Map<String, Object> DEFAULT_PROPS = new DefaultPropertiesBuilder().build();
private static final Map<String, Object> DEFAULT_PROPS =
new DefaultPropertiesBuilder().property("spring.application.name", "echo").build();

public static void main(String... args) {
ConfigServerBootstrap.systemProperties("echo");
Expand Down

0 comments on commit 83c10cc

Please sign in to comment.