From 435d108ef563b39d52db5ce35eeee6cae0e3c74b Mon Sep 17 00:00:00 2001 From: Isaac Pereira Date: Sun, 12 Apr 2020 15:16:02 -0300 Subject: [PATCH] Reduce dependency from spring-boot on the adapters and application modules --- .gitignore | 1 + adapters/buckpal-persistence/build.gradle | 8 +++----- adapters/buckpal-web/build.gradle | 8 +++----- buckpal-application/build.gradle | 6 +++--- buckpal-configuration/build.gradle | 6 +----- build.gradle | 12 ++++++++++-- 6 files changed, 21 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index aec32bf..06d97d8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ HELP.md .gradle build/ +bin/ !gradle/wrapper/gradle-wrapper.jar ### STS ### diff --git a/adapters/buckpal-persistence/build.gradle b/adapters/buckpal-persistence/build.gradle index 4981182..80459ee 100644 --- a/adapters/buckpal-persistence/build.gradle +++ b/adapters/buckpal-persistence/build.gradle @@ -2,11 +2,9 @@ dependencies { implementation project(':common') implementation project(':buckpal-application') - compileOnly 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - - implementation 'org.springframework.boot:spring-boot-starter-validation' - implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation('org.springframework.boot:spring-boot-starter-data-jpa') { + exclude(module: 'spring-boot-starter') + } testImplementation('org.springframework.boot:spring-boot-starter-test') { exclude group: 'junit' // excluding junit 4 diff --git a/adapters/buckpal-web/build.gradle b/adapters/buckpal-web/build.gradle index 9dc8c51..9a48413 100644 --- a/adapters/buckpal-web/build.gradle +++ b/adapters/buckpal-web/build.gradle @@ -1,12 +1,10 @@ dependencies { implementation project(':common') implementation project(':buckpal-application') - - implementation 'org.springframework.boot:spring-boot-starter-web' - - compileOnly 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' + implementation 'org.springframework:spring-web' + + testImplementation 'org.springframework.boot:spring-boot-starter-web' testImplementation('org.springframework.boot:spring-boot-starter-test') { exclude group: 'junit' // excluding junit 4 } diff --git a/buckpal-application/build.gradle b/buckpal-application/build.gradle index 5050ce4..0b3c831 100644 --- a/buckpal-application/build.gradle +++ b/buckpal-application/build.gradle @@ -1,10 +1,10 @@ dependencies { implementation project(':common') - compileOnly 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' + implementation 'org.springframework:spring-context' - implementation 'org.springframework.boot:spring-boot-starter-validation' + implementation 'org.hibernate:hibernate-validator:6.1.3.Final' + implementation 'org.glassfish:javax.el:3.0.0' implementation 'javax.transaction:javax.transaction-api' diff --git a/buckpal-configuration/build.gradle b/buckpal-configuration/build.gradle index 31adf05..7b8b71b 100644 --- a/buckpal-configuration/build.gradle +++ b/buckpal-configuration/build.gradle @@ -1,12 +1,8 @@ plugins { - id "org.springframework.boot" version "2.1.9.RELEASE" + id "org.springframework.boot" version "2.2.6.RELEASE" } dependencies { - - compileOnly 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - implementation project(':common') implementation project(':buckpal-application') implementation project(':adapters:buckpal-persistence') diff --git a/build.gradle b/build.gradle index ab97ad2..7c3ee56 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id "io.spring.dependency-management" version "1.0.8.RELEASE" + id "io.spring.dependency-management" version "1.0.9.RELEASE" } subprojects { @@ -15,9 +15,17 @@ subprojects { jcenter() } + dependencies { + compileOnly 'org.projectlombok:lombok' + annotationProcessor 'org.projectlombok:lombok' + + testCompileOnly 'org.projectlombok:lombok' + testAnnotationProcessor 'org.projectlombok:lombok' + } + dependencyManagement { imports { - mavenBom("org.springframework.boot:spring-boot-dependencies:2.1.9.RELEASE") + mavenBom("org.springframework.boot:spring-boot-dependencies:2.2.6.RELEASE") } }