[isis] branch master updated: ISIS-2426: fix 'gradle dependencies' complaining about lombok not found

[ahuber]

This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git


The following commit(s) were added to refs/heads/master by this push:
     new ca1407c  ISIS-2426: fix 'gradle dependencies' complaining about lombok 
not found
ca1407c is described below

commit ca1407c13ec737899640f9acd302df588d87da7f
Author: Andi Huber <ahu...@apache.org>
AuthorDate: Mon Sep 7 12:12:13 2020 +0200

    ISIS-2426: fix 'gradle dependencies' complaining about lombok not found
---
 api/applib/build.gradle                    |  1 -
 api/schema/build.gradle                    |  1 -
 build.gradle                               | 18 +++++++-----------
 dependencies.gradle                        |  2 ++
 valuetypes/asciidoc/ui/wicket/build.gradle |  1 -
 5 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/api/applib/build.gradle b/api/applib/build.gradle
index a9086d8..e4abe42 100644
--- a/api/applib/build.gradle
+++ b/api/applib/build.gradle
@@ -1,6 +1,5 @@
 description = 'Apache Isis Core - AppLib'
 apply plugin: 'war'
-apply plugin: 'io.freefair.lombok'
 
 dependencies {
     compile project(':isis-parent:isis-schema')
diff --git a/api/schema/build.gradle b/api/schema/build.gradle
index 66543dc..cfd4f4e 100644
--- a/api/schema/build.gradle
+++ b/api/schema/build.gradle
@@ -3,7 +3,6 @@ plugins {
 }
 description = 'Apache Isis Core - Schemas'
 apply plugin: 'java-library'
-apply plugin: 'io.freefair.lombok'
 
 def episodesDir = "${project.buildDir}/generated-sources/xjc/META-INF"
 def javaVersion = JavaVersion.current()
diff --git a/build.gradle b/build.gradle
index f130864..72ccaa6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,12 +1,3 @@
-buildscript {
-    repositories {
-        maven { url "https://plugins.gradle.org/m2/"; }
-    }
-    dependencies {
-        classpath "io.freefair.gradle:lombok-plugin:5.1.0"
-    }
-}
-
 apply from: './dependencies.gradle'
 def javaVersion = JavaVersion.current()
 
@@ -15,14 +6,12 @@ task test {
 }
 
 allprojects {
-    apply plugin: "io.freefair.lombok"
     apply plugin: 'maven'
     group = 'org.apache.isis'
     version = '2.0.0-SNAPSHOT'
 }
 
 subprojects {
-    apply plugin: "io.freefair.lombok"
     apply plugin: 'java'
     sourceCompatibility = 1.8
     targetCompatibility = 1.8
@@ -40,6 +29,13 @@ subprojects {
         maven { url "https://repo1.maven.org/maven2"; }
         mavenLocal()
     }
+    
+    dependencies {
+       compileOnly(Libs.lombok)
+       annotationProcessor(Libs.lombok)
+       testCompileOnly(Libs.lombok)
+       testAnnotationProcessor(Libs.lombok)
+       }
 
     test {
         ignoreFailures = false
diff --git a/dependencies.gradle b/dependencies.gradle
index 1565b74..38b5eb1 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -23,6 +23,7 @@ ext {
     jaxApiVersion = "2.3.1"
     jmockVersion = "2.11.0"
     junitVersion = "5.6.2"
+    lombokVersion = "1.18.12"
     poiVersion = "4.1.1"
     shiroVersion = "1.4.1"
     springBootVersion = "2.3.2.RELEASE"
@@ -80,6 +81,7 @@ ext {
             junitJupiterApi                 : 
"org.junit.jupiter:junit-jupiter-api:$junitVersion",
             junitJupiterEngine              : 
"org.junit.jupiter:junit-jupiter-engine:$junitVersion",
             junitVintageEngine              : 
"org.junit.vintage:junit-vintage-engine:$junitVersion",
+            lombok                                                     : 
"org.projectlombok:lombok:$lombokVersion",
             mockitoCore                     : "org.mockito:mockito-core:3.1.0",
             moxy                            : 
"org.eclipse.persistence:org.eclipse.persistence.moxy:2.7.5",
             objenesis                       : "org.objenesis:objenesis:2.6",
diff --git a/valuetypes/asciidoc/ui/wicket/build.gradle 
b/valuetypes/asciidoc/ui/wicket/build.gradle
index 7cf7302..c36c3b8 100644
--- a/valuetypes/asciidoc/ui/wicket/build.gradle
+++ b/valuetypes/asciidoc/ui/wicket/build.gradle
@@ -1,7 +1,6 @@
 group = 'org.apache.isis.valuetypes'
 description = 'Apache Isis Val - Asciidoctor (ui wicket)'
 apply plugin: 'war'
-apply plugin: 'io.freefair.lombok'
 
 dependencies {
     compile project(':isis-parent:isis-applib')