From 13af40cdba0ff5402f665ad860ea585091ab82d2 Mon Sep 17 00:00:00 2001
From: Falko Modler <famod@users.noreply.github.com>
Date: Wed, 24 Feb 2021 19:53:23 +0100
Subject: [PATCH] Fix test-coverage problem in ConfigInstantiator & add jacoco
 to dependabot

---
 .github/dependabot.yml                                         | 1 +
 CONTRIBUTING.md                                                | 2 ++
 build-parent/pom.xml                                           | 3 ++-
 .../io/quarkus/runtime/configuration/ConfigInstantiator.java   | 2 +-
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index fd76bab4e76b7..a9537b5ef4323 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -69,6 +69,7 @@ updates:
       - dependency-name: org.mockito:*
       - dependency-name: org.awaitility:awaitility
       - dependency-name: com.thoughtworks.xstream:xstream
+      - dependency-name: org.jacoco:*
       # Maven plugins
       - dependency-name: net.revelc.code.formatter:formatter-maven-plugin
       - dependency-name: net.revelc.code:impsort-maven-plugin
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index eae0d8d60a329..4a048ccd6eeeb 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -367,6 +367,8 @@ then change into the `coverage-report` directory and run `mvn package`. The code
 This currently does not work on Windows as it uses a shell script to copy all the classes and files into the code coverage
 module.
 
+If you just need a report for a single module, run `mvn install jacoco:report -Ptest-coverage` in that module (or with `-f ...`).
+
 ## Extensions
 
 ### Descriptions
diff --git a/build-parent/pom.xml b/build-parent/pom.xml
index e111efa86c663..36d719186bfee 100644
--- a/build-parent/pom.xml
+++ b/build-parent/pom.xml
@@ -100,7 +100,8 @@
 
         <!-- Code Coverage Properties-->
         <jacoco.agent.argLine></jacoco.agent.argLine>
-        <jacoco.version>0.8.5</jacoco.version>
+        <!-- Note: this version is also set in quarkus-bom but BOMs don't contribute to pluginManagement or properties -->
+        <jacoco.version>0.8.6</jacoco.version>
 
         <maven-dependency-plugin.version>3.1.2</maven-dependency-plugin.version>
 
diff --git a/core/runtime/src/main/java/io/quarkus/runtime/configuration/ConfigInstantiator.java b/core/runtime/src/main/java/io/quarkus/runtime/configuration/ConfigInstantiator.java
index 96b763be8d38c..495d9df9074c1 100644
--- a/core/runtime/src/main/java/io/quarkus/runtime/configuration/ConfigInstantiator.java
+++ b/core/runtime/src/main/java/io/quarkus/runtime/configuration/ConfigInstantiator.java
@@ -65,7 +65,7 @@ private static void handleObject(String prefix, Object o, SmallRyeConfig config)
                 return;
             }
             for (Field field : cls.getDeclaredFields()) {
-                if (Modifier.isFinal(field.getModifiers())) {
+                if (field.isSynthetic() || Modifier.isFinal(field.getModifiers())) {
                     continue;
                 }
                 field.setAccessible(true);