Return-Path: X-Original-To: apmail-maven-commits-archive@www.apache.org Delivered-To: apmail-maven-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9B42A9053 for ; Thu, 17 May 2012 15:52:43 +0000 (UTC) Received: (qmail 58220 invoked by uid 500); 17 May 2012 15:52:43 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 58172 invoked by uid 500); 17 May 2012 15:52:43 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 58163 invoked by uid 99); 17 May 2012 15:52:43 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 May 2012 15:52:43 +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, 17 May 2012 15:52:40 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 3BF6123889E1; Thu, 17 May 2012 15:52:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1339666 - in /maven/plugin-tools/trunk: maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/ maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/ maven-plugin-tools-java/src/site/apt/ Date: Thu, 17 May 2012 15:52:19 -0000 To: commits@maven.apache.org From: hboutemy@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120517155219.3BF6123889E1@eris.apache.org> Author: hboutemy Date: Thu May 17 15:52:18 2012 New Revision: 1339666 URL: http://svn.apache.org/viewvc?rev=1339666&view=rev Log: removed readonly and required attributes from component configuration, both in java 5 annotations or javadoc tags documentation, since they are ignored Modified: maven/plugin-tools/trunk/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Component.java maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/JavaAnnotationsMojoDescriptorExtractor.java maven/plugin-tools/trunk/maven-plugin-tools-java/src/site/apt/index.apt Modified: maven/plugin-tools/trunk/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Component.java URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Component.java?rev=1339666&r1=1339665&r2=1339666&view=diff ============================================================================== --- maven/plugin-tools/trunk/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Component.java (original) +++ maven/plugin-tools/trunk/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Component.java Thu May 17 15:52:18 2012 @@ -49,16 +49,4 @@ public @interface Component * @return the role-hint */ String roleHint() default ""; - - /** - * is the component required? - * @return true if the Mojo should fail when the component cannot be injected - */ - boolean required() default true; - - /** - * ignored... - * @return - */ - boolean readonly() default true; } Modified: maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/JavaAnnotationsMojoDescriptorExtractor.java URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/JavaAnnotationsMojoDescriptorExtractor.java?rev=1339666&r1=1339665&r2=1339666&view=diff ============================================================================== --- maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/JavaAnnotationsMojoDescriptorExtractor.java (original) +++ maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/JavaAnnotationsMojoDescriptorExtractor.java Thu May 17 15:52:18 2012 @@ -510,11 +510,11 @@ public class JavaAnnotationsMojoDescript parameter.setName( componentAnnotationContent.getFieldName() ); parameter.setRequirement( new Requirement( componentAnnotationContent.role(), componentAnnotationContent.roleHint() ) ); - parameter.setEditable( false ); parameter.setDeprecated( componentAnnotationContent.getDeprecated() ); parameter.setSince( componentAnnotationContent.getSince() ); + // same behaviour as JavaMojoDescriptorExtractor - //parameter.setRequired( componentAnnotationContent.required() ); + //parameter.setRequired( ... ); parameter.setEditable( false ); mojoDescriptor.addParameter( parameter ); } Modified: maven/plugin-tools/trunk/maven-plugin-tools-java/src/site/apt/index.apt URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-java/src/site/apt/index.apt?rev=1339666&r1=1339665&r2=1339666&view=diff ============================================================================== --- maven/plugin-tools/trunk/maven-plugin-tools-java/src/site/apt/index.apt (original) +++ maven/plugin-tools/trunk/maven-plugin-tools-java/src/site/apt/index.apt Thu May 17 15:52:18 2012 @@ -72,8 +72,6 @@ public class MyMojo /** * @component role="..." roleHint="..." - * @readonly - * @required * @since * @deprecated */ @@ -93,4 +91,4 @@ public class MyMojo * {{{/developers/mojo-api-specification.html#The_Descriptor_and_Annotations}Mojo API Specification}} - * {{{/ref/current/maven-plugin-api/plugin.html}META-INF/maven/plugin.xml plugin descriptor}} + * {{{/ref/current/maven-plugin-api/plugin.html}<<>> plugin descriptor}}