From 88b613e95f6d8991a047f13275179e190e4c7587 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Wed, 1 Aug 2012 18:13:13 -0400 Subject: [PATCH] [JENKINS-11739] Cannot compile a plugin with a Plugin subclass in the same package as a package-info.java. (Not quite FIXED yet since org.kohsuke.stapler.jsr269 seems to suffer from a similar bug, currently printing ugly warnings.) --- core/src/main/java/jenkins/PluginSubtypeMarker.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/jenkins/PluginSubtypeMarker.java b/core/src/main/java/jenkins/PluginSubtypeMarker.java index e3c27a4b51..6dba87f5cb 100644 --- a/core/src/main/java/jenkins/PluginSubtypeMarker.java +++ b/core/src/main/java/jenkins/PluginSubtypeMarker.java @@ -33,6 +33,7 @@ import javax.annotation.processing.SupportedAnnotationTypes; import javax.annotation.processing.SupportedSourceVersion; import javax.lang.model.SourceVersion; import javax.lang.model.element.Element; +import javax.lang.model.element.ElementKind; import javax.lang.model.element.Modifier; import javax.lang.model.element.TypeElement; import javax.lang.model.type.TypeMirror; @@ -81,8 +82,12 @@ public class PluginSubtypeMarker extends AbstractProcessor { } }; - for( Element e : roundEnv.getRootElements() ) - scanner.scan(e,null); + for (Element e : roundEnv.getRootElements()) { + if (e.getKind() == ElementKind.PACKAGE) { // JENKINS-11739 + continue; + } + scanner.scan(e, null); + } return false; } catch (RuntimeException e) { -- GitLab