diff --git a/dependency-export/build.gradle b/dependency-export/build.gradle
index 49cf2da..4998490 100644
--- a/dependency-export/build.gradle
+++ b/dependency-export/build.gradle
@@ -5,9 +5,9 @@ plugins {
 dependencies {
 }
 
-java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+compileJava {
+    options.release = 8
+    options.compilerArgs << '-parameters'
 }
 
 ["apiElements", "runtimeElements"].each { String name ->
diff --git a/jlink/build.gradle b/jlink/build.gradle
index 8b5735c..17d56e8 100644
--- a/jlink/build.gradle
+++ b/jlink/build.gradle
@@ -5,9 +5,9 @@ plugins {
 
 version = "0.1"
 
-java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+compileJava {
+    options.release = 8
+    options.compilerArgs << '-parameters'
 }
 
 gradlePlugin {
diff --git a/jpms-check/build.gradle b/jpms-check/build.gradle
index 489d23e..96d9f5b 100644
--- a/jpms-check/build.gradle
+++ b/jpms-check/build.gradle
@@ -13,7 +13,7 @@ gradlePlugin {
     }
 }
 
-java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+compileJava {
+    options.release = 8
+    options.compilerArgs << '-parameters'
 }
diff --git a/lombok/build.gradle b/lombok/build.gradle
index ddf536d..237e057 100644
--- a/lombok/build.gradle
+++ b/lombok/build.gradle
@@ -4,9 +4,9 @@ plugins {
 
 version = "0.1"
 
-java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+compileJava {
+    options.release = 8
+    options.compilerArgs << '-parameters'
 }
 
 gradlePlugin {
diff --git a/lombok/src/main/java/net/woggioni/gradle/lombok/LombokPlugin.java b/lombok/src/main/java/net/woggioni/gradle/lombok/LombokPlugin.java
index 9387327..1583247 100644
--- a/lombok/src/main/java/net/woggioni/gradle/lombok/LombokPlugin.java
+++ b/lombok/src/main/java/net/woggioni/gradle/lombok/LombokPlugin.java
@@ -19,6 +19,8 @@ import org.gradle.api.tasks.javadoc.Javadoc;
 import org.gradle.jvm.toolchain.JavaToolchainSpec;
 
 import java.io.File;
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.Map;
 
 public class LombokPlugin implements Plugin<Project> {
@@ -34,11 +36,13 @@ public class LombokPlugin implements Plugin<Project> {
                 );
         project.afterEvaluate(p -> {
             SourceSetContainer sourceSetContainer = project.getExtensions().findByType(JavaPluginExtension.class).getSourceSets();
-            Provider<Map<String, String>> dependencyNotationProvider = project.provider(() ->
-                    Map.of("group", "org.projectlombok",
-                            "name", "lombok",
-                            "version", ext.getVersion().get())
-            );
+            Provider<Map<String, String>> dependencyNotationProvider = project.provider(() -> {
+                 Map<String, String> m = new HashMap<>();
+                 m.put("group", "org.projectlombok");
+                 m.put("name", "lombok");
+                 m.put("version", ext.getVersion().get());
+                 return Collections.unmodifiableMap(m);
+            });
             Configuration lombokConfiguration = project.getConfigurations().create("lombok");
             project.getDependencies().addProvider(
                     lombokConfiguration.getName(),
diff --git a/multi-release-jar/build.gradle b/multi-release-jar/build.gradle
index d517680..99a1f45 100644
--- a/multi-release-jar/build.gradle
+++ b/multi-release-jar/build.gradle
@@ -18,7 +18,7 @@ gradlePlugin {
     }
 }
 
-java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+compileJava {
+    options.release = 8
+    options.compilerArgs << '-parameters'
 }
diff --git a/osgi-app/build.gradle b/osgi-app/build.gradle
index 9488134..1a3837d 100644
--- a/osgi-app/build.gradle
+++ b/osgi-app/build.gradle
@@ -8,10 +8,11 @@ childProjects.forEach {name, child ->
     child.with {
         apply plugin: 'maven-publish'
 
-        java {
-            sourceCompatibility = JavaVersion.VERSION_1_8
-            targetCompatibility = JavaVersion.VERSION_1_8
+        compileJava {
+            options.release = 8
+            options.compilerArgs << '-parameters'
         }
+
         publishing {
             repositories {
                 maven {
@@ -50,6 +51,11 @@ dependencies {
     }
 }
 
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
+
 jar {
     into("META-INF") {
         from(configurations.embedded)
diff --git a/wildfly/build.gradle b/wildfly/build.gradle
index f90f585..1674709 100644
--- a/wildfly/build.gradle
+++ b/wildfly/build.gradle
@@ -5,9 +5,9 @@ plugins {
 
 version = "0.1"
 
-java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+compileJava {
+    options.release = 8
+    options.compilerArgs << '-parameters'
 }
 
 gradlePlugin {