From e0d2273fc65fdd3109eccb736cb29f0e28cba24e Mon Sep 17 00:00:00 2001
From: Sebastian Luehr <sebastian.luehr@everest.engineering>
Date: Thu, 8 Jul 2021 12:35:54 +1000
Subject: [PATCH] Dependency updates

---
 build.gradle                             | 29 +++++++++++-------------
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 lombok.config                            |  2 --
 3 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/build.gradle b/build.gradle
index cb49f65..24a1b57 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,17 +1,14 @@
 plugins {
     id 'com.palantir.git-version' version '0.12.3'
     id 'idea'
-    id 'io.freefair.lombok' version '5.1.1'
-    id 'io.spring.dependency-management' version '1.0.10.RELEASE'
+    id 'io.spring.dependency-management' version '1.0.11.RELEASE'
     id 'java-library'
     id 'maven-publish'
     id 'signing'
-    id 'org.sonarqube' version '3.1.1'
+    id 'org.sonarqube' version '3.3'
     id 'jacoco'
 }
 
-apply plugin: 'io.freefair.lombok'
-
 group = 'engineering.everest.axon'
 sourceCompatibility = '1.11'
 
@@ -21,14 +18,15 @@ version = gitTagVersion.commitDistance == 0
         : "${gitTagVersion.lastTag}+${gitTagVersion.commitDistance}-SNAPSHOT"
 
 ext {
-    axonVersion = '4.4.5'
-    guavaVersion = '30.0-jre'
-    jacksonVersion = '2.11.2'
-    springBootVersion = '2.4.0'
+    axonVersion = '4.5.2'
+    guavaVersion = '30.1.1-jre'
+    jacksonVersion = '2.12.3'
+    lombokVersion = '1.18.20'
+    springBootVersion = '2.4.8'
 
     h2Version = '1.4.200'
-    junitVersion = '5.7.0'
-    mockitoVersion = '3.5.15'
+    junitVersion = '5.7.2'
+    mockitoVersion = '3.11.2'
 }
 
 dependencyManagement {
@@ -38,12 +36,16 @@ dependencyManagement {
 }
 
 dependencies {
+    compileOnly "org.projectlombok:lombok:${lombokVersion}"
+    annotationProcessor "org.projectlombok:lombok:${lombokVersion}"
     implementation "org.axonframework:axon-modelling:${axonVersion}"
     implementation 'com.fasterxml.jackson.core:jackson-databind'
     implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310'
     implementation "com.google.guava:guava:${guavaVersion}"
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
 
+    testCompileOnly "org.projectlombok:lombok:${lombokVersion}"
+    testAnnotationProcessor "org.projectlombok:lombok:${lombokVersion}"
     testImplementation "org.junit.jupiter:junit-jupiter:${junitVersion}"
     testImplementation "org.mockito:mockito-junit-jupiter:${mockitoVersion}"
     testImplementation 'org.springframework.boot:spring-boot-test-autoconfigure'
@@ -66,10 +68,5 @@ test {
     useJUnitPlatform()
 }
 
-lombok {
-    version = '1.18.16'
-    generateLombokConfig.enabled = false
-}
-
 apply from: 'publishing.gradle'
 apply from: 'sonar.gradle'
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 442d913..05679dc 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/lombok.config b/lombok.config
index ef49d7f..e945885 100644
--- a/lombok.config
+++ b/lombok.config
@@ -1,5 +1,3 @@
-# This file is generated by the 'io.freefair.lombok' Gradle plugin
 config.stopBubbling = true
 lombok.log.fieldName = LOGGER
 lombok.addLombokGeneratedAnnotation = true
-