diff --git a/build.gradle b/build.gradle index 782fd73..1eca4b3 100644 --- a/build.gradle +++ b/build.gradle @@ -10,16 +10,16 @@ buildscript { } } -task cleanAll(dependsOn: [':config_server:clean', ':eureka-service:clean', ':events:clean', ':teams:clean', ':users:clean']) +task cleanAll(dependsOn: [':config_server:clean', ':eureka-service:clean', ':events:clean', ':teams:clean', ':users:clean', ':steleks-proxy:clean']) task startConfigServer(dependsOn: [':config_server:bootRun']) task startEurekaService(dependsOn: [':eureka-service:bootRun']) -task startMicroservices(dependsOn: [':events:bootRun', ':teams:bootRun', ':users:bootRun']) +task startMicroservices(dependsOn: [':events:bootRun', ':teams:bootRun', ':users:bootRun', ':steleks-proxy:build']) task runAll(dependsOn: ['cleanAll', 'startConfigServer', 'startEurekaService', 'startMicroservices']) startConfigServer.mustRunAfter cleanAll task buildConfigServer(dependsOn: [':config_server:build']) task buildEurekaService(dependsOn: [':eureka-service:build']) -task buildMicroservices(dependsOn: [':events:build', ':teams:build', ':users:build']) +task buildMicroservices(dependsOn: [':events:build', ':teams:build', ':users:build', ':steleks-proxy:build']) task stage(dependsOn: ['cleanAll', 'buildConfigServer', 'buildEurekaService', 'buildMicroservices']) buildConfigServer.mustRunAfter cleanAll buildEurekaService.mustRunAfter buildConfigServer diff --git a/common/build.gradle b/common/build.gradle index 4cefa0b..0ecb6b8 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -6,14 +6,14 @@ buildscript { mavenCentral() } dependencies { - classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}") classpath('io.spring.gradle:dependency-management-plugin:0.5.4.RELEASE') } } apply plugin: 'java' apply plugin: 'eclipse' -apply plugin: 'org.springframework.boot' +apply plugin: 'io.spring.dependency-management' + version = '0.0.1-SNAPSHOT' @@ -25,8 +25,6 @@ repositories { dependencies { - compile('org.springframework.boot:spring-boot-starter-data-jpa') - compile('org.springframework.boot:spring-boot-starter-data-rest') compile('org.springframework.boot:spring-boot-starter-web') compile('org.springframework.cloud:spring-cloud-starter-eureka') testCompile('org.springframework.cloud:spring-cloud-starter-eureka-server')