mindol1004/actions
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing messed up rebase

Browse Source
This commit is contained in:
Marcin Grzejszczak
2018-06-05 16:09:53 +02:00
parent 20f780a989
commit 13404d2f1c
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app-monolith/pom.xml
View File

@@ -113,6 +113,10 @@
<version>1.12.0.RELEASE</version> <version>1.12.0.RELEASE</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-cloud-connectors</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.liquibase</groupId> <groupId>org.liquibase</groupId>
<artifactId>liquibase-core</artifactId> <artifactId>liquibase-core</artifactId>

9
app-monolith/src/main/java/io/dddbyexamples/factory/AppConfiguration.java
View File

@@ -3,7 +3,10 @@ package io.dddbyexamples.factory;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.domain.EntityScan; 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.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Profile;
import org.springframework.data.jpa.convert.threeten.Jsr310JpaConverters; import org.springframework.data.jpa.convert.threeten.Jsr310JpaConverters;
import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.EnableScheduling;
import io.dddbyexamples.factory.shortages.prediction.calculation.Stock; import io.dddbyexamples.factory.shortages.prediction.calculation.Stock;
@@ -32,4 +35,10 @@ public class AppConfiguration {
public Clock clock() { public Clock clock() {
return Clock.systemDefaultZone(); return Clock.systemDefaultZone();
} }
@Configuration
@ServiceScan
@Profile("cloud")
public class ServiceConfiguration {
}
} }