use lombok plugin instead of direct dependency (#958)

bsideup · Jul 11, 2021 · ba6acf1 · ba6acf1
1 parent d3c8213
commit ba6acf1
Show file tree

Hide file tree

Showing 19 changed files with 10 additions and 78 deletions.
diff --git a/api/build.gradle b/api/build.gradle
@@ -1,13 +1,8 @@
 sourceCompatibility = targetCompatibility = 8
 
 dependencies {
- compileOnly 'org.projectlombok:lombok'
- annotationProcessor 'org.projectlombok:lombok'
-
  compile 'org.reactivestreams:reactive-streams'
  compile 'io.cloudevents:cloudevents-api:1.2.0'
 
- testCompileOnly 'org.projectlombok:lombok'
- testAnnotationProcessor 'org.projectlombok:lombok'
  testCompile 'org.assertj:assertj-core'
 }
diff --git a/app/build.gradle b/app/build.gradle
@@ -9,9 +9,6 @@ bootJar {
 }
 
 dependencies {
- compileOnly 'org.projectlombok:lombok'
- annotationProcessor 'org.projectlombok:lombok'
-
  compile project(":api")
  compile project(":protocol")
 
@@ -20,8 +17,6 @@ dependencies {
 
  compile 'org.pf4j:pf4j'
 
- testCompileOnly 'org.projectlombok:lombok'
- testAnnotationProcessor 'org.projectlombok:lombok'
  testCompile 'org.springframework.boot:spring-boot-starter-test'
  testCompile 'org.assertj:assertj-core'
  testCompile 'org.awaitility:awaitility'

diff --git a/build.gradle b/build.gradle
@@ -8,6 +8,7 @@ buildscript {
 }
 
 plugins {
+ id 'io.franzbecker.gradle-lombok' version '4.0.0' apply false
  id "com.google.protobuf" version "0.8.10" apply false
 }
 
@@ -33,6 +34,7 @@ allprojects {
 
 configure(subprojects.findAll { !it.name.startsWith("examples/") }) {
  apply plugin: 'io.spring.dependency-management'
+ apply plugin: 'io.franzbecker.gradle-lombok'
  apply plugin: 'maven'
  apply plugin: 'java'
  apply from: "$rootDir/gradle/rerunTests.gradle"
@@ -46,6 +48,10 @@ configure(subprojects.findAll { !it.name.startsWith("examples/") }) {
  ]
  }
 
+ lombok {
+ version = '1.18.20'
+ }
+
  test {
  useJUnitPlatform()
 
@@ -87,8 +93,6 @@ configure(subprojects.findAll { !it.name.startsWith("examples/") }) {
  }
 
  dependencies {
- dependency 'org.projectlombok:lombok:1.18.12'
-
  dependency 'org.pf4j:pf4j:3.1.0'
 
  dependencySet(group: 'io.rsocket.rpc', version: '0.2.19') {
@@ -100,7 +104,7 @@ configure(subprojects.findAll { !it.name.startsWith("examples/") }) {
 
  dependency 'com.google.protobuf:protoc:3.10.1'
 
- dependency 'com.google.auto.service:auto-service:1.0-rc6'
+ dependency 'com.google.auto.service:auto-service:1.0'
 
  // Override kafka-clients' version, otherwise it comes from Spring Boot
  dependency 'org.apache.kafka:kafka-clients:2.3.1'

diff --git a/client/build.gradle b/client/build.gradle
@@ -55,9 +55,6 @@ idea {
 sourceCompatibility = targetCompatibility = 8
 
 dependencies {
- compileOnly 'org.projectlombok:lombok'
- annotationProcessor 'org.projectlombok:lombok'
-
  protobuf project(":protocol")
  compile project(":protocol")
 

diff --git a/examples/java/build.gradle b/examples/java/build.gradle
@@ -2,6 +2,7 @@ plugins {
  id "java"
  id "idea"
  id "com.google.protobuf"
+ id 'io.franzbecker.gradle-lombok'
 }
 
 protobuf {
@@ -46,9 +47,6 @@ repositories {
 }
 
 dependencies {
- compileOnly 'org.projectlombok:lombok:1.18.12'
- annotationProcessor 'org.projectlombok:lombok:1.18.12'
-
  compile 'org.testcontainers:kafka:1.15.3'
 
  compile 'org.apache.commons:commons-math3:3.6.1'

diff --git a/examples/plugin/build.gradle b/examples/plugin/build.gradle
@@ -1,6 +1,7 @@
 plugins {
  id "java"
  id "io.spring.dependency-management"
+ id 'io.franzbecker.gradle-lombok'
 }
 
 sourceCompatibility = targetCompatibility = 8
@@ -44,14 +45,11 @@ dependencyManagement {
  entry "testing"
  }
 
- dependency 'org.projectlombok:lombok:1.18.12'
- dependency 'com.google.auto.service:auto-service:1.0-rc6'
+ dependency 'com.google.auto.service:auto-service:1.0'
  }
 }
 
 dependencies {
- compileOnly 'org.projectlombok:lombok'
- annotationProcessor 'org.projectlombok:lombok'
  compileOnly "com.google.auto.service:auto-service"
  annotationProcessor "com.google.auto.service:auto-service"
 

diff --git a/plugins/dynamodb-positions-storage/build.gradle b/plugins/dynamodb-positions-storage/build.gradle
@@ -17,17 +17,13 @@ tasks.test.dependsOn(
 )
 
 dependencies {
- compileOnly 'org.projectlombok:lombok'
- annotationProcessor 'org.projectlombok:lombok'
  compileOnly 'com.google.auto.service:auto-service'
  annotationProcessor 'com.google.auto.service:auto-service'
 
  compileOnly project(":app")
 
  compile 'software.amazon.awssdk:dynamodb:2.3.0'
 
- testCompileOnly 'org.projectlombok:lombok'
- testAnnotationProcessor 'org.projectlombok:lombok'
  testCompile project(":tck")
  testCompile 'org.springframework.boot:spring-boot-test'
  testCompile 'org.testcontainers:localstack'

diff --git a/plugins/grpc-transport-auth/build.gradle b/plugins/grpc-transport-auth/build.gradle
@@ -22,8 +22,6 @@ tasks.test.dependsOn(
 )
 
 dependencies {
- compileOnly 'org.projectlombok:lombok'
- annotationProcessor 'org.projectlombok:lombok'
  compileOnly 'com.google.auto.service:auto-service'
  annotationProcessor 'com.google.auto.service:auto-service'
 
@@ -37,8 +35,6 @@ dependencies {
  runtimeOnly 'io.netty:netty-tcnative-boringssl-static:2.0.25.Final'
  testRuntimeOnly 'io.netty:netty-tcnative-boringssl-static:2.0.25.Final'
 
- testCompileOnly 'org.projectlombok:lombok'
- testAnnotationProcessor 'org.projectlombok:lombok'
  testCompile project(":tck")
  testCompile project(":client")
  testCompile 'org.springframework.boot:spring-boot-starter-test'

diff --git a/plugins/grpc-transport/build.gradle b/plugins/grpc-transport/build.gradle
@@ -60,8 +60,6 @@ jar {
 }
 
 dependencies {
- compileOnly 'org.projectlombok:lombok'
- annotationProcessor 'org.projectlombok:lombok'
  compileOnly 'com.google.auto.service:auto-service'
  annotationProcessor 'com.google.auto.service:auto-service'
 
@@ -75,9 +73,6 @@ dependencies {
  compile 'io.grpc:grpc-netty'
  compile 'io.grpc:grpc-services'
 
- testCompileOnly 'org.projectlombok:lombok'
- testAnnotationProcessor 'org.projectlombok:lombok'
-
  testCompile project(":app")
  testCompile 'org.springframework.boot:spring-boot-test'
  testCompile 'org.assertj:assertj-core'

diff --git a/plugins/inmemory-positions-storage/build.gradle b/plugins/inmemory-positions-storage/build.gradle
@@ -17,15 +17,11 @@ tasks.test.dependsOn(
 )
 
 dependencies {
- compileOnly 'org.projectlombok:lombok'
- annotationProcessor 'org.projectlombok:lombok'
  compileOnly 'com.google.auto.service:auto-service'
  annotationProcessor 'com.google.auto.service:auto-service'
 
  compileOnly project(":app")
 
- testCompileOnly 'org.projectlombok:lombok'
- testAnnotationProcessor 'org.projectlombok:lombok'
  testCompile project(":tck")
  testCompile 'org.springframework.boot:spring-boot-test'
 }
diff --git a/plugins/inmemory-records-storage/build.gradle b/plugins/inmemory-records-storage/build.gradle
@@ -17,15 +17,11 @@ tasks.test.dependsOn(
 )
 
 dependencies {
- compileOnly 'org.projectlombok:lombok'
- annotationProcessor 'org.projectlombok:lombok'
  compileOnly 'com.google.auto.service:auto-service'
  annotationProcessor 'com.google.auto.service:auto-service'
 
  compileOnly project(":app")
 
- testCompileOnly 'org.projectlombok:lombok'
- testAnnotationProcessor 'org.projectlombok:lombok'
  testCompile project(":tck")
  testCompile 'org.springframework.boot:spring-boot-test'
 }
diff --git a/plugins/kafka-records-storage/build.gradle b/plugins/kafka-records-storage/build.gradle
@@ -17,17 +17,13 @@ tasks.test.dependsOn(
 )
 
 dependencies {
- compileOnly 'org.projectlombok:lombok'
- annotationProcessor 'org.projectlombok:lombok'
  compileOnly 'com.google.auto.service:auto-service'
  annotationProcessor 'com.google.auto.service:auto-service'
 
  compileOnly project(":app")
 
  compile 'org.apache.kafka:kafka-clients'
 
- testCompileOnly 'org.projectlombok:lombok'
- testAnnotationProcessor 'org.projectlombok:lombok'
  testCompile project(":tck")
  testCompile 'org.testcontainers:kafka'
  testCompile 'org.springframework.boot:spring-boot-test'

diff --git a/plugins/metrics/build.gradle b/plugins/metrics/build.gradle
@@ -12,17 +12,13 @@ jar {
 }
 
 dependencies {
- compileOnly 'org.projectlombok:lombok'
- annotationProcessor 'org.projectlombok:lombok'
  compileOnly 'com.google.auto.service:auto-service'
  annotationProcessor 'com.google.auto.service:auto-service'
 
  compileOnly project(":app")
 
  compile 'io.prometheus:simpleclient_common:0.8.0'
 
- testCompileOnly 'org.projectlombok:lombok'
- testAnnotationProcessor 'org.projectlombok:lombok'
  testCompile project(":app")
  testCompile 'org.springframework.boot:spring-boot-test'
  testCompile 'org.assertj:assertj-core'

diff --git a/plugins/pulsar-records-storage/build.gradle b/plugins/pulsar-records-storage/build.gradle
@@ -17,17 +17,13 @@ tasks.test.dependsOn(
 )
 
 dependencies {
- compileOnly 'org.projectlombok:lombok'
- annotationProcessor 'org.projectlombok:lombok'
  compileOnly 'com.google.auto.service:auto-service'
  annotationProcessor 'com.google.auto.service:auto-service'
 
  compileOnly project(":app")
 
  compile 'org.apache.pulsar:pulsar-client-original:2.4.0'
 
- testCompileOnly 'org.projectlombok:lombok'
- testAnnotationProcessor 'org.projectlombok:lombok'
  testCompile project(":tck")
  testCompile 'org.testcontainers:pulsar'
  testCompile 'org.apache.pulsar:pulsar-client-admin-original:2.4.0'

diff --git a/plugins/redis-positions-storage/build.gradle b/plugins/redis-positions-storage/build.gradle
@@ -17,17 +17,13 @@ tasks.test.dependsOn(
 )
 
 dependencies {
- compileOnly 'org.projectlombok:lombok'
- annotationProcessor 'org.projectlombok:lombok'
  compileOnly 'com.google.auto.service:auto-service'
  annotationProcessor 'com.google.auto.service:auto-service'
 
  compileOnly project(":app")
 
  compile 'io.lettuce:lettuce-core'
 
- testCompileOnly 'org.projectlombok:lombok'
- testAnnotationProcessor 'org.projectlombok:lombok'
  testCompile project(":tck")
  testCompile 'org.springframework.boot:spring-boot-test'
  testCompile 'org.testcontainers:testcontainers'

diff --git a/plugins/rsocket-transport/build.gradle b/plugins/rsocket-transport/build.gradle
@@ -54,8 +54,6 @@ jar {
 }
 
 dependencies {
- compileOnly 'org.projectlombok:lombok'
- annotationProcessor 'org.projectlombok:lombok'
  compileOnly 'com.google.auto.service:auto-service'
  annotationProcessor 'com.google.auto.service:auto-service'
 
@@ -66,9 +64,6 @@ dependencies {
  compile 'io.rsocket.rpc:rsocket-rpc-core'
  compile 'io.rsocket:rsocket-transport-netty'
 
- testCompileOnly 'org.projectlombok:lombok'
- testAnnotationProcessor 'org.projectlombok:lombok'
-
  testCompile project(":app")
  testCompile 'org.springframework.boot:spring-boot-test'
  testCompile 'org.assertj:assertj-core'

diff --git a/plugins/schema/build.gradle b/plugins/schema/build.gradle
@@ -14,8 +14,6 @@ jar {
 tasks.test.dependsOn(jar)
 
 dependencies {
- compileOnly 'org.projectlombok:lombok'
- annotationProcessor 'org.projectlombok:lombok'
  compileOnly 'com.google.auto.service:auto-service'
  annotationProcessor 'com.google.auto.service:auto-service'
 
@@ -25,9 +23,6 @@ dependencies {
 
  compile 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml'
 
- testCompileOnly 'org.projectlombok:lombok'
- testAnnotationProcessor 'org.projectlombok:lombok'
-
  testCompile project(":app")
  testCompile project(":tck")
  testCompile 'org.springframework.boot:spring-boot-test'

diff --git a/tck/build.gradle b/tck/build.gradle
@@ -3,9 +3,6 @@ sourceSets.main.resources.srcDir tasks.findByPath(":app:bootJar").outputs.files.
 compileJava.dependsOn(tasks.findByPath(":app:bootJar"))
 
 dependencies {
- compileOnly 'org.projectlombok:lombok'
- annotationProcessor 'org.projectlombok:lombok'
-
  compile project(":app")
  compile 'org.springframework.boot:spring-boot-loader'
 

diff --git a/testing/build.gradle b/testing/build.gradle
@@ -1,12 +1,7 @@
 dependencies {
- compileOnly 'org.projectlombok:lombok'
- annotationProcessor 'org.projectlombok:lombok'
-
  compile 'org.testcontainers:testcontainers'
  compile 'org.testcontainers:kafka'
 
- testCompileOnly 'org.projectlombok:lombok'
- testAnnotationProcessor 'org.projectlombok:lombok'
  testCompile 'ch.qos.logback:logback-classic'
  testCompile 'org.assertj:assertj-core'
  testCompile 'org.awaitility:awaitility'