Fixing messed up rebase
This commit is contained in:
@@ -113,6 +113,10 @@
|
||||
<version>1.12.0.RELEASE</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-cloud-connectors</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.liquibase</groupId>
|
||||
<artifactId>liquibase-core</artifactId>
|
||||
|
||||
@@ -3,7 +3,10 @@ package io.dddbyexamples.factory;
|
||||
import org.springframework.boot.SpringApplication;
|
||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||
import org.springframework.boot.autoconfigure.domain.EntityScan;
|
||||
import org.springframework.cloud.config.java.ServiceScan;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.context.annotation.Profile;
|
||||
import org.springframework.data.jpa.convert.threeten.Jsr310JpaConverters;
|
||||
import org.springframework.scheduling.annotation.EnableScheduling;
|
||||
import io.dddbyexamples.factory.shortages.prediction.calculation.Stock;
|
||||
@@ -32,4 +35,10 @@ public class AppConfiguration {
|
||||
public Clock clock() {
|
||||
return Clock.systemDefaultZone();
|
||||
}
|
||||
|
||||
@Configuration
|
||||
@ServiceScan
|
||||
@Profile("cloud")
|
||||
public class ServiceConfiguration {
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user