diff --git a/CHANGELOG.md b/CHANGELOG.md
index cb064ac79d..2a1d61e10b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## Unreleased
 ### Changed
 - Upgrade [Legman](https://github.com/sdorra/legman) to v1.6.2 in order to fix execution on Java versions > 8
+- Upgrade [Lombok](https://projectlombok.org/) to version 1.18.10 in order to fix build on Java versions > 8 
 
 ## 2.0.0-rc3 - 2020-01-31
 ### Fixed
diff --git a/lombok.config b/lombok.config
new file mode 100644
index 0000000000..d8ef4d1d98
--- /dev/null
+++ b/lombok.config
@@ -0,0 +1,4 @@
+# since v1.16.20 the @ConstructorProperties is no longer added to constructors,
+# but this annotation seem to be used by Jackson.
+# Not sure if this is realy required, but without sonia.scm.api.rest.JSONContextResolverTest breaks
+lombok.anyConstructor.addConstructorProperties = true
diff --git a/pom.xml b/pom.xml
index eb98edf7ce..0bba74026b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -212,7 +212,7 @@
       <dependency>
         <groupId>org.projectlombok</groupId>
         <artifactId>lombok</artifactId>
-        <version>1.16.18</version>
+        <version>1.18.10</version>
         <scope>provided</scope>
       </dependency>
 
@@ -287,7 +287,7 @@
       <dependency>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-validator</artifactId>
-	<version>${hibernate-validator.version}</version>
+	      <version>${hibernate-validator.version}</version>
       </dependency>
 
       <!-- JUnit 5 -->