Return-Path: X-Original-To: apmail-logging-commits-archive@minotaur.apache.org Delivered-To: apmail-logging-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0357E11FD8 for ; Thu, 3 Jul 2014 01:32:14 +0000 (UTC) Received: (qmail 40250 invoked by uid 500); 3 Jul 2014 01:32:13 -0000 Delivered-To: apmail-logging-commits-archive@logging.apache.org Received: (qmail 40219 invoked by uid 500); 3 Jul 2014 01:32:13 -0000 Mailing-List: contact commits-help@logging.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@logging.apache.org Delivered-To: mailing list commits@logging.apache.org Received: (qmail 40210 invoked by uid 99); 3 Jul 2014 01:32:13 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Jul 2014 01:32:13 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Jul 2014 01:32:15 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 356BA2388831; Thu, 3 Jul 2014 01:31:50 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1607509 - /logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/processor/PluginProcessor.java Date: Thu, 03 Jul 2014 01:31:50 -0000 To: commits@logging.apache.org From: mattsicker@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140703013150.356BA2388831@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mattsicker Date: Thu Jul 3 01:31:49 2014 New Revision: 1607509 URL: http://svn.apache.org/r1607509 Log: Use latest Java release for supported version in annotation processor. - Fixes LOG4J2-683. - Since we're extending the version 6 visitor classes, we should be fine in newer Java versions (tested in Java 1.8, no problems). Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/processor/PluginProcessor.java Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/processor/PluginProcessor.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/processor/PluginProcessor.java?rev=1607509&r1=1607508&r2=1607509&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/processor/PluginProcessor.java (original) +++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/processor/PluginProcessor.java Thu Jul 3 01:31:49 2014 @@ -28,7 +28,6 @@ import java.util.concurrent.ConcurrentMa import javax.annotation.processing.AbstractProcessor; import javax.annotation.processing.RoundEnvironment; 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.ElementVisitor; @@ -47,7 +46,6 @@ import org.apache.logging.log4j.util.Str * Annotation processor for pre-scanning Log4j 2 plugins. */ @SupportedAnnotationTypes("org.apache.logging.log4j.core.config.plugins.*") -@SupportedSourceVersion(SourceVersion.RELEASE_6) public class PluginProcessor extends AbstractProcessor { // TODO: this could be made more abstract to allow for compile-time and run-time plugin processing @@ -61,6 +59,11 @@ public class PluginProcessor extends Abs private final PluginCache pluginCache = new PluginCache(); @Override + public SourceVersion getSupportedSourceVersion() { + return SourceVersion.latest(); + } + + @Override public boolean process(final Set annotations, final RoundEnvironment roundEnv) { try { final Set elements = roundEnv.getElementsAnnotatedWith(Plugin.class);