Skip to content

Commit

Permalink
switch to lombok plugin
Browse files Browse the repository at this point in the history
  • Loading branch information
kjozsa committed Nov 14, 2024
1 parent e4dfbba commit f113319
Show file tree
Hide file tree
Showing 23 changed files with 334 additions and 70 deletions.
1 change: 1 addition & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ plugins {
id 'se.thinkcode.cucumber-runner' version '0.0.11' apply false
id "com.github.davidmc24.gradle.plugin.avro-base" version "1.9.1" apply false
id 'org.openapi.generator' version '7.8.0' apply false
id 'io.freefair.lombok' version '8.4' apply false
}

apply from: "${rootDir}/buildSrc/src/main/groovy/org.apache.fineract.release.gradle"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,8 @@ dependencyManagement {
dependency "io.gsonfire:gson-fire:1.9.0"
dependency "com.google.code.findbugs:jsr305:3.0.2"
dependency "commons-codec:commons-codec:1.17.1"
dependency "org.projectlombok:lombok:1.18.34"
// Lombok is now managed by the Lombok Gradle plugin
dependency 'org.projectlombok:lombok:1.18.30'

dependency 'org.bouncycastle:bcpkix-jdk15to18:1.79'
dependency 'org.bouncycastle:bcprov-jdk15to18:1.79'
Expand Down
19 changes: 18 additions & 1 deletion custom/acme/event/externalevent/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,27 @@
* specific language governing permissions and limitations
* under the License.
*/
description = 'ACME Corp.: Fineract external events'
description = 'Fineract Custom ACME Event External Event'

group = 'com.acme.fineract.event'

archivesBaseName = 'acme-fineract-event-externalevent'

apply from: 'dependencies.gradle'

apply plugin: 'java'
apply plugin: 'org.springframework.boot'
apply plugin: 'io.freefair.lombok'

dependencies {
implementation(
project(':fineract-core'),
project(':custom:acme:event:starter')
)

testImplementation(
'org.junit.jupiter:junit-jupiter',
'org.mockito:mockito-core',
'org.mockito:mockito-junit-jupiter'
)
}
20 changes: 19 additions & 1 deletion custom/acme/loan/cob/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,28 @@
* specific language governing permissions and limitations
* under the License.
*/
description = 'ACME Corp.: Fineract COB Loan'
description = 'Fineract Custom ACME Loan COB'

group = 'com.acme.fineract'

archivesBaseName = 'acme-fineract-loan-cob'

apply from: 'dependencies.gradle'

apply plugin: 'java'
apply plugin: 'org.springframework.boot'
apply plugin: 'io.freefair.lombok'

dependencies {
implementation(
project(':fineract-core'),
project(':fineract-loan'),
project(':custom:acme:loan:starter')
)

testImplementation(
'org.junit.jupiter:junit-jupiter',
'org.mockito:mockito-core',
'org.mockito:mockito-junit-jupiter'
)
}
20 changes: 19 additions & 1 deletion custom/acme/loan/job/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,28 @@
* specific language governing permissions and limitations
* under the License.
*/
description = 'ACME Corp.: Fineract Loan Job'
description = 'Fineract Custom ACME Loan Job'

group = 'com.acme.fineract'

archivesBaseName = 'acme-fineract-loan-job'

apply plugin: 'java'
apply plugin: 'org.springframework.boot'
apply plugin: 'io.freefair.lombok'

dependencies {
implementation(
project(':fineract-core'),
project(':fineract-loan'),
project(':custom:acme:loan:starter')
)

testImplementation(
'org.junit.jupiter:junit-jupiter',
'org.mockito:mockito-core',
'org.mockito:mockito-junit-jupiter'
)
}

apply from: 'dependencies.gradle'
20 changes: 19 additions & 1 deletion custom/acme/loan/processor/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,28 @@
* specific language governing permissions and limitations
* under the License.
*/
description = 'ACME Corp.: Fineract Loan Transaction Processors'
description = 'Fineract Custom ACME Loan Processor'

group = 'com.acme.fineract'

archivesBaseName = 'acme-fineract-loan-processor'

apply from: 'dependencies.gradle'

apply plugin: 'java'
apply plugin: 'org.springframework.boot'
apply plugin: 'io.freefair.lombok'

dependencies {
implementation(
project(':fineract-core'),
project(':fineract-loan'),
project(':custom:acme:loan:starter')
)

testImplementation(
'org.junit.jupiter:junit-jupiter',
'org.mockito:mockito-core',
'org.mockito:mockito-junit-jupiter'
)
}
19 changes: 18 additions & 1 deletion custom/acme/loan/starter/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,27 @@
* specific language governing permissions and limitations
* under the License.
*/
description = 'ACME Corp.: Fineract COB Starter'
description = 'Fineract Custom ACME Loan Starter'

group = 'com.acme.fineract'

archivesBaseName = 'acme-fineract-loan-starter'

apply from: 'dependencies.gradle'

apply plugin: 'java'
apply plugin: 'org.springframework.boot'
apply plugin: 'io.freefair.lombok'

dependencies {
implementation(
project(':fineract-core'),
project(':fineract-loan')
)

testImplementation(
'org.junit.jupiter:junit-jupiter',
'org.mockito:mockito-core',
'org.mockito:mockito-junit-jupiter'
)
}
19 changes: 18 additions & 1 deletion custom/acme/note/service/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,27 @@
* specific language governing permissions and limitations
* under the License.
*/
description = 'ACME Corp.: Fineract Note Service'
description = 'Fineract Custom ACME Note Service'

group = 'com.acme.fineract.portfolio.note'

archivesBaseName = 'acme-fineract-note-service'

apply from: 'dependencies.gradle'

apply plugin: 'java'
apply plugin: 'org.springframework.boot'
apply plugin: 'io.freefair.lombok'

dependencies {
implementation(
project(':fineract-core'),
project(':custom:acme:note:starter')
)

testImplementation(
'org.junit.jupiter:junit-jupiter',
'org.mockito:mockito-core',
'org.mockito:mockito-junit-jupiter'
)
}
18 changes: 17 additions & 1 deletion custom/acme/note/starter/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,26 @@
* specific language governing permissions and limitations
* under the License.
*/
description = 'ACME Corp.: Fineract Note Starter'
description = 'Fineract Custom ACME Note Starter'

group = 'com.acme.fineract.portfolio.note'

archivesBaseName = 'acme-fineract-note-starter'

apply plugin: 'java'
apply plugin: 'org.springframework.boot'
apply plugin: 'io.freefair.lombok'

dependencies {
implementation(
project(':fineract-core')
)

testImplementation(
'org.junit.jupiter:junit-jupiter',
'org.mockito:mockito-core',
'org.mockito:mockito-junit-jupiter'
)
}

apply from: 'dependencies.gradle'
1 change: 1 addition & 0 deletions fineract-accounting/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ description = 'Fineract Accounting'

apply plugin: 'java'
apply plugin: 'eclipse'
apply plugin: 'io.freefair.lombok'

compileJava.doLast {
def mainSS = sourceSets.main
Expand Down
2 changes: 2 additions & 0 deletions fineract-avro-schemas/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ import com.github.davidmc24.gradle.plugin.avro.GenerateAvroJavaTask
// TODO: @vidakovic we should publish this lib to Maven Central; do in separate PR
description = 'Fineract Avro Schemas'

apply plugin: 'java'
apply plugin: 'com.github.davidmc24.gradle.plugin.avro-base'
apply plugin: 'io.freefair.lombok'

apply from: 'dependencies.gradle'

Expand Down
3 changes: 3 additions & 0 deletions fineract-client/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
apply plugin: 'java'
apply plugin: 'org.openapi.generator'
apply plugin: 'io.freefair.lombok'

description = 'Fineract Client'

apply from: 'dependencies.gradle'
Expand Down
27 changes: 23 additions & 4 deletions fineract-core/dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,29 @@ dependencies {
exclude group: 'com.sun.activation'
}

implementation(
'com.google.guava:guava',
'com.jayway.jsonpath:json-path',
'commons-io:commons-io',
'jakarta.annotation:jakarta.annotation-api',
'jakarta.validation:jakarta.validation-api',
'org.apache.commons:commons-lang3',
'org.apache.commons:commons-text',
'org.springframework:spring-context',
'org.springframework.boot:spring-boot',
'org.springframework.security:spring-security-core'
)

annotationProcessor(
'org.springframework.boot:spring-boot-configuration-processor'
)

testImplementation(
'org.junit.jupiter:junit-jupiter',
'org.mockito:mockito-core',
'org.mockito:mockito-junit-jupiter'
)

// runtimeOnly dependencies are things that Fineract code has no direct compile time dependency on, but which must be present at run-time
runtimeOnly(
'org.apache.bval:org.apache.bval.bundle',
Expand All @@ -93,10 +116,6 @@ dependencies {
'org.apache.httpcomponents:httpclient'
)

compileOnly 'org.projectlombok:lombok'
annotationProcessor 'org.projectlombok:lombok'
annotationProcessor 'org.mapstruct:mapstruct-processor'

implementation 'ch.qos.logback.contrib:logback-json-classic'
implementation 'ch.qos.logback.contrib:logback-jackson'
implementation 'org.codehaus.janino:janino'
Expand Down
3 changes: 0 additions & 3 deletions fineract-e2e-tests-core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,6 @@ dependencies {
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.11.3'
testImplementation 'org.junit.jupiter:junit-jupiter:5.11.3'

testCompileOnly 'org.projectlombok:lombok:1.18.34'
testAnnotationProcessor 'org.projectlombok:lombok:1.18.34'

testImplementation "ch.qos.logback:logback-core:1.5.12"
testImplementation "ch.qos.logback:logback-classic:1.5.12"

Expand Down
89 changes: 53 additions & 36 deletions fineract-e2e-tests-runner/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -30,42 +30,59 @@ repositories {
}

dependencies {
testImplementation(project(':fineract-avro-schemas'))
testImplementation(project(':fineract-client'))
testImplementation(project(':fineract-e2e-tests-core').sourceSets.test.output)

testImplementation 'org.springframework:spring-context'
implementation 'org.springframework:spring-test'
testImplementation 'org.springframework:spring-jms'

testImplementation 'com.squareup.retrofit2:retrofit:2.11.0'
testImplementation 'commons-httpclient:commons-httpclient:3.1'
testImplementation 'org.apache.commons:commons-lang3:3.17.0'
testImplementation 'com.googlecode.json-simple:json-simple:1.1.1'
testImplementation 'com.google.code.gson:gson:2.11.0'

testImplementation 'io.cucumber:cucumber-java:7.20.1'
testImplementation 'io.cucumber:cucumber-junit:7.20.1'
testImplementation 'io.cucumber:cucumber-spring:7.20.1'

testImplementation 'io.qameta.allure:allure-cucumber7-jvm:2.29.0'

testImplementation 'org.assertj:assertj-core:3.26.3'
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.11.3'
testImplementation 'org.junit.jupiter:junit-jupiter:5.11.3'

testCompileOnly 'org.projectlombok:lombok:1.18.34'
testAnnotationProcessor 'org.projectlombok:lombok:1.18.34'

testImplementation "ch.qos.logback:logback-core:1.5.12"
testImplementation "ch.qos.logback:logback-classic:1.5.12"

testImplementation 'org.apache.activemq:activemq-client:6.1.3'
testImplementation "org.apache.avro:avro:1.12.0"
testImplementation "org.awaitility:awaitility:4.2.2"
testImplementation 'io.github.classgraph:classgraph:4.8.177'

testImplementation 'org.apache.commons:commons-collections4:4.4'
implementation(
'com.google.guava:guava',
'com.jayway.jsonpath:json-path',
'commons-io:commons-io',
'jakarta.annotation:jakarta.annotation-api',
'jakarta.validation:jakarta.validation-api',
'org.apache.commons:commons-lang3',
'org.apache.commons:commons-text',
'org.springframework:spring-context',
'org.springframework.boot:spring-boot',
'org.springframework.security:spring-security-core',
project(':fineract-e2e-tests-core')
)

testImplementation(
'org.junit.jupiter:junit-jupiter',
'org.mockito:mockito-core',
'org.mockito:mockito-junit-jupiter',
'io.cucumber:cucumber-java',
'io.cucumber:cucumber-junit',
'io.cucumber:cucumber-spring',
'io.rest-assured:rest-assured',
'io.rest-assured:json-schema-validator',
'org.awaitility:awaitility',
'org.mock-server:mockserver-client-java',
'org.mock-server:mockserver-junit-jupiter',
'org.springframework.batch:spring-batch-test',
'org.springframework.boot:spring-boot-starter-test',
'org.springframework.security:spring-security-test',
'org.testcontainers:junit-jupiter',
'org.testcontainers:mariadb',
'org.testcontainers:mockserver',
'org.testcontainers:postgresql',
project(':fineract-avro-schemas'),
project(':fineract-client'),
project(':fineract-e2e-tests-core').sourceSets.test.output,
'org.springframework:spring-test',
'org.springframework:spring-jms',
'com.squareup.retrofit2:retrofit:2.11.0',
'commons-httpclient:commons-httpclient:3.1',
'org.apache.commons:commons-lang3:3.17.0',
'com.googlecode.json-simple:json-simple:1.1.1',
'com.google.code.gson:gson:2.11.0',
'io.qameta.allure:allure-cucumber7-jvm:2.29.0',
'org.assertj:assertj-core:3.26.3',
'org.junit.jupiter:junit-jupiter-api:5.11.3',
'ch.qos.logback:logback-core:1.5.12',
'ch.qos.logback:logback-classic:1.5.12',
'org.apache.activemq:activemq-client:6.1.3',
'org.apache.avro:avro:1.12.0',
'io.github.classgraph:classgraph:4.8.177',
'org.apache.commons:commons-collections4:4.4'
)
}

tasks.named('test') {
Expand Down
Loading

0 comments on commit f113319

Please sign in to comment.