Merge branch '2.1.x' into 2.2.x

Author: snicoll

.bomr/bomr.yaml

@@ -12,6 +12,10 @@ bomr:
         versions:
           # 10.15 requires Java 9
           - '[10.15,)'
+      - project: groovy
+        versions:
+          # Regression with @Log
+          - '[2.5.13,2.5.14)'
   verify:
     ignored-dependencies:
       # Avoid conflicting transitive requirements for