[jira] [Commented] (MPLUGIN-331) Check the existence of plugin.xml rather than project packaging in PluginReport.canGenerateReport()
[ https://issues.apache.org/jira/browse/MPLUGIN-331?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16325382#comment-16325382 ] Hudson commented on MPLUGIN-331: Build succeeded in Jenkins: Maven TLP » maven-plugin-tools » master #12 See https://builds.apache.org/job/maven-box/job/maven-plugin-tools/job/master/12/ > Check the existence of plugin.xml rather than project packaging in > PluginReport.canGenerateReport() > --- > > Key: MPLUGIN-331 > URL: https://issues.apache.org/jira/browse/MPLUGIN-331 > Project: Maven Plugin Tools > Issue Type: Task > Components: Plugin Plugin >Reporter: Peter Palaga >Assignee: Hervé Boutemy > Fix For: 3.5.1 > > > {{org.apache.maven.plugin.plugin.PluginReport.canGenerateReport()}} currently > reads > {code} > return "maven-plugin".equals( project.getPackaging() ); > {code} > I propose to change it to > {code} > return "maven-plugin".equals( project.getPackaging() ) > || "takari-maven-plugin".equals( project.getPackaging() ); > {code} > so that also takari-maven-plugins are supported. -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (MPLUGIN-331) Check the existence of plugin.xml rather than project packaging in PluginReport.canGenerateReport()
[ https://issues.apache.org/jira/browse/MPLUGIN-331?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16325379#comment-16325379 ] ASF GitHub Bot commented on MPLUGIN-331: hboutemy commented on issue #10: [MPLUGIN-331] Let plugin:report support takari-maven-plugin packaging URL: https://github.com/apache/maven-plugin-tools/pull/10#issuecomment-357475458 ok, I'll mark it as read only This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > Check the existence of plugin.xml rather than project packaging in > PluginReport.canGenerateReport() > --- > > Key: MPLUGIN-331 > URL: https://issues.apache.org/jira/browse/MPLUGIN-331 > Project: Maven Plugin Tools > Issue Type: Task > Components: Plugin Plugin >Reporter: Peter Palaga >Assignee: Hervé Boutemy > Fix For: 3.5.1 > > > {{org.apache.maven.plugin.plugin.PluginReport.canGenerateReport()}} currently > reads > {code} > return "maven-plugin".equals( project.getPackaging() ); > {code} > I propose to change it to > {code} > return "maven-plugin".equals( project.getPackaging() ) > || "takari-maven-plugin".equals( project.getPackaging() ); > {code} > so that also takari-maven-plugins are supported. -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (MPLUGIN-331) Check the existence of plugin.xml rather than project packaging in PluginReport.canGenerateReport()
[ https://issues.apache.org/jira/browse/MPLUGIN-331?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16322145#comment-16322145 ] ASF GitHub Bot commented on MPLUGIN-331: ppalaga commented on issue #10: [MPLUGIN-331] Let plugin:report support takari-maven-plugin packaging URL: https://github.com/apache/maven-plugin-tools/pull/10#issuecomment-356921328 @hboutemy @rfscholte sorry for the late response. I have to admit, I have envisaged the configurable `pluginXmlFile` to eventually be able to use an alternative `plugin.xml` only to produce the site during a release and keep using takari-lifecycle-plugin for jar. The takari-lifecycle-plugin produces an imperfect `plugin.xml` (see [1]) and the shortages matter only during the site production. This being only an initial idea rather than a proven solution how to fix my situation, I agree to either make the param readonly or remove the param altogether and hard code the plugin.xml path instead. Thanks for your patience. [1] https://github.com/takari/takari-lifecycle/issues/63 This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > Check the existence of plugin.xml rather than project packaging in > PluginReport.canGenerateReport() > --- > > Key: MPLUGIN-331 > URL: https://issues.apache.org/jira/browse/MPLUGIN-331 > Project: Maven Plugin Tools > Issue Type: Task > Components: Plugin Plugin >Reporter: Peter Palaga >Assignee: Hervé Boutemy > Fix For: 3.5.1 > > > {{org.apache.maven.plugin.plugin.PluginReport.canGenerateReport()}} currently > reads > {code} > return "maven-plugin".equals( project.getPackaging() ); > {code} > I propose to change it to > {code} > return "maven-plugin".equals( project.getPackaging() ) > || "takari-maven-plugin".equals( project.getPackaging() ); > {code} > so that also takari-maven-plugins are supported. -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (MPLUGIN-331) Check the existence of plugin.xml rather than project packaging in PluginReport.canGenerateReport()
[ https://issues.apache.org/jira/browse/MPLUGIN-331?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16321298#comment-16321298 ] ASF GitHub Bot commented on MPLUGIN-331: hboutemy commented on issue #10: [MPLUGIN-331] Let plugin:report support takari-maven-plugin packaging URL: https://github.com/apache/maven-plugin-tools/pull/10#issuecomment-356764884 Peter: IIUC, making this location configurable is not useful to your use case, isn't it? Then it's better to not add an additional parameter that nobody will ever use: it's just noise and complexity Without objection, I'll do the job in a few days (and do a release :) ) This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > Check the existence of plugin.xml rather than project packaging in > PluginReport.canGenerateReport() > --- > > Key: MPLUGIN-331 > URL: https://issues.apache.org/jira/browse/MPLUGIN-331 > Project: Maven Plugin Tools > Issue Type: Task > Components: Plugin Plugin >Reporter: Peter Palaga >Assignee: Hervé Boutemy > Fix For: 3.5.1 > > > {{org.apache.maven.plugin.plugin.PluginReport.canGenerateReport()}} currently > reads > {code} > return "maven-plugin".equals( project.getPackaging() ); > {code} > I propose to change it to > {code} > return "maven-plugin".equals( project.getPackaging() ) > || "takari-maven-plugin".equals( project.getPackaging() ); > {code} > so that also takari-maven-plugins are supported. -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (MPLUGIN-331) Check the existence of plugin.xml rather than project packaging in PluginReport.canGenerateReport()
[ https://issues.apache.org/jira/browse/MPLUGIN-331?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16315452#comment-16315452 ] ASF GitHub Bot commented on MPLUGIN-331: rfscholte commented on a change in pull request #10: [MPLUGIN-331] Let plugin:report support takari-maven-plugin packaging URL: https://github.com/apache/maven-plugin-tools/pull/10#discussion_r160058763 ## File path: maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java ## @@ -197,9 +197,18 @@ @Component private RuntimeInformation rtInfo; +/** + * Path to {@code plugin.xml} plugin descriptor to generate the report from. + * + * @since 3.5.1 + */ +@Parameter( defaultValue = "${project.build.outputDirectory}/META-INF/maven/plugin.xml", required = true ) Review comment: The claim of breaking things is a bit too hard, but making it variable assumes that is configurable in real world. It will also appear on reports like the goal page, the help goal, etc. Let's not confuse people or show parameters which will only distract them. What is the issue of *not* making it readOnly? This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > Check the existence of plugin.xml rather than project packaging in > PluginReport.canGenerateReport() > --- > > Key: MPLUGIN-331 > URL: https://issues.apache.org/jira/browse/MPLUGIN-331 > Project: Maven Plugin Tools > Issue Type: Task > Components: Plugin Plugin >Reporter: Peter Palaga >Assignee: Hervé Boutemy > Fix For: 3.5.1 > > > {{org.apache.maven.plugin.plugin.PluginReport.canGenerateReport()}} currently > reads > {code} > return "maven-plugin".equals( project.getPackaging() ); > {code} > I propose to change it to > {code} > return "maven-plugin".equals( project.getPackaging() ) > || "takari-maven-plugin".equals( project.getPackaging() ); > {code} > so that also takari-maven-plugins are supported. -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (MPLUGIN-331) Check the existence of plugin.xml rather than project packaging in PluginReport.canGenerateReport()
[ https://issues.apache.org/jira/browse/MPLUGIN-331?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16315445#comment-16315445 ] ASF GitHub Bot commented on MPLUGIN-331: ppalaga commented on a change in pull request #10: [MPLUGIN-331] Let plugin:report support takari-maven-plugin packaging URL: https://github.com/apache/maven-plugin-tools/pull/10#discussion_r160058324 ## File path: maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java ## @@ -197,9 +197,18 @@ @Component private RuntimeInformation rtInfo; +/** + * Path to {@code plugin.xml} plugin descriptor to generate the report from. + * + * @since 3.5.1 + */ +@Parameter( defaultValue = "${project.build.outputDirectory}/META-INF/maven/plugin.xml", required = true ) Review comment: Thanks for the explanation, @rfscholte . But https://maven.apache.org/ref/3.5.2/maven-plugin-api/ seems to define the the location of the `plugin.xml` within the `jar` rather than its location in the source tree. This `pluginXmlFile` indeed is a location in the source tree and this `PluginReport` is a report mojo that will not impact the location of `plugin.xml` in the jar in any way. That said, I cannot see how a writable `pluginXmlFile` can violate the maven-plugin-api. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > Check the existence of plugin.xml rather than project packaging in > PluginReport.canGenerateReport() > --- > > Key: MPLUGIN-331 > URL: https://issues.apache.org/jira/browse/MPLUGIN-331 > Project: Maven Plugin Tools > Issue Type: Task > Components: Plugin Plugin >Reporter: Peter Palaga >Assignee: Hervé Boutemy > Fix For: 3.5.1 > > > {{org.apache.maven.plugin.plugin.PluginReport.canGenerateReport()}} currently > reads > {code} > return "maven-plugin".equals( project.getPackaging() ); > {code} > I propose to change it to > {code} > return "maven-plugin".equals( project.getPackaging() ) > || "takari-maven-plugin".equals( project.getPackaging() ); > {code} > so that also takari-maven-plugins are supported. -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (MPLUGIN-331) Check the existence of plugin.xml rather than project packaging in PluginReport.canGenerateReport()
[ https://issues.apache.org/jira/browse/MPLUGIN-331?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16315403#comment-16315403 ] ASF GitHub Bot commented on MPLUGIN-331: rfscholte commented on a change in pull request #10: [MPLUGIN-331] Let plugin:report support takari-maven-plugin packaging URL: https://github.com/apache/maven-plugin-tools/pull/10#discussion_r160055432 ## File path: maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java ## @@ -197,9 +197,18 @@ @Component private RuntimeInformation rtInfo; +/** + * Path to {@code plugin.xml} plugin descriptor to generate the report from. + * + * @since 3.5.1 + */ +@Parameter( defaultValue = "${project.build.outputDirectory}/META-INF/maven/plugin.xml", required = true ) Review comment: https://maven.apache.org/ref/3.5.2/maven-plugin-api/ says that the `plugin.xml` is alwys expected at this location. So it should be considered a contant, not a variable, hence why I would like to see it as readOnly. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > Check the existence of plugin.xml rather than project packaging in > PluginReport.canGenerateReport() > --- > > Key: MPLUGIN-331 > URL: https://issues.apache.org/jira/browse/MPLUGIN-331 > Project: Maven Plugin Tools > Issue Type: Task > Components: Plugin Plugin >Reporter: Peter Palaga >Assignee: Hervé Boutemy > Fix For: 3.5.1 > > > {{org.apache.maven.plugin.plugin.PluginReport.canGenerateReport()}} currently > reads > {code} > return "maven-plugin".equals( project.getPackaging() ); > {code} > I propose to change it to > {code} > return "maven-plugin".equals( project.getPackaging() ) > || "takari-maven-plugin".equals( project.getPackaging() ); > {code} > so that also takari-maven-plugins are supported. -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (MPLUGIN-331) Check the existence of plugin.xml rather than project packaging in PluginReport.canGenerateReport()
[ https://issues.apache.org/jira/browse/MPLUGIN-331?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16315347#comment-16315347 ] ASF GitHub Bot commented on MPLUGIN-331: ppalaga commented on issue #10: [MPLUGIN-331] Let plugin:report support takari-maven-plugin packaging URL: https://github.com/apache/maven-plugin-tools/pull/10#issuecomment-355831723 > Changing its value will break things. Which things will it break? This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > Check the existence of plugin.xml rather than project packaging in > PluginReport.canGenerateReport() > --- > > Key: MPLUGIN-331 > URL: https://issues.apache.org/jira/browse/MPLUGIN-331 > Project: Maven Plugin Tools > Issue Type: Task > Components: Plugin Plugin >Reporter: Peter Palaga >Assignee: Hervé Boutemy > Fix For: 3.5.1 > > > {{org.apache.maven.plugin.plugin.PluginReport.canGenerateReport()}} currently > reads > {code} > return "maven-plugin".equals( project.getPackaging() ); > {code} > I propose to change it to > {code} > return "maven-plugin".equals( project.getPackaging() ) > || "takari-maven-plugin".equals( project.getPackaging() ); > {code} > so that also takari-maven-plugins are supported. -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (MPLUGIN-331) Check the existence of plugin.xml rather than project packaging in PluginReport.canGenerateReport()
[ https://issues.apache.org/jira/browse/MPLUGIN-331?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16315350#comment-16315350 ] ASF GitHub Bot commented on MPLUGIN-331: ppalaga commented on a change in pull request #10: [MPLUGIN-331] Let plugin:report support takari-maven-plugin packaging URL: https://github.com/apache/maven-plugin-tools/pull/10#discussion_r160052969 ## File path: maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java ## @@ -197,9 +197,18 @@ @Component private RuntimeInformation rtInfo; +/** + * Path to {@code plugin.xml} plugin descriptor to generate the report from. + * + * @since 3.5.1 + */ +@Parameter( defaultValue = "${project.build.outputDirectory}/META-INF/maven/plugin.xml", required = true ) Review comment: Which things will it break? This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > Check the existence of plugin.xml rather than project packaging in > PluginReport.canGenerateReport() > --- > > Key: MPLUGIN-331 > URL: https://issues.apache.org/jira/browse/MPLUGIN-331 > Project: Maven Plugin Tools > Issue Type: Task > Components: Plugin Plugin >Reporter: Peter Palaga >Assignee: Hervé Boutemy > Fix For: 3.5.1 > > > {{org.apache.maven.plugin.plugin.PluginReport.canGenerateReport()}} currently > reads > {code} > return "maven-plugin".equals( project.getPackaging() ); > {code} > I propose to change it to > {code} > return "maven-plugin".equals( project.getPackaging() ) > || "takari-maven-plugin".equals( project.getPackaging() ); > {code} > so that also takari-maven-plugins are supported. -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (MPLUGIN-331) Check the existence of plugin.xml rather than project packaging in PluginReport.canGenerateReport()
[ https://issues.apache.org/jira/browse/MPLUGIN-331?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16315348#comment-16315348 ] ASF GitHub Bot commented on MPLUGIN-331: ppalaga commented on issue #10: [MPLUGIN-331] Let plugin:report support takari-maven-plugin packaging URL: https://github.com/apache/maven-plugin-tools/pull/10#issuecomment-355831723 > Changing its value will break things. Which things will it break? This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > Check the existence of plugin.xml rather than project packaging in > PluginReport.canGenerateReport() > --- > > Key: MPLUGIN-331 > URL: https://issues.apache.org/jira/browse/MPLUGIN-331 > Project: Maven Plugin Tools > Issue Type: Task > Components: Plugin Plugin >Reporter: Peter Palaga >Assignee: Hervé Boutemy > Fix For: 3.5.1 > > > {{org.apache.maven.plugin.plugin.PluginReport.canGenerateReport()}} currently > reads > {code} > return "maven-plugin".equals( project.getPackaging() ); > {code} > I propose to change it to > {code} > return "maven-plugin".equals( project.getPackaging() ) > || "takari-maven-plugin".equals( project.getPackaging() ); > {code} > so that also takari-maven-plugins are supported. -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (MPLUGIN-331) Check the existence of plugin.xml rather than project packaging in PluginReport.canGenerateReport()
[ https://issues.apache.org/jira/browse/MPLUGIN-331?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16314810#comment-16314810 ] ASF GitHub Bot commented on MPLUGIN-331: rfscholte commented on a change in pull request #10: [MPLUGIN-331] Let plugin:report support takari-maven-plugin packaging URL: https://github.com/apache/maven-plugin-tools/pull/10#discussion_r160032052 ## File path: maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java ## @@ -197,9 +197,18 @@ @Component private RuntimeInformation rtInfo; +/** + * Path to {@code plugin.xml} plugin descriptor to generate the report from. + * + * @since 3.5.1 + */ +@Parameter( defaultValue = "${project.build.outputDirectory}/META-INF/maven/plugin.xml", required = true ) Review comment: I would like to see this as a readOnly parameter. Changing its value will break things. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > Check the existence of plugin.xml rather than project packaging in > PluginReport.canGenerateReport() > --- > > Key: MPLUGIN-331 > URL: https://issues.apache.org/jira/browse/MPLUGIN-331 > Project: Maven Plugin Tools > Issue Type: Task > Components: Plugin Plugin >Reporter: Peter Palaga >Assignee: Hervé Boutemy > Fix For: 3.5.1 > > > {{org.apache.maven.plugin.plugin.PluginReport.canGenerateReport()}} currently > reads > {code} > return "maven-plugin".equals( project.getPackaging() ); > {code} > I propose to change it to > {code} > return "maven-plugin".equals( project.getPackaging() ) > || "takari-maven-plugin".equals( project.getPackaging() ); > {code} > so that also takari-maven-plugins are supported. -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (MPLUGIN-331) Check the existence of plugin.xml rather than project packaging in PluginReport.canGenerateReport()
[ https://issues.apache.org/jira/browse/MPLUGIN-331?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16314250#comment-16314250 ] Hudson commented on MPLUGIN-331: Build succeeded in Jenkins: Maven TLP » maven-plugin-tools » master #7 See https://builds.apache.org/job/maven-box/job/maven-plugin-tools/job/master/7/ > Check the existence of plugin.xml rather than project packaging in > PluginReport.canGenerateReport() > --- > > Key: MPLUGIN-331 > URL: https://issues.apache.org/jira/browse/MPLUGIN-331 > Project: Maven Plugin Tools > Issue Type: Task > Components: Plugin Plugin >Reporter: Peter Palaga > Fix For: 3.5.1 > > > {{org.apache.maven.plugin.plugin.PluginReport.canGenerateReport()}} currently > reads > {code} > return "maven-plugin".equals( project.getPackaging() ); > {code} > I propose to change it to > {code} > return "maven-plugin".equals( project.getPackaging() ) > || "takari-maven-plugin".equals( project.getPackaging() ); > {code} > so that also takari-maven-plugins are supported. -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (MPLUGIN-331) Check the existence of plugin.xml rather than project packaging in PluginReport.canGenerateReport()
[ https://issues.apache.org/jira/browse/MPLUGIN-331?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16314238#comment-16314238 ] ASF GitHub Bot commented on MPLUGIN-331: asfgit closed pull request #10: [MPLUGIN-331] Let plugin:report support takari-maven-plugin packaging URL: https://github.com/apache/maven-plugin-tools/pull/10 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java index 553af0e1..1193e109 100644 --- a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java +++ b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java @@ -197,9 +197,18 @@ @Component private RuntimeInformation rtInfo; +/** + * Path to {@code plugin.xml} plugin descriptor to generate the report from. + * + * @since 3.5.1 + */ +@Parameter( defaultValue = "${project.build.outputDirectory}/META-INF/maven/plugin.xml", required = true ) +private File pluginXmlFile; + /** * {@inheritDoc} */ +@Override protected Renderer getSiteRenderer() { return siteRenderer; @@ -208,6 +217,7 @@ protected Renderer getSiteRenderer() /** * {@inheritDoc} */ +@Override protected String getOutputDirectory() { // PLUGIN-191: output directory of plugin.html, not *-mojo.xml @@ -217,6 +227,7 @@ protected String getOutputDirectory() /** * {@inheritDoc} */ +@Override protected MavenProject getProject() { return project; @@ -225,14 +236,16 @@ protected MavenProject getProject() /** * {@inheritDoc} */ +@Override public boolean canGenerateReport() { -return "maven-plugin".equals( project.getPackaging() ); +return pluginXmlFile != null && pluginXmlFile.isFile() && pluginXmlFile.canRead(); } /** * {@inheritDoc} */ +@Override protected void executeReport( Locale locale ) throws MavenReportException { @@ -264,16 +277,15 @@ private PluginDescriptor extractPluginDescriptor() try { -return builder.build( new FileReader( new File( project.getBuild().getOutputDirectory(), - "META-INF/maven/plugin.xml" ) ) ); +return builder.build( new FileReader( pluginXmlFile ) ); } catch ( FileNotFoundException e ) { -getLog().debug( "Failed to read META-INF/maven/plugin.xml, fall back to mojoScanner" ); +getLog().debug( "Failed to read " + pluginXmlFile + ", fall back to mojoScanner" ); } catch ( PlexusConfigurationException e ) { -getLog().debug( "Failed to read META-INF/maven/plugin.xml, fall back to mojoScanner" ); +getLog().debug( "Failed to read " + pluginXmlFile + ", fall back to mojoScanner" ); } // Copy from AbstractGeneratorMojo#execute() @@ -365,6 +377,7 @@ private PluginDescriptorBuilder getPluginDescriptorBuilder() /** * {@inheritDoc} */ +@Override public String getDescription( Locale locale ) { return getBundle( locale ).getString( "report.plugin.description" ); @@ -373,6 +386,7 @@ public String getDescription( Locale locale ) /** * {@inheritDoc} */ +@Override public String getName( Locale locale ) { return getBundle( locale ).getString( "report.plugin.name" ); @@ -381,6 +395,7 @@ public String getName( Locale locale ) /** * {@inheritDoc} */ +@Override public String getOutputName() { return "plugin-info"; @@ -460,6 +475,7 @@ public PluginOverviewRenderer( MavenProject project, Requirements requirements, /** * {@inheritDoc} */ +@Override public String getTitle() { return getBundle( locale ).getString( "report.plugin.title" ); @@ -468,6 +484,7 @@ public String getTitle() /** * {@inheritDoc} */ +@Override @SuppressWarnings( { "unchecked", "rawtypes" } ) public void renderBody() { This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > Check the
[jira] [Commented] (MPLUGIN-331) Check the existence of plugin.xml rather than project packaging in PluginReport.canGenerateReport()
[ https://issues.apache.org/jira/browse/MPLUGIN-331?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16312591#comment-16312591 ] Peter Palaga commented on MPLUGIN-331: -- OK, updated the PR: * {{since 3.5.1}} * {{@Override}} in a separate commit * Trailing whitespace left untouched > Check the existence of plugin.xml rather than project packaging in > PluginReport.canGenerateReport() > --- > > Key: MPLUGIN-331 > URL: https://issues.apache.org/jira/browse/MPLUGIN-331 > Project: Maven Plugin Tools > Issue Type: Task > Components: Plugin Plugin >Reporter: Peter Palaga > Fix For: 3.5.1 > > > {{org.apache.maven.plugin.plugin.PluginReport.canGenerateReport()}} currently > reads > {code} > return "maven-plugin".equals( project.getPackaging() ); > {code} > I propose to change it to > {code} > return "maven-plugin".equals( project.getPackaging() ) > || "takari-maven-plugin".equals( project.getPackaging() ); > {code} > so that also takari-maven-plugins are supported. -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (MPLUGIN-331) Check the existence of plugin.xml rather than project packaging in PluginReport.canGenerateReport()
[ https://issues.apache.org/jira/browse/MPLUGIN-331?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16312103#comment-16312103 ] Hervé Boutemy commented on MPLUGIN-331: --- is it a new feature? it can be discussed... let's not be picky: it'll go in the next release, as a complement to MPLUGIN-310 then consider it for 3.5.1 > Check the existence of plugin.xml rather than project packaging in > PluginReport.canGenerateReport() > --- > > Key: MPLUGIN-331 > URL: https://issues.apache.org/jira/browse/MPLUGIN-331 > Project: Maven Plugin Tools > Issue Type: Task > Components: Plugin Plugin >Reporter: Peter Palaga > Fix For: 3.5.1 > > > {{org.apache.maven.plugin.plugin.PluginReport.canGenerateReport()}} currently > reads > {code} > return "maven-plugin".equals( project.getPackaging() ); > {code} > I propose to change it to > {code} > return "maven-plugin".equals( project.getPackaging() ) > || "takari-maven-plugin".equals( project.getPackaging() ); > {code} > so that also takari-maven-plugins are supported. -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (MPLUGIN-331) Check the existence of plugin.xml rather than project packaging in PluginReport.canGenerateReport()
[ https://issues.apache.org/jira/browse/MPLUGIN-331?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16311069#comment-16311069 ] Peter Palaga commented on MPLUGIN-331: -- [~hboutemy], I assumed this fix is not going to be available in 3.5.* because it is a new feature rather than a fix. That's why I used {{@since 3.6}} in https://github.com/apache/maven-plugin-tools/pull/10/commits/4537b92fdb8dec01300ee61a1a97baa2ae5d1a41#diff-a72a02035d1c1407a6e5cc6a911a648dR203 Should I change it to 3.5.1? > Check the existence of plugin.xml rather than project packaging in > PluginReport.canGenerateReport() > --- > > Key: MPLUGIN-331 > URL: https://issues.apache.org/jira/browse/MPLUGIN-331 > Project: Maven Plugin Tools > Issue Type: Task > Components: Plugin Plugin >Reporter: Peter Palaga > Fix For: 3.5.1 > > > {{org.apache.maven.plugin.plugin.PluginReport.canGenerateReport()}} currently > reads > {code} > return "maven-plugin".equals( project.getPackaging() ); > {code} > I propose to change it to > {code} > return "maven-plugin".equals( project.getPackaging() ) > || "takari-maven-plugin".equals( project.getPackaging() ); > {code} > so that also takari-maven-plugins are supported. -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (MPLUGIN-331) Check the existence of plugin.xml rather than project packaging in PluginReport.canGenerateReport()
[ https://issues.apache.org/jira/browse/MPLUGIN-331?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16309261#comment-16309261 ] Peter Palaga commented on MPLUGIN-331: -- Hm... my IDE removed the trailing whitespace in the entire class. Should I bother to revert the lines that do not have any significant change? > Check the existence of plugin.xml rather than project packaging in > PluginReport.canGenerateReport() > --- > > Key: MPLUGIN-331 > URL: https://issues.apache.org/jira/browse/MPLUGIN-331 > Project: Maven Plugin Tools > Issue Type: Task > Components: Plugin Plugin >Reporter: Peter Palaga > > {{org.apache.maven.plugin.plugin.PluginReport.canGenerateReport()}} currently > reads > {code} > return "maven-plugin".equals( project.getPackaging() ); > {code} > I propose to change it to > {code} > return "maven-plugin".equals( project.getPackaging() ) > || "takari-maven-plugin".equals( project.getPackaging() ); > {code} > so that also takari-maven-plugins are supported. -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (MPLUGIN-331) Check the existence of plugin.xml rather than project packaging in PluginReport.canGenerateReport()
[ https://issues.apache.org/jira/browse/MPLUGIN-331?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16309259#comment-16309259 ] Peter Palaga commented on MPLUGIN-331: -- Yes, the second proposal works. I changed the PR accordingly https://github.com/apache/maven-plugin-tools/pull/10. Could you please review? > Check the existence of plugin.xml rather than project packaging in > PluginReport.canGenerateReport() > --- > > Key: MPLUGIN-331 > URL: https://issues.apache.org/jira/browse/MPLUGIN-331 > Project: Maven Plugin Tools > Issue Type: Task > Components: Plugin Plugin >Reporter: Peter Palaga > > {{org.apache.maven.plugin.plugin.PluginReport.canGenerateReport()}} currently > reads > {code} > return "maven-plugin".equals( project.getPackaging() ); > {code} > I propose to change it to > {code} > return "maven-plugin".equals( project.getPackaging() ) > || "takari-maven-plugin".equals( project.getPackaging() ); > {code} > so that also takari-maven-plugins are supported. -- This message was sent by Atlassian JIRA (v6.4.14#64029)