[groovy] branch GROOVY_2_4_X updated: GROOVY-9185: groovyc doesn't keep RetentionPolicy in generated bytecode (port to 2_4_X)

[pa...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

paulk pushed a commit to branch GROOVY_2_4_X
in repository https://gitbox.apache.org/repos/asf/groovy.git


The following commit(s) were added to refs/heads/GROOVY_2_4_X by this push:
     new 7540988  GROOVY-9185: groovyc doesn't keep RetentionPolicy in generated bytecode (port to 2_4_X)
7540988 is described below

commit 75409883243c5ccec63595e2904c07b3ac0a73a4
Author: Paul King <pa...@asert.com.au>
AuthorDate: Mon Feb 17 23:34:41 2020 +1000

    GROOVY-9185: groovyc doesn't keep RetentionPolicy in generated bytecode (port to 2_4_X)
---
 src/main/org/codehaus/groovy/vmplugin/v5/Java5.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/org/codehaus/groovy/vmplugin/v5/Java5.java b/src/main/org/codehaus/groovy/vmplugin/v5/Java5.java
index bf5461a..0c2059d 100644
--- a/src/main/org/codehaus/groovy/vmplugin/v5/Java5.java
+++ b/src/main/org/codehaus/groovy/vmplugin/v5/Java5.java
@@ -243,7 +243,9 @@ public class Java5 implements VMPlugin {
         for (AnnotationNode an : annotations) {
             configureAnnotationFromDefinition(an, node);
         }
-        configureAnnotationFromDefinition(node, node);
+        if (!node.getClassNode().getName().equals("java.lang.annotation.Retention")) {
+            configureAnnotationFromDefinition(node, node);
+        }
     }
 
     private void configureAnnotation(AnnotationNode node, Annotation annotation) {