You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by gn...@apache.org on 2023/02/12 18:34:14 UTC
[maven-plugin-tools] branch master updated (866e8d9f -> 21f9d21d)
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git
from 866e8d9f [MPLUGIN-448] fix documentation: aggregator at goal level, not plugin (#187)
new 2c52e89d [MPLUGIN-447] Update to Maven Parent POM 39
new 21f9d21d [MPLUGIN-447] Reformat
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
maven-plugin-annotations/pom.xml | 4 +-
.../maven/plugins/annotations/Component.java | 10 +-
.../apache/maven/plugins/annotations/Execute.java | 10 +-
.../plugins/annotations/InstantiationStrategy.java | 20 +-
.../maven/plugins/annotations/LifecyclePhase.java | 76 +-
.../org/apache/maven/plugins/annotations/Mojo.java | 12 +-
.../maven/plugins/annotations/Parameter.java | 14 +-
.../maven/plugins/annotations/ResolutionScope.java | 24 +-
maven-plugin-plugin/pom.xml | 19 +-
.../org/apache/maven/plugin/coreit/FirstMojo.java | 41 +-
.../apache/maven/plugins/AbstractFirstMojo.java | 21 +-
.../apache/maven/plugin/coreit/CoreIt0014Mojo.java | 50 +-
.../org/apache/maven/plugin/coreit/FirstMojo.java | 48 +-
.../org/apache/maven/plugin/coreit/SecondMojo.java | 18 +-
.../maven/plugin/coreit/AbstractFirstMojo.java | 21 +-
.../maven/plugin/coreit/AbstractFooMojo.java | 7 +-
.../apache/maven/plugin/coreit/CoreIt0014Mojo.java | 50 +-
.../org/apache/maven/plugin/coreit/FirstMojo.java | 53 +-
.../org/apache/maven/plugin/coreit/SecondMojo.java | 18 +-
.../org/apache/maven/plugin/coreit/ThirdMojo.java | 53 +-
.../maven/plugins/antWithRefs/ArtifactsTask.java | 14 +-
.../org/apache/maven/plugin/coreit/FirstMojo.java | 19 +-
.../src/main/java/test/MyMojo.java | 28 +-
.../src/main/java/test/MyMojo.java | 30 +-
.../it/help-basic/src/main/java/test/MyMojo.java | 30 +-
.../it/help-package/src/main/java/test/MyMojo.java | 18 +-
.../dep-a/src/main/java/test/ClassA.java | 11 +-
.../dep-b/src/main/java/test/ClassB.java | 15 +-
.../test/src/main/java/test/SomeMojo.java | 13 +-
.../apache/maven/plugin/coreit/CoreIt0014Mojo.java | 50 +-
.../org/apache/maven/plugin/coreit/FirstMojo.java | 35 +-
.../apache/maven/plugin/coreit/MPlugin220Mojo.java | 25 +-
.../org/apache/maven/plugin/coreit/Maximal.java | 58 +-
.../org/apache/maven/plugin/coreit/Minimal.java | 14 +-
.../apache/maven/plugin/coreit/TestInterface.java | 7 +-
.../apache/maven/plugin/coreit/CoreIt0014Mojo.java | 50 +-
.../org/apache/maven/plugin/coreit/FirstMojo.java | 35 +-
.../apache/maven/plugin/coreit/MPlugin220Mojo.java | 25 +-
.../org/apache/maven/plugin/coreit/Maximal.java | 58 +-
.../org/apache/maven/plugin/coreit/Minimal.java | 14 +-
.../apache/maven/plugin/coreit/TestInterface.java | 7 +-
.../apache/maven/plugin/coreit/CoreIt0014Mojo.java | 50 +-
.../org/apache/maven/plugin/coreit/FirstMojo.java | 35 +-
.../apache/maven/plugin/coreit/MPlugin220Mojo.java | 25 +-
.../apache/maven/plugin/coreit/MPlugin396Mojo.java | 13 +-
.../org/apache/maven/plugin/coreit/Maximal.java | 58 +-
.../org/apache/maven/plugin/coreit/Minimal.java | 14 +-
.../apache/maven/plugin/coreit/CoreIt0013Mojo.java | 46 +-
.../org/apache/maven/plugin/coreit/FirstMojo.java | 24 +-
.../org/apache/maven/plugin/coreit/Maximal.java | 13 +-
.../org/apache/maven/plugin/coreit/Minimal.java | 12 +-
.../org/apache/maven/plugins/plugin/it/MyMojo.java | 61 +-
.../src/main/java/fr/ca/MyMojo.java | 9 +-
.../src/main/java/fr/ca/TestInterface.java | 7 +-
.../src/main/java/test/MyMojo.java | 68 +-
.../plugins/plugin/it/CustomSurefireMojo.java | 188 ++--
.../plugins/plugin/it/CustomSurefireMojo.java | 188 ++--
.../plugins/plugin/it/CustomSurefireMojo.java | 188 ++--
.../src/main/java/test/MyMojo.java | 130 ++-
.../src/main/java/test/MyMojo.java | 30 +-
.../org/apache/maven/plugin/coreit/FirstMojo.java | 22 +-
.../org/apache/maven/plugin/coreit/FirstMojo.java | 22 +-
.../org/apache/maven/plugin/coreit/FirstMojo.java | 41 +-
.../org/apache/maven/plugin/coreit/FirstMojo.java | 22 +-
.../org/apache/maven/plugin/coreit/FirstMojo.java | 22 +-
.../org/apache/maven/plugin/coreit/FirstMojo.java | 43 +-
.../apache/maven/plugin/coreit/CoreIt0013Mojo.java | 46 +-
.../org/apache/maven/plugin/coreit/FirstMojo.java | 24 +-
.../org/apache/maven/plugin/coreit/SecondMojo.java | 14 +-
.../latin-1/src/main/java/test/MyMojo.java | 14 +-
.../utf-8/src/main/java/test/MyMojo.java | 16 +-
.../java/org/apache/maven/its/v4api/FirstMojo.java | 36 +-
.../metadata/GroupRepositoryMetadata.java | 70 +-
.../maven/plugin/plugin/AbstractGeneratorMojo.java | 62 +-
.../plugin/plugin/DescriptorGeneratorMojo.java | 304 +++----
.../maven/plugin/plugin/HelpGeneratorMojo.java | 70 +-
.../metadata/AddPluginArtifactMetadataMojo.java | 42 +-
.../plugin/plugin/report_old/PluginReport.java | 528 ++++++------
.../plugin/plugin/report_old/Requirements.java | 38 +-
.../plugin/report_old/RequirementsHistory.java | 28 +-
.../EnhancedPluginDescriptorBuilder.java | 69 +-
.../plugin/plugin/DescriptorGeneratorMojoTest.java | 46 +-
.../maven/plugin/plugin/HelpGeneratorMojoTest.java | 32 +-
maven-plugin-report-plugin/pom.xml | 436 +++++-----
.../src/main/java/test/MyMojo.java | 50 +-
.../org/apache/maven/plugins/plugin/it/MyMojo.java | 61 +-
.../src/main/java/org/MyMojo.java | 129 ++-
.../src/it/mplugin-319_report-since/verify.groovy | 1 -
.../src/main/java/test/MyMojo.java | 19 +-
.../apache/maven/plugins/issues/plugin/MyMojo.java | 50 +-
.../plugin-info-jdk-default-version/verify.groovy | 1 -
.../src/main/java/org/DummyReport.java | 103 +--
.../src/main/java/org/MyMojo.java | 34 +-
.../src/main/java/org/MyMojo.java | 34 +-
.../src/main/java/org/MyMojo.java | 17 +-
.../src/main/java/org/SimpleBean.java | 6 +-
.../src/main/java/org/internal/PrivateBean.java | 6 +-
.../src/main/java/org/DummyReport.java | 81 +-
.../it/plugin-report/src/main/java/org/MyMojo.java | 23 +-
.../maven/plugin/plugin/report/PluginReport.java | 478 +++++------
.../plugin/plugin/report/RequirementsHistory.java | 28 +-
.../EnhancedPluginDescriptorBuilder.java | 109 ++-
.../EnhancedPluginDescriptorBuilderTest.java | 63 +-
maven-plugin-tools-annotations/pom.xml | 2 +-
.../JavaAnnotationsMojoDescriptorExtractor.java | 956 +++++++++------------
.../annotations/converter/ConverterContext.java | 40 +-
.../converter/JavaClassConverterContext.java | 541 +++++-------
.../JavadocBlockTagsToXhtmlConverter.java | 77 +-
.../JavadocInlineTagsToXhtmlConverter.java | 76 +-
.../converter/tag/JavadocTagToHtmlConverter.java | 30 +-
.../annotations/converter/tag/LinkUtils.java | 159 ++--
.../tag/block/JavadocBlockTagToHtmlConverter.java | 8 +-
.../converter/tag/block/SeeTagConverter.java | 48 +-
.../converter/tag/inline/CodeTagConverter.java | 16 +-
.../converter/tag/inline/DocRootTagConverter.java | 13 +-
.../inline/JavadocInlineTagToHtmlConverter.java | 7 +-
.../tag/inline/LinkPlainTagToHtmlConverter.java | 14 +-
.../tag/inline/LinkTagToHtmlConverter.java | 20 +-
.../tag/inline/LiteralTagToHtmlConverter.java | 15 +-
.../converter/tag/inline/ValueTagConverter.java | 18 +-
.../annotations/datamodel/AnnotatedContent.java | 25 +-
.../annotations/datamodel/AnnotatedField.java | 31 +-
.../datamodel/ComponentAnnotationContent.java | 53 +-
.../datamodel/ExecuteAnnotationContent.java | 58 +-
.../datamodel/MojoAnnotationContent.java | 148 ++--
.../datamodel/ParameterAnnotationContent.java | 168 ++--
.../scanner/DefaultMojoAnnotationsScanner.java | 351 ++++----
.../annotations/scanner/MojoAnnotatedClass.java | 98 +--
.../scanner/MojoAnnotationsScanner.java | 46 +-
.../scanner/MojoAnnotationsScannerRequest.java | 53 +-
.../scanner/visitors/MojoAnnotationVisitor.java | 35 +-
.../scanner/visitors/MojoClassVisitor.java | 156 ++--
.../scanner/visitors/MojoFieldVisitor.java | 39 +-
.../scanner/visitors/MojoMethodVisitor.java | 38 +-
.../scanner/visitors/MojoParameterVisitor.java | 6 +-
.../extractor/annotations/AbstractFooMojo.java | 13 +-
.../annotations/ClassVersionComparatorTest.java | 15 +-
.../extractor/annotations/DeprecatedMojo.java | 16 +-
.../plugin/extractor/annotations/Execute2Mojo.java | 20 +-
.../plugin/extractor/annotations/ExecuteMojo.java | 16 +-
.../plugin/extractor/annotations/FooMojo.java | 47 +-
...JavaAnnotationsMojoDescriptorExtractorTest.java | 60 +-
.../annotations/ParametersWithGenericsMojo.java | 21 +-
.../converter/JavaClassConverterContextTest.java | 322 ++++---
.../JavadocBlockTagsToXhtmlConverterTest.java | 67 +-
.../JavadocInlineTagsToXhtmlConverterTest.java | 166 ++--
.../converter/SimpleConverterContext.java | 156 ++--
.../annotations/converter/tag/LinkUtilsTest.java | 30 +-
.../annotations/converter/test/CurrentClass.java | 37 +-
.../annotations/converter/test/OtherClass.java | 14 +-
.../annotations/converter/test/SuperClass.java | 5 +-
.../test/other/OtherClassOtherPackage.java | 9 +-
.../scanner/DefaultMojoAnnotationsScannerTest.java | 430 ++++-----
maven-plugin-tools-api/pom.xml | 5 +-
.../tools/plugin/DefaultPluginToolsRequest.java | 114 +--
.../tools/plugin/EnhancedParameterWrapper.java | 128 +--
.../maven/tools/plugin/ExtendedMojoDescriptor.java | 45 +-
.../tools/plugin/ExtendedPluginDescriptor.java | 191 ++--
.../maven/tools/plugin/PluginToolsRequest.java | 54 +-
.../AbstractScriptedMojoDescriptorExtractor.java | 163 ++--
.../plugin/extractor/ExtractionException.java | 17 +-
.../maven/tools/plugin/extractor/GroupKey.java | 59 +-
.../plugin/extractor/MojoDescriptorExtractor.java | 19 +-
.../MojoDescriptorExtractorComparator.java | 14 +-
.../javadoc/FullyQualifiedJavadocReference.java | 146 ++--
.../tools/plugin/javadoc/JavadocLinkGenerator.java | 202 ++---
.../tools/plugin/javadoc/JavadocReference.java | 98 +--
.../maven/tools/plugin/javadoc/JavadocSite.java | 551 +++++-------
.../tools/plugin/scanner/DefaultMojoScanner.java | 142 ++-
.../maven/tools/plugin/scanner/MojoScanner.java | 17 +-
.../maven/tools/plugin/util/PluginUtils.java | 92 +-
.../maven/tools/plugin/extractor/GroupKeyTest.java | 45 +-
.../plugin/javadoc/JavadocLinkGeneratorTest.java | 159 ++--
.../tools/plugin/javadoc/JavadocReferenceTest.java | 56 +-
.../maven/tools/plugin/javadoc/JavadocSiteIT.java | 92 +-
.../tools/plugin/javadoc/JavadocSiteTest.java | 165 ++--
.../plugin/scanner/DefaultMojoScannerTest.java | 150 ++--
.../tools/plugin/scanner/ScannerTestExtractor.java | 54 +-
.../maven/tools/plugin/scanner/TestExtractor.java | 41 +-
.../maven/tools/plugin/util/PluginUtilsTest.java | 40 +-
.../apache/maven/tools/plugin/util/TestUtils.java | 40 +-
.../maven/tools/plugin/util/stubs/MojoStub.java | 24 +-
maven-plugin-tools-generators/pom.xml | 8 +-
.../maven/tools/plugin/generator/Converter.java | 9 +-
.../maven/tools/plugin/generator/Generator.java | 17 +-
.../tools/plugin/generator/GeneratorException.java | 12 +-
.../tools/plugin/generator/GeneratorUtils.java | 494 ++++-------
.../plugin/generator/HtmlToPlainTextConverter.java | 79 +-
.../generator/PluginDescriptorFilesGenerator.java | 554 +++++-------
.../plugin/generator/PluginHelpGenerator.java | 97 +--
.../plugin/generator/PluginXdocGenerator.java | 868 ++++++++-----------
.../generator/AbstractGeneratorTestCase.java | 138 ++-
.../tools/plugin/generator/GeneratorUtilsTest.java | 175 ++--
.../generator/HtmlToPlainTextConverterTest.java | 61 +-
.../PluginDescriptorFilesGeneratorTest.java | 146 ++--
.../plugin/generator/PluginXdocGeneratorTest.java | 75 +-
.../plugin/generator/stubs/MavenReportStub.java | 33 +-
maven-plugin-tools-java/pom.xml | 2 -
.../JavaJavadocMojoDescriptorExtractor.java | 562 +++++-------
.../extractor/javadoc/JavadocMojoAnnotation.java | 11 +-
.../javadoc/JavaMojoDescriptorExtractorTest.java | 172 ++--
.../src/test/resources/MPLUGIN-290/Test.java | 17 +-
.../src/test/resources/MPLUGIN-314/MyMojo.java | 17 +-
.../test/resources/MPLUGIN-314/plugin-expected.xml | 2 +-
.../src/test/resources/MPLUGIN-320/Exceptions.java | 8 +-
.../src/test/resources/java-1.5/MyEnum.java | 16 +-
.../src/test/resources/java-1.5/MyMojo.java | 18 +-
.../test/resources/java-1.5/plugin-expected.xml | 2 +-
.../src/test/resources/source/Default.java | 17 +-
.../src/test/resources/source/Full.java | 18 +-
.../src/test/resources/source/package-info.java | 14 +-
.../src/test/resources/source2/Bla.java | 7 +-
.../resources/source2/JavaExtractorTestThree.java | 21 +-
.../src/test/resources/source2/sub/MyBla.java | 8 +-
.../src/test/resources/source3/TestAnnotation.java | 16 +-
maven-script/maven-plugin-tools-ant/pom.xml | 4 +-
.../extractor/ant/AntMojoDescriptorExtractor.java | 232 +++--
.../ant/AntMojoDescriptorExtractorTest.java | 120 +--
maven-script/maven-plugin-tools-beanshell/pom.xml | 2 -
.../BeanshellMojoDescriptorExtractor.java | 90 +-
maven-script/maven-plugin-tools-model/pom.xml | 6 +-
.../model/PluginMetadataParseException.java | 153 ++--
.../extractor/model/PluginMetadataParser.java | 361 ++++----
.../extractor/model/PluginMetadataParserTest.java | 63 +-
.../maven/script/ant/AntMojoComponentFactory.java | 83 +-
.../apache/maven/script/ant/AntMojoWrapper.java | 325 +++----
.../apache/maven/script/ant/AntPropertyHelper.java | 374 ++++----
.../maven/script/ant/AntMojoWrapperTest.java | 206 ++---
.../script/beanshell/BeanshellMojoAdapter.java | 133 ++-
maven-script/pom.xml | 1 -
pom.xml | 43 +-
231 files changed, 8235 insertions(+), 10991 deletions(-)
[maven-plugin-tools] 02/02: [MPLUGIN-447] Reformat
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git
commit 21f9d21d93975e85bc090ea397c1bab7ffea7121
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Thu Feb 9 17:30:32 2023 +0100
[MPLUGIN-447] Reformat
---
maven-plugin-annotations/pom.xml | 4 +-
.../maven/plugins/annotations/Component.java | 10 +-
.../apache/maven/plugins/annotations/Execute.java | 10 +-
.../plugins/annotations/InstantiationStrategy.java | 20 +-
.../maven/plugins/annotations/LifecyclePhase.java | 76 +-
.../org/apache/maven/plugins/annotations/Mojo.java | 12 +-
.../maven/plugins/annotations/Parameter.java | 14 +-
.../maven/plugins/annotations/ResolutionScope.java | 24 +-
maven-plugin-plugin/pom.xml | 17 +-
.../org/apache/maven/plugin/coreit/FirstMojo.java | 41 +-
.../apache/maven/plugins/AbstractFirstMojo.java | 21 +-
.../apache/maven/plugin/coreit/CoreIt0014Mojo.java | 50 +-
.../org/apache/maven/plugin/coreit/FirstMojo.java | 48 +-
.../org/apache/maven/plugin/coreit/SecondMojo.java | 18 +-
.../maven/plugin/coreit/AbstractFirstMojo.java | 21 +-
.../maven/plugin/coreit/AbstractFooMojo.java | 7 +-
.../apache/maven/plugin/coreit/CoreIt0014Mojo.java | 50 +-
.../org/apache/maven/plugin/coreit/FirstMojo.java | 53 +-
.../org/apache/maven/plugin/coreit/SecondMojo.java | 18 +-
.../org/apache/maven/plugin/coreit/ThirdMojo.java | 53 +-
.../maven/plugins/antWithRefs/ArtifactsTask.java | 14 +-
.../org/apache/maven/plugin/coreit/FirstMojo.java | 19 +-
.../src/main/java/test/MyMojo.java | 28 +-
.../src/main/java/test/MyMojo.java | 30 +-
.../it/help-basic/src/main/java/test/MyMojo.java | 30 +-
.../it/help-package/src/main/java/test/MyMojo.java | 18 +-
.../dep-a/src/main/java/test/ClassA.java | 11 +-
.../dep-b/src/main/java/test/ClassB.java | 15 +-
.../test/src/main/java/test/SomeMojo.java | 13 +-
.../apache/maven/plugin/coreit/CoreIt0014Mojo.java | 50 +-
.../org/apache/maven/plugin/coreit/FirstMojo.java | 35 +-
.../apache/maven/plugin/coreit/MPlugin220Mojo.java | 25 +-
.../org/apache/maven/plugin/coreit/Maximal.java | 58 +-
.../org/apache/maven/plugin/coreit/Minimal.java | 14 +-
.../apache/maven/plugin/coreit/TestInterface.java | 7 +-
.../apache/maven/plugin/coreit/CoreIt0014Mojo.java | 50 +-
.../org/apache/maven/plugin/coreit/FirstMojo.java | 35 +-
.../apache/maven/plugin/coreit/MPlugin220Mojo.java | 25 +-
.../org/apache/maven/plugin/coreit/Maximal.java | 58 +-
.../org/apache/maven/plugin/coreit/Minimal.java | 14 +-
.../apache/maven/plugin/coreit/TestInterface.java | 7 +-
.../apache/maven/plugin/coreit/CoreIt0014Mojo.java | 50 +-
.../org/apache/maven/plugin/coreit/FirstMojo.java | 35 +-
.../apache/maven/plugin/coreit/MPlugin220Mojo.java | 25 +-
.../apache/maven/plugin/coreit/MPlugin396Mojo.java | 13 +-
.../org/apache/maven/plugin/coreit/Maximal.java | 58 +-
.../org/apache/maven/plugin/coreit/Minimal.java | 14 +-
.../apache/maven/plugin/coreit/CoreIt0013Mojo.java | 46 +-
.../org/apache/maven/plugin/coreit/FirstMojo.java | 24 +-
.../org/apache/maven/plugin/coreit/Maximal.java | 13 +-
.../org/apache/maven/plugin/coreit/Minimal.java | 12 +-
.../org/apache/maven/plugins/plugin/it/MyMojo.java | 61 +-
.../src/main/java/fr/ca/MyMojo.java | 9 +-
.../src/main/java/fr/ca/TestInterface.java | 7 +-
.../src/main/java/test/MyMojo.java | 68 +-
.../plugins/plugin/it/CustomSurefireMojo.java | 188 ++--
.../plugins/plugin/it/CustomSurefireMojo.java | 188 ++--
.../plugins/plugin/it/CustomSurefireMojo.java | 188 ++--
.../src/main/java/test/MyMojo.java | 130 ++-
.../src/main/java/test/MyMojo.java | 30 +-
.../org/apache/maven/plugin/coreit/FirstMojo.java | 22 +-
.../org/apache/maven/plugin/coreit/FirstMojo.java | 22 +-
.../org/apache/maven/plugin/coreit/FirstMojo.java | 41 +-
.../org/apache/maven/plugin/coreit/FirstMojo.java | 22 +-
.../org/apache/maven/plugin/coreit/FirstMojo.java | 22 +-
.../org/apache/maven/plugin/coreit/FirstMojo.java | 43 +-
.../apache/maven/plugin/coreit/CoreIt0013Mojo.java | 46 +-
.../org/apache/maven/plugin/coreit/FirstMojo.java | 24 +-
.../org/apache/maven/plugin/coreit/SecondMojo.java | 14 +-
.../latin-1/src/main/java/test/MyMojo.java | 14 +-
.../utf-8/src/main/java/test/MyMojo.java | 16 +-
.../java/org/apache/maven/its/v4api/FirstMojo.java | 36 +-
.../metadata/GroupRepositoryMetadata.java | 70 +-
.../maven/plugin/plugin/AbstractGeneratorMojo.java | 62 +-
.../plugin/plugin/DescriptorGeneratorMojo.java | 304 +++----
.../maven/plugin/plugin/HelpGeneratorMojo.java | 70 +-
.../metadata/AddPluginArtifactMetadataMojo.java | 42 +-
.../plugin/plugin/report_old/PluginReport.java | 528 ++++++------
.../plugin/plugin/report_old/Requirements.java | 38 +-
.../plugin/report_old/RequirementsHistory.java | 28 +-
.../EnhancedPluginDescriptorBuilder.java | 69 +-
.../plugin/plugin/DescriptorGeneratorMojoTest.java | 46 +-
.../maven/plugin/plugin/HelpGeneratorMojoTest.java | 32 +-
maven-plugin-report-plugin/pom.xml | 436 +++++-----
.../src/main/java/test/MyMojo.java | 50 +-
.../org/apache/maven/plugins/plugin/it/MyMojo.java | 61 +-
.../src/main/java/org/MyMojo.java | 129 ++-
.../src/it/mplugin-319_report-since/verify.groovy | 1 -
.../src/main/java/test/MyMojo.java | 19 +-
.../apache/maven/plugins/issues/plugin/MyMojo.java | 50 +-
.../plugin-info-jdk-default-version/verify.groovy | 1 -
.../src/main/java/org/DummyReport.java | 103 +--
.../src/main/java/org/MyMojo.java | 34 +-
.../src/main/java/org/MyMojo.java | 34 +-
.../src/main/java/org/MyMojo.java | 17 +-
.../src/main/java/org/SimpleBean.java | 6 +-
.../src/main/java/org/internal/PrivateBean.java | 6 +-
.../src/main/java/org/DummyReport.java | 81 +-
.../it/plugin-report/src/main/java/org/MyMojo.java | 23 +-
.../maven/plugin/plugin/report/PluginReport.java | 478 +++++------
.../plugin/plugin/report/RequirementsHistory.java | 28 +-
.../EnhancedPluginDescriptorBuilder.java | 109 ++-
.../EnhancedPluginDescriptorBuilderTest.java | 63 +-
maven-plugin-tools-annotations/pom.xml | 2 +-
.../JavaAnnotationsMojoDescriptorExtractor.java | 956 +++++++++------------
.../annotations/converter/ConverterContext.java | 40 +-
.../converter/JavaClassConverterContext.java | 541 +++++-------
.../JavadocBlockTagsToXhtmlConverter.java | 77 +-
.../JavadocInlineTagsToXhtmlConverter.java | 76 +-
.../converter/tag/JavadocTagToHtmlConverter.java | 30 +-
.../annotations/converter/tag/LinkUtils.java | 159 ++--
.../tag/block/JavadocBlockTagToHtmlConverter.java | 8 +-
.../converter/tag/block/SeeTagConverter.java | 48 +-
.../converter/tag/inline/CodeTagConverter.java | 16 +-
.../converter/tag/inline/DocRootTagConverter.java | 13 +-
.../inline/JavadocInlineTagToHtmlConverter.java | 7 +-
.../tag/inline/LinkPlainTagToHtmlConverter.java | 14 +-
.../tag/inline/LinkTagToHtmlConverter.java | 20 +-
.../tag/inline/LiteralTagToHtmlConverter.java | 15 +-
.../converter/tag/inline/ValueTagConverter.java | 18 +-
.../annotations/datamodel/AnnotatedContent.java | 25 +-
.../annotations/datamodel/AnnotatedField.java | 31 +-
.../datamodel/ComponentAnnotationContent.java | 53 +-
.../datamodel/ExecuteAnnotationContent.java | 58 +-
.../datamodel/MojoAnnotationContent.java | 148 ++--
.../datamodel/ParameterAnnotationContent.java | 168 ++--
.../scanner/DefaultMojoAnnotationsScanner.java | 351 ++++----
.../annotations/scanner/MojoAnnotatedClass.java | 98 +--
.../scanner/MojoAnnotationsScanner.java | 46 +-
.../scanner/MojoAnnotationsScannerRequest.java | 53 +-
.../scanner/visitors/MojoAnnotationVisitor.java | 35 +-
.../scanner/visitors/MojoClassVisitor.java | 156 ++--
.../scanner/visitors/MojoFieldVisitor.java | 39 +-
.../scanner/visitors/MojoMethodVisitor.java | 38 +-
.../scanner/visitors/MojoParameterVisitor.java | 6 +-
.../extractor/annotations/AbstractFooMojo.java | 13 +-
.../annotations/ClassVersionComparatorTest.java | 15 +-
.../extractor/annotations/DeprecatedMojo.java | 16 +-
.../plugin/extractor/annotations/Execute2Mojo.java | 20 +-
.../plugin/extractor/annotations/ExecuteMojo.java | 16 +-
.../plugin/extractor/annotations/FooMojo.java | 47 +-
...JavaAnnotationsMojoDescriptorExtractorTest.java | 60 +-
.../annotations/ParametersWithGenericsMojo.java | 21 +-
.../converter/JavaClassConverterContextTest.java | 322 ++++---
.../JavadocBlockTagsToXhtmlConverterTest.java | 67 +-
.../JavadocInlineTagsToXhtmlConverterTest.java | 166 ++--
.../converter/SimpleConverterContext.java | 156 ++--
.../annotations/converter/tag/LinkUtilsTest.java | 30 +-
.../annotations/converter/test/CurrentClass.java | 37 +-
.../annotations/converter/test/OtherClass.java | 14 +-
.../annotations/converter/test/SuperClass.java | 5 +-
.../test/other/OtherClassOtherPackage.java | 9 +-
.../scanner/DefaultMojoAnnotationsScannerTest.java | 430 ++++-----
maven-plugin-tools-api/pom.xml | 5 +-
.../tools/plugin/DefaultPluginToolsRequest.java | 114 +--
.../tools/plugin/EnhancedParameterWrapper.java | 128 +--
.../maven/tools/plugin/ExtendedMojoDescriptor.java | 45 +-
.../tools/plugin/ExtendedPluginDescriptor.java | 191 ++--
.../maven/tools/plugin/PluginToolsRequest.java | 54 +-
.../AbstractScriptedMojoDescriptorExtractor.java | 163 ++--
.../plugin/extractor/ExtractionException.java | 17 +-
.../maven/tools/plugin/extractor/GroupKey.java | 59 +-
.../plugin/extractor/MojoDescriptorExtractor.java | 19 +-
.../MojoDescriptorExtractorComparator.java | 14 +-
.../javadoc/FullyQualifiedJavadocReference.java | 146 ++--
.../tools/plugin/javadoc/JavadocLinkGenerator.java | 202 ++---
.../tools/plugin/javadoc/JavadocReference.java | 98 +--
.../maven/tools/plugin/javadoc/JavadocSite.java | 551 +++++-------
.../tools/plugin/scanner/DefaultMojoScanner.java | 142 ++-
.../maven/tools/plugin/scanner/MojoScanner.java | 17 +-
.../maven/tools/plugin/util/PluginUtils.java | 92 +-
.../maven/tools/plugin/extractor/GroupKeyTest.java | 45 +-
.../plugin/javadoc/JavadocLinkGeneratorTest.java | 159 ++--
.../tools/plugin/javadoc/JavadocReferenceTest.java | 56 +-
.../maven/tools/plugin/javadoc/JavadocSiteIT.java | 92 +-
.../tools/plugin/javadoc/JavadocSiteTest.java | 165 ++--
.../plugin/scanner/DefaultMojoScannerTest.java | 150 ++--
.../tools/plugin/scanner/ScannerTestExtractor.java | 54 +-
.../maven/tools/plugin/scanner/TestExtractor.java | 41 +-
.../maven/tools/plugin/util/PluginUtilsTest.java | 40 +-
.../apache/maven/tools/plugin/util/TestUtils.java | 40 +-
.../maven/tools/plugin/util/stubs/MojoStub.java | 24 +-
maven-plugin-tools-generators/pom.xml | 8 +-
.../maven/tools/plugin/generator/Converter.java | 9 +-
.../maven/tools/plugin/generator/Generator.java | 17 +-
.../tools/plugin/generator/GeneratorException.java | 12 +-
.../tools/plugin/generator/GeneratorUtils.java | 494 ++++-------
.../plugin/generator/HtmlToPlainTextConverter.java | 79 +-
.../generator/PluginDescriptorFilesGenerator.java | 554 +++++-------
.../plugin/generator/PluginHelpGenerator.java | 97 +--
.../plugin/generator/PluginXdocGenerator.java | 868 ++++++++-----------
.../generator/AbstractGeneratorTestCase.java | 138 ++-
.../tools/plugin/generator/GeneratorUtilsTest.java | 175 ++--
.../generator/HtmlToPlainTextConverterTest.java | 61 +-
.../PluginDescriptorFilesGeneratorTest.java | 146 ++--
.../plugin/generator/PluginXdocGeneratorTest.java | 75 +-
.../plugin/generator/stubs/MavenReportStub.java | 33 +-
maven-plugin-tools-java/pom.xml | 2 -
.../JavaJavadocMojoDescriptorExtractor.java | 562 +++++-------
.../extractor/javadoc/JavadocMojoAnnotation.java | 11 +-
.../javadoc/JavaMojoDescriptorExtractorTest.java | 172 ++--
.../src/test/resources/MPLUGIN-290/Test.java | 17 +-
.../src/test/resources/MPLUGIN-314/MyMojo.java | 17 +-
.../test/resources/MPLUGIN-314/plugin-expected.xml | 2 +-
.../src/test/resources/MPLUGIN-320/Exceptions.java | 8 +-
.../src/test/resources/java-1.5/MyEnum.java | 16 +-
.../src/test/resources/java-1.5/MyMojo.java | 18 +-
.../test/resources/java-1.5/plugin-expected.xml | 2 +-
.../src/test/resources/source/Default.java | 17 +-
.../src/test/resources/source/Full.java | 18 +-
.../src/test/resources/source/package-info.java | 14 +-
.../src/test/resources/source2/Bla.java | 7 +-
.../resources/source2/JavaExtractorTestThree.java | 21 +-
.../src/test/resources/source2/sub/MyBla.java | 8 +-
.../src/test/resources/source3/TestAnnotation.java | 16 +-
maven-script/maven-plugin-tools-ant/pom.xml | 4 +-
.../extractor/ant/AntMojoDescriptorExtractor.java | 232 +++--
.../ant/AntMojoDescriptorExtractorTest.java | 120 +--
maven-script/maven-plugin-tools-beanshell/pom.xml | 2 -
.../BeanshellMojoDescriptorExtractor.java | 90 +-
maven-script/maven-plugin-tools-model/pom.xml | 6 +-
.../model/PluginMetadataParseException.java | 153 ++--
.../extractor/model/PluginMetadataParser.java | 361 ++++----
.../extractor/model/PluginMetadataParserTest.java | 63 +-
.../maven/script/ant/AntMojoComponentFactory.java | 83 +-
.../apache/maven/script/ant/AntMojoWrapper.java | 325 +++----
.../apache/maven/script/ant/AntPropertyHelper.java | 374 ++++----
.../maven/script/ant/AntMojoWrapperTest.java | 206 ++---
.../script/beanshell/BeanshellMojoAdapter.java | 133 ++-
maven-script/pom.xml | 1 -
pom.xml | 25 +-
231 files changed, 8217 insertions(+), 10989 deletions(-)
diff --git a/maven-plugin-annotations/pom.xml b/maven-plugin-annotations/pom.xml
index b8bca280..8f78ea87 100644
--- a/maven-plugin-annotations/pom.xml
+++ b/maven-plugin-annotations/pom.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Licensed to the Apache Software Foundation (ASF) under one
~ or more contributor license agreements. See the NOTICE file
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>maven-plugin-tools</artifactId>
<groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools</artifactId>
<version>3.8.0-SNAPSHOT</version>
</parent>
diff --git a/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Component.java b/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Component.java
index 9afbd65b..1ea30069 100644
--- a/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Component.java
+++ b/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Component.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugins.annotations;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.plugins.annotations;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.plugins.annotations;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
@@ -35,11 +34,10 @@ import java.lang.annotation.Target;
* @since 3.0
*/
@Documented
-@Retention( RetentionPolicy.CLASS )
-@Target( { ElementType.FIELD } )
+@Retention(RetentionPolicy.CLASS)
+@Target({ElementType.FIELD})
@Inherited
-public @interface Component
-{
+public @interface Component {
/**
* role of the component to inject.
* @return the role
diff --git a/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Execute.java b/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Execute.java
index 3fba2ef2..74d983a0 100644
--- a/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Execute.java
+++ b/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Execute.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugins.annotations;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.plugins.annotations;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.plugins.annotations;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
@@ -33,11 +32,10 @@ import java.lang.annotation.Target;
* @since 3.0
*/
@Documented
-@Retention( RetentionPolicy.CLASS )
-@Target( ElementType.TYPE )
+@Retention(RetentionPolicy.CLASS)
+@Target(ElementType.TYPE)
@Inherited
-public @interface Execute
-{
+public @interface Execute {
/**
* Lifecycle phase to fork. Note that specifying a phase overrides specifying a goal.
* For custom lifecycle phase ids use {@link #customPhase()} instead.
diff --git a/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/InstantiationStrategy.java b/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/InstantiationStrategy.java
index 2e6b1782..34cedd48 100644
--- a/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/InstantiationStrategy.java
+++ b/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/InstantiationStrategy.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugins.annotations;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.plugins.annotations;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.plugins.annotations;
/**
* Component instantiation strategy.
@@ -25,22 +24,19 @@ package org.apache.maven.plugins.annotations;
* @author Hervé Boutemy
* @since 3.0
*/
-public enum InstantiationStrategy
-{
- PER_LOOKUP( "per-lookup" ),
- SINGLETON( "singleton" ),
- KEEP_ALIVE( "keep-alive" ),
- POOLABLE( "poolable" );
+public enum InstantiationStrategy {
+ PER_LOOKUP("per-lookup"),
+ SINGLETON("singleton"),
+ KEEP_ALIVE("keep-alive"),
+ POOLABLE("poolable");
private final String id;
- InstantiationStrategy( String id )
- {
+ InstantiationStrategy(String id) {
this.id = id;
}
- public String id()
- {
+ public String id() {
return this.id;
}
}
diff --git a/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/LifecyclePhase.java b/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/LifecyclePhase.java
index 4930ebcb..237c4efc 100644
--- a/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/LifecyclePhase.java
+++ b/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/LifecyclePhase.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugins.annotations;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,60 +16,56 @@ package org.apache.maven.plugins.annotations;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.plugins.annotations;
/**
* <a href="/ref/3.0.4/maven-core/lifecycles.html">Lifecycle phases</a>.
* @author Olivier Lamy
* @since 3.0
*/
-public enum LifecyclePhase
-{
+public enum LifecyclePhase {
+ VALIDATE("validate"),
+ INITIALIZE("initialize"),
+ GENERATE_SOURCES("generate-sources"),
+ PROCESS_SOURCES("process-sources"),
+ GENERATE_RESOURCES("generate-resources"),
+ PROCESS_RESOURCES("process-resources"),
+ COMPILE("compile"),
+ PROCESS_CLASSES("process-classes"),
+ GENERATE_TEST_SOURCES("generate-test-sources"),
+ PROCESS_TEST_SOURCES("process-test-sources"),
+ GENERATE_TEST_RESOURCES("generate-test-resources"),
+ PROCESS_TEST_RESOURCES("process-test-resources"),
+ TEST_COMPILE("test-compile"),
+ PROCESS_TEST_CLASSES("process-test-classes"),
+ TEST("test"),
+ PREPARE_PACKAGE("prepare-package"),
+ PACKAGE("package"),
+ PRE_INTEGRATION_TEST("pre-integration-test"),
+ INTEGRATION_TEST("integration-test"),
+ POST_INTEGRATION_TEST("post-integration-test"),
+ VERIFY("verify"),
+ INSTALL("install"),
+ DEPLOY("deploy"),
- VALIDATE( "validate" ),
- INITIALIZE( "initialize" ),
- GENERATE_SOURCES( "generate-sources" ),
- PROCESS_SOURCES( "process-sources" ),
- GENERATE_RESOURCES( "generate-resources" ),
- PROCESS_RESOURCES( "process-resources" ),
- COMPILE( "compile" ),
- PROCESS_CLASSES( "process-classes" ),
- GENERATE_TEST_SOURCES( "generate-test-sources" ),
- PROCESS_TEST_SOURCES( "process-test-sources" ),
- GENERATE_TEST_RESOURCES( "generate-test-resources" ),
- PROCESS_TEST_RESOURCES( "process-test-resources" ),
- TEST_COMPILE( "test-compile" ),
- PROCESS_TEST_CLASSES( "process-test-classes" ),
- TEST( "test" ),
- PREPARE_PACKAGE( "prepare-package" ),
- PACKAGE( "package" ),
- PRE_INTEGRATION_TEST( "pre-integration-test" ),
- INTEGRATION_TEST( "integration-test" ),
- POST_INTEGRATION_TEST( "post-integration-test" ),
- VERIFY( "verify" ),
- INSTALL( "install" ),
- DEPLOY( "deploy" ),
+ PRE_CLEAN("pre-clean"),
+ CLEAN("clean"),
+ POST_CLEAN("post-clean"),
- PRE_CLEAN( "pre-clean" ),
- CLEAN( "clean" ),
- POST_CLEAN( "post-clean" ),
+ PRE_SITE("pre-site"),
+ SITE("site"),
+ POST_SITE("post-site"),
+ SITE_DEPLOY("site-deploy"),
- PRE_SITE( "pre-site" ),
- SITE( "site" ),
- POST_SITE( "post-site" ),
- SITE_DEPLOY( "site-deploy" ),
-
- NONE( "" );
+ NONE("");
private final String id;
- LifecyclePhase( String id )
- {
+ LifecyclePhase(String id) {
this.id = id;
}
- public String id()
- {
+ public String id() {
return this.id;
}
-
}
diff --git a/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Mojo.java b/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Mojo.java
index 336a5227..04e207c8 100644
--- a/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Mojo.java
+++ b/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Mojo.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugins.annotations;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.plugins.annotations;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.plugins.annotations;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
@@ -33,11 +32,10 @@ import java.lang.annotation.Target;
* @since 3.0
*/
@Documented
-@Retention( RetentionPolicy.CLASS )
-@Target( ElementType.TYPE )
+@Retention(RetentionPolicy.CLASS)
+@Target(ElementType.TYPE)
@Inherited
-public @interface Mojo
-{
+public @interface Mojo {
/**
* goal name (required).
* @return the goal name
@@ -58,7 +56,7 @@ public @interface Mojo
/**
* the required dependency collection scope.
- * @return the required dependency collection scope
+ * @return the required dependency collection scope
*/
ResolutionScope requiresDependencyCollection() default ResolutionScope.NONE;
diff --git a/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Parameter.java b/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Parameter.java
index 87887cb7..82ff5e3c 100644
--- a/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Parameter.java
+++ b/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Parameter.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugins.annotations;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.plugins.annotations;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.plugins.annotations;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
@@ -39,11 +38,10 @@ import java.lang.annotation.Target;
* @since 3.0
*/
@Documented
-@Retention( RetentionPolicy.CLASS )
-@Target( { ElementType.FIELD, ElementType.METHOD } )
+@Retention(RetentionPolicy.CLASS)
+@Target({ElementType.FIELD, ElementType.METHOD})
@Inherited
-public @interface Parameter
-{
+public @interface Parameter {
/**
* name of the bean property used to get/set the field: by default, field name is used.
* @return the name of the bean property
@@ -67,7 +65,7 @@ public @interface Parameter
* parameter default value, may contain <code>${...}</code> expressions which will be interpreted at
* inject time: see
* <a href="/ref/current/maven-core/apidocs/org/apache/maven/plugin/PluginParameterExpressionEvaluator.html">
- * PluginParameterExpressionEvaluator</a>.
+ * PluginParameterExpressionEvaluator</a>.
* @return the default value
*/
String defaultValue() default "";
@@ -85,7 +83,7 @@ public @interface Parameter
* want the user to modify <code><build><finalName/></build></code> rather than specifying a value
* for finalName directly in the plugin configuration section. It is also useful to ensure that - for example - a
* List-typed parameter which expects items of type Artifact doesn't get a List full of Strings.
- *
+ *
* @return <code>true</code> if the user should not be allowed to configure the parameter directly
*/
boolean readonly() default false;
diff --git a/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/ResolutionScope.java b/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/ResolutionScope.java
index e2bcd6a3..bd19d718 100644
--- a/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/ResolutionScope.java
+++ b/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/ResolutionScope.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugins.annotations;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.plugins.annotations;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.plugins.annotations;
/**
* Dependencies resolution scopes available before
@@ -29,48 +28,45 @@ package org.apache.maven.plugins.annotations;
* @author Hervé Boutemy
* @since 3.0
*/
-public enum ResolutionScope
-{
+public enum ResolutionScope {
/**
* empty resolution scope
*/
- NONE( null ),
+ NONE(null),
/**
* <code>compile</code> resolution scope
* = <code>compile</code> + <code>system</code> + <code>provided</code> dependencies
*/
- COMPILE( "compile" ),
+ COMPILE("compile"),
/**
* <code>compile+runtime</code> resolution scope (Maven 3 only)
* = <code>compile</code> + <code>system</code> + <code>provided</code> + <code>runtime</code> dependencies
*/
- COMPILE_PLUS_RUNTIME( "compile+runtime" ),
+ COMPILE_PLUS_RUNTIME("compile+runtime"),
/**
* <code>runtime</code> resolution scope
* = <code>compile</code> + <code>runtime</code> dependencies
*/
- RUNTIME( "runtime" ),
+ RUNTIME("runtime"),
/**
* <code>runtime+system</code> resolution scope (Maven 3 only)
* = <code>compile</code> + <code>system</code> + <code>runtime</code> dependencies
*/
- RUNTIME_PLUS_SYSTEM( "runtime+system" ),
+ RUNTIME_PLUS_SYSTEM("runtime+system"),
/**
* <code>test</code> resolution scope
* = <code>compile</code> + <code>system</code> + <code>provided</code> + <code>runtime</code> + <code>test</code>
* dependencies
*/
- TEST( "test" );
+ TEST("test");
private final String id;
- ResolutionScope( String id )
- {
+ ResolutionScope(String id) {
this.id = id;
}
- public String id()
- {
+ public String id() {
return this.id;
}
}
diff --git a/maven-plugin-plugin/pom.xml b/maven-plugin-plugin/pom.xml
index 4d03fc09..3862b71b 100644
--- a/maven-plugin-plugin/pom.xml
+++ b/maven-plugin-plugin/pom.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Licensed to the Apache Software Foundation (ASF) under one
~ or more contributor license agreements. See the NOTICE file
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>maven-plugin-tools</artifactId>
<groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools</artifactId>
<version>3.8.0-SNAPSHOT</version>
</parent>
@@ -31,11 +31,9 @@
<packaging>maven-plugin</packaging>
<name>Maven Plugin Plugin</name>
- <description>
- The Plugin Plugin is used to create a Maven plugin descriptor for any Mojo's found in the source tree,
+ <description>The Plugin Plugin is used to create a Maven plugin descriptor for any Mojo's found in the source tree,
to include in the JAR. It is also used to generate Xdoc files for the Mojos as well as the artifact metadata
- and a generic help goal.
- </description>
+ and a generic help goal.</description>
<prerequisites>
<maven>${mavenVersion}</maven>
@@ -190,8 +188,8 @@
<directory>src/main/resources</directory>
</resource>
<resource>
- <directory>src/main/filtered-resources</directory>
<filtering>true</filtering>
+ <directory>src/main/filtered-resources</directory>
</resource>
</resources>
<pluginManagement>
@@ -214,10 +212,10 @@
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
+ <id>ensure-no-container-api</id>
<goals>
<goal>enforce</goal>
</goals>
- <id>ensure-no-container-api</id>
<configuration>
<rules>
<bannedDependencies>
@@ -302,7 +300,8 @@
<maven.compiler.target>${maven.compiler.target}</maven.compiler.target>
</properties>
<pomExcludes>
- <pomExclude>plugin-info-jdk/pom.xml</pomExclude><!-- relies on just a given plugin.xml for generating a report, this is no longer supported -->
+ <pomExclude>plugin-info-jdk/pom.xml</pomExclude>
+ <!-- relies on just a given plugin.xml for generating a report, this is no longer supported -->
</pomExcludes>
</configuration>
<executions>
diff --git a/maven-plugin-plugin/src/it/annotation-with-inheritance-from-deps/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java b/maven-plugin-plugin/src/it/annotation-with-inheritance-from-deps/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java
index 21bb3e80..7a630609 100644
--- a/maven-plugin-plugin/src/it/annotation-with-inheritance-from-deps/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java
+++ b/maven-plugin-plugin/src/it/annotation-with-inheritance-from-deps/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugin.coreit;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,16 +16,16 @@ package org.apache.maven.plugin.coreit;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.plugin.coreit;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.annotations.Component;
-import org.apache.maven.plugins.annotations.ResolutionScope;
-import org.apache.maven.plugins.annotations.Execute;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
-import org.apache.maven.tools.plugin.extractor.annotations.FooMojo;
+import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.project.MavenProjectHelper;
+import org.apache.maven.tools.plugin.extractor.annotations.FooMojo;
/**
* Touches a test file.
@@ -35,36 +33,31 @@ import org.apache.maven.project.MavenProjectHelper;
* @since 1.2
* @deprecated Don't use!
*/
-@Mojo( name = "first", requiresDependencyResolution = ResolutionScope.TEST, defaultPhase = LifecyclePhase.INTEGRATION_TEST )
-public class FirstMojo
- extends FooMojo
-{
+@Mojo(
+ name = "first",
+ requiresDependencyResolution = ResolutionScope.TEST,
+ defaultPhase = LifecyclePhase.INTEGRATION_TEST)
+public class FirstMojo extends FooMojo {
/**
* @since 0.1
* @deprecated As of 0.2
*/
- @Parameter( alias = "alias" )
+ @Parameter(alias = "alias")
private String aliasedParam;
- @Component( role = MavenProjectHelper.class )// , roleHint = "default"
+ @Component(role = MavenProjectHelper.class) // , roleHint = "default"
private Object projectHelper;
- public void execute()
- throws MojoExecutionException
- {
- if ( bar == null )
- {
- throw new MojoExecutionException( "bar == null" );
+ public void execute() throws MojoExecutionException {
+ if (bar == null) {
+ throw new MojoExecutionException("bar == null");
}
- if ( beer == null )
- {
- throw new MojoExecutionException( "beer == null" );
+ if (beer == null) {
+ throw new MojoExecutionException("beer == null");
}
- if ( projectHelper == null )
- {
- throw new MojoExecutionException( "projectHelper == null" );
+ if (projectHelper == null) {
+ throw new MojoExecutionException("projectHelper == null");
}
}
-
}
diff --git a/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/module-abstract-mojo/src/main/java/org/apache/maven/plugins/AbstractFirstMojo.java b/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/module-abstract-mojo/src/main/java/org/apache/maven/plugins/AbstractFirstMojo.java
index 505152b2..1bc24cd9 100644
--- a/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/module-abstract-mojo/src/main/java/org/apache/maven/plugins/AbstractFirstMojo.java
+++ b/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/module-abstract-mojo/src/main/java/org/apache/maven/plugins/AbstractFirstMojo.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugins;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,36 +16,33 @@ package org.apache.maven.plugins;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.plugins;
+
+import java.io.File;
+import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.Parameter;
-import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
-
-import java.io.File;
/**
* Touches a test file.
*
*/
-public abstract class AbstractFirstMojo
- extends AbstractMojo
-{
+public abstract class AbstractFirstMojo extends AbstractMojo {
/**
* Project directory.
*/
- @Parameter( defaultValue = "${basedir}", readonly = true )
+ @Parameter(defaultValue = "${basedir}", readonly = true)
protected File basedir;
- @Parameter( property = "first.touchFile", defaultValue = "${project.build.directory}/touch.txt",
- required = true )
+ @Parameter(property = "first.touchFile", defaultValue = "${project.build.directory}/touch.txt", required = true)
protected File touchFile;
/**
*
*/
- @Component( role = ArtifactMetadataSource.class, hint = "maven" )
+ @Component(role = ArtifactMetadataSource.class, hint = "maven")
protected ArtifactMetadataSource artifactMetadataSource;
-
}
diff --git a/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/module-mojo/src/main/java/org/apache/maven/plugin/coreit/CoreIt0014Mojo.java b/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/module-mojo/src/main/java/org/apache/maven/plugin/coreit/CoreIt0014Mojo.java
index 26b9ce6a..e71a566f 100644
--- a/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/module-mojo/src/main/java/org/apache/maven/plugin/coreit/CoreIt0014Mojo.java
+++ b/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/module-mojo/src/main/java/org/apache/maven/plugin/coreit/CoreIt0014Mojo.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugin.coreit;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,49 +16,41 @@ package org.apache.maven.plugin.coreit;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.plugin.coreit;
+
+import java.io.File;
+import java.io.IOException;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
-import java.io.File;
-import java.io.IOException;
-
/**
* Touches a test file.
- *
+ *
*/
-@Mojo( name = "it0014" )
-public class CoreIt0014Mojo
- extends AbstractMojo
-{
-
- @Parameter( property = "project.build.directory", required = true )
+@Mojo(name = "it0014")
+public class CoreIt0014Mojo extends AbstractMojo {
+
+ @Parameter(property = "project.build.directory", required = true)
private String outputDirectory;
- public void execute()
- throws MojoExecutionException
- {
- getLog().info( "outputDirectory = " + outputDirectory );
+ public void execute() throws MojoExecutionException {
+ getLog().info("outputDirectory = " + outputDirectory);
+
+ File f = new File(outputDirectory);
- File f = new File( outputDirectory );
-
- if ( !f.exists() )
- {
+ if (!f.exists()) {
f.mkdirs();
}
-
- File touch = new File( f, "touch.txt" );
-
- try
- {
+
+ File touch = new File(f, "touch.txt");
+
+ try {
touch.createNewFile();
+ } catch (IOException e) {
+ throw new MojoExecutionException("Error writing verification file.", e);
}
- catch ( IOException e )
- {
- throw new MojoExecutionException( "Error writing verification file.", e );
- }
}
-
}
diff --git a/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/module-mojo/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java b/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/module-mojo/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java
index cb150a2c..0fad1ba7 100644
--- a/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/module-mojo/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java
+++ b/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/module-mojo/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugin.coreit;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,15 +16,16 @@ package org.apache.maven.plugin.coreit;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.plugin.coreit;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.AbstractFirstMojo;
import org.apache.maven.plugins.annotations.Component;
-import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.plugins.annotations.Execute;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
-import org.apache.maven.plugins.AbstractFirstMojo;
+import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.project.MavenProjectHelper;
/**
@@ -35,42 +34,35 @@ import org.apache.maven.project.MavenProjectHelper;
* @since 1.2
* @deprecated Don't use!
*/
-@Mojo( name = "first", requiresDependencyResolution = ResolutionScope.TEST, defaultPhase = LifecyclePhase.INTEGRATION_TEST )
-@Execute( phase = LifecyclePhase.GENERATE_SOURCES, lifecycle = "cobertura" )
-public class FirstMojo
- extends AbstractFirstMojo
-{
+@Mojo(
+ name = "first",
+ requiresDependencyResolution = ResolutionScope.TEST,
+ defaultPhase = LifecyclePhase.INTEGRATION_TEST)
+@Execute(phase = LifecyclePhase.GENERATE_SOURCES, lifecycle = "cobertura")
+public class FirstMojo extends AbstractFirstMojo {
/**
* @since 0.1
* @deprecated As of 0.2
*/
- @Parameter( alias = "alias" )
+ @Parameter(alias = "alias")
private String aliasedParam;
- @Component( role = MavenProjectHelper.class )
+ @Component(role = MavenProjectHelper.class)
private Object projectHelper;
- public void execute()
- throws MojoExecutionException
- {
- if ( basedir == null )
- {
- throw new MojoExecutionException( "basedir == null" );
+ public void execute() throws MojoExecutionException {
+ if (basedir == null) {
+ throw new MojoExecutionException("basedir == null");
}
- if ( touchFile == null )
- {
- throw new MojoExecutionException( "touchFile == null" );
+ if (touchFile == null) {
+ throw new MojoExecutionException("touchFile == null");
}
- if ( projectHelper == null )
- {
- throw new MojoExecutionException( "projectHelper == null" );
+ if (projectHelper == null) {
+ throw new MojoExecutionException("projectHelper == null");
}
- if (! ( projectHelper instanceof MavenProjectHelper ))
- {
- throw new MojoExecutionException( "! projectHelper instanceof MavenProjectHelper" );
+ if (!(projectHelper instanceof MavenProjectHelper)) {
+ throw new MojoExecutionException("! projectHelper instanceof MavenProjectHelper");
}
-
}
-
}
diff --git a/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/module-mojo/src/main/java/org/apache/maven/plugin/coreit/SecondMojo.java b/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/module-mojo/src/main/java/org/apache/maven/plugin/coreit/SecondMojo.java
index 8dc9dff1..1f3c995c 100644
--- a/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/module-mojo/src/main/java/org/apache/maven/plugin/coreit/SecondMojo.java
+++ b/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/module-mojo/src/main/java/org/apache/maven/plugin/coreit/SecondMojo.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugin.coreit;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,22 +16,18 @@ package org.apache.maven.plugin.coreit;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.plugin.coreit;
import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.ResolutionScope;
/**
* Does nothing special.
- *
+ *
*/
-@Mojo( name = "second", requiresDependencyCollection = ResolutionScope.COMPILE, threadSafe = true )
-public class SecondMojo
- extends AbstractMojo
-{
-
- public void execute()
- {
- }
+@Mojo(name = "second", requiresDependencyCollection = ResolutionScope.COMPILE, threadSafe = true)
+public class SecondMojo extends AbstractMojo {
+ public void execute() {}
}
diff --git a/maven-plugin-plugin/src/it/annotation-with-inheritance/src/main/java/org/apache/maven/plugin/coreit/AbstractFirstMojo.java b/maven-plugin-plugin/src/it/annotation-with-inheritance/src/main/java/org/apache/maven/plugin/coreit/AbstractFirstMojo.java
index 65837c0a..1d70401c 100644
--- a/maven-plugin-plugin/src/it/annotation-with-inheritance/src/main/java/org/apache/maven/plugin/coreit/AbstractFirstMojo.java
+++ b/maven-plugin-plugin/src/it/annotation-with-inheritance/src/main/java/org/apache/maven/plugin/coreit/AbstractFirstMojo.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugin.coreit;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,35 +16,32 @@ package org.apache.maven.plugin.coreit;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.plugin.coreit;
+
+import java.io.File;
+import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.Parameter;
-import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
-
-import java.io.File;
/**
*
*/
-public abstract class AbstractFirstMojo
- extends AbstractMojo
-{
+public abstract class AbstractFirstMojo extends AbstractMojo {
/**
* Project directory.
*/
- @Parameter( defaultValue = "${basedir}", readonly = true )
+ @Parameter(defaultValue = "${basedir}", readonly = true)
protected File basedir;
- @Parameter( property = "first.touchFile", defaultValue = "${project.build.directory}/touch.txt",
- required = true )
+ @Parameter(property = "first.touchFile", defaultValue = "${project.build.directory}/touch.txt", required = true)
protected File touchFile;
/**
*
*/
- @Component( role = ArtifactMetadataSource.class, hint = "maven" )
+ @Component(role = ArtifactMetadataSource.class, hint = "maven")
protected ArtifactMetadataSource artifactMetadataSource;
-
}
diff --git a/maven-plugin-plugin/src/it/annotation-with-inheritance/src/main/java/org/apache/maven/plugin/coreit/AbstractFooMojo.java b/maven-plugin-plugin/src/it/annotation-with-inheritance/src/main/java/org/apache/maven/plugin/coreit/AbstractFooMojo.java
index 0b13bc23..fbffb147 100644
--- a/maven-plugin-plugin/src/it/annotation-with-inheritance/src/main/java/org/apache/maven/plugin/coreit/AbstractFooMojo.java
+++ b/maven-plugin-plugin/src/it/annotation-with-inheritance/src/main/java/org/apache/maven/plugin/coreit/AbstractFooMojo.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugin.coreit;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,13 +16,12 @@ package org.apache.maven.plugin.coreit;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.plugin.coreit;
/**
*
*/
-public abstract class AbstractFooMojo
- extends AbstractFirstMojo
-{
+public abstract class AbstractFooMojo extends AbstractFirstMojo {
// MPLUGIN-206
diff --git a/maven-plugin-plugin/src/it/annotation-with-inheritance/src/main/java/org/apache/maven/plugin/coreit/CoreIt0014Mojo.java b/maven-plugin-plugin/src/it/annotation-with-inheritance/src/main/java/org/apache/maven/plugin/coreit/CoreIt0014Mojo.java
index 26b9ce6a..e71a566f 100644
--- a/maven-plugin-plugin/src/it/annotation-with-inheritance/src/main/java/org/apache/maven/plugin/coreit/CoreIt0014Mojo.java
+++ b/maven-plugin-plugin/src/it/annotation-with-inheritance/src/main/java/org/apache/maven/plugin/coreit/CoreIt0014Mojo.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugin.coreit;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,49 +16,41 @@ package org.apache.maven.plugin.coreit;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.plugin.coreit;
+
+import java.io.File;
+import java.io.IOException;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
-import java.io.File;
-import java.io.IOException;
-
/**
* Touches a test file.
- *
+ *
*/
-@Mojo( name = "it0014" )
-public class CoreIt0014Mojo
- extends AbstractMojo
-{
-
- @Parameter( property = "project.build.directory", required = true )
+@Mojo(name = "it0014")
+public class CoreIt0014Mojo extends AbstractMojo {
+
+ @Parameter(property = "project.build.directory", required = true)
private String outputDirectory;
- public void execute()
- throws MojoExecutionException
- {
- getLog().info( "outputDirectory = " + outputDirectory );
+ public void execute() throws MojoExecutionException {
+ getLog().info("outputDirectory = " + outputDirectory);
+
+ File f = new File(outputDirectory);
- File f = new File( outputDirectory );
-
- if ( !f.exists() )
- {
+ if (!f.exists()) {
f.mkdirs();
}
-
- File touch = new File( f, "touch.txt" );
-
- try
- {
+
+ File touch = new File(f, "touch.txt");
+
+ try {
touch.createNewFile();
+ } catch (IOException e) {
+ throw new MojoExecutionException("Error writing verification file.", e);
}
- catch ( IOException e )
- {
- throw new MojoExecutionException( "Error writing verification file.", e );
- }
}
-
}
diff --git a/maven-plugin-plugin/src/it/annotation-with-inheritance/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java b/maven-plugin-plugin/src/it/annotation-with-inheritance/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java
index b22ff962..53a81f1f 100644
--- a/maven-plugin-plugin/src/it/annotation-with-inheritance/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java
+++ b/maven-plugin-plugin/src/it/annotation-with-inheritance/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugin.coreit;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,66 +16,59 @@ package org.apache.maven.plugin.coreit;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.plugin.coreit;
+
+import java.util.Set;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.annotations.Component;
-import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.plugins.annotations.Execute;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.project.MavenProjectHelper;
-import java.util.Set;
-
/**
* Touches a test file.
*
* @since 1.2
* @deprecated Don't use!
*/
-@Mojo( name = "first", requiresDependencyResolution = ResolutionScope.COMPILE,
- defaultPhase = LifecyclePhase.INTEGRATION_TEST )
-@Execute( phase = LifecyclePhase.GENERATE_SOURCES, lifecycle = "cobertura" )
-public class FirstMojo
- extends AbstractFirstMojo
-{
+@Mojo(
+ name = "first",
+ requiresDependencyResolution = ResolutionScope.COMPILE,
+ defaultPhase = LifecyclePhase.INTEGRATION_TEST)
+@Execute(phase = LifecyclePhase.GENERATE_SOURCES, lifecycle = "cobertura")
+public class FirstMojo extends AbstractFirstMojo {
/**
* @since 0.1
* @deprecated As of 0.2
*/
- @Parameter( alias = "alias" )
+ @Parameter(alias = "alias")
private String aliasedParam;
- @Component( role = MavenProjectHelper.class )//, roleHint = "default"
+ @Component(role = MavenProjectHelper.class) // , roleHint = "default"
private Object projectHelper;
- @Parameter( defaultValue = "${project.artifacts}", required = true, readonly = true )
+ @Parameter(defaultValue = "${project.artifacts}", required = true, readonly = true)
private Set<Artifact> dependencies;
- public void execute()
- throws MojoExecutionException
- {
- if ( basedir == null )
- {
- throw new MojoExecutionException( "basedir == null" );
+ public void execute() throws MojoExecutionException {
+ if (basedir == null) {
+ throw new MojoExecutionException("basedir == null");
}
- if ( touchFile == null )
- {
- throw new MojoExecutionException( "touchFile == null" );
+ if (touchFile == null) {
+ throw new MojoExecutionException("touchFile == null");
}
- if ( projectHelper == null )
- {
- throw new MojoExecutionException( "projectHelper == null" );
+ if (projectHelper == null) {
+ throw new MojoExecutionException("projectHelper == null");
}
- if ( dependencies.isEmpty() )
- {
- throw new MojoExecutionException( "dependencies.isEmpty()" );
+ if (dependencies.isEmpty()) {
+ throw new MojoExecutionException("dependencies.isEmpty()");
}
-
}
-
}
diff --git a/maven-plugin-plugin/src/it/annotation-with-inheritance/src/main/java/org/apache/maven/plugin/coreit/SecondMojo.java b/maven-plugin-plugin/src/it/annotation-with-inheritance/src/main/java/org/apache/maven/plugin/coreit/SecondMojo.java
index 8dc9dff1..1f3c995c 100644
--- a/maven-plugin-plugin/src/it/annotation-with-inheritance/src/main/java/org/apache/maven/plugin/coreit/SecondMojo.java
+++ b/maven-plugin-plugin/src/it/annotation-with-inheritance/src/main/java/org/apache/maven/plugin/coreit/SecondMojo.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugin.coreit;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,22 +16,18 @@ package org.apache.maven.plugin.coreit;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.plugin.coreit;
import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.ResolutionScope;
/**
* Does nothing special.
- *
+ *
*/
-@Mojo( name = "second", requiresDependencyCollection = ResolutionScope.COMPILE, threadSafe = true )
-public class SecondMojo
- extends AbstractMojo
-{
-
- public void execute()
- {
- }
+@Mojo(name = "second", requiresDependencyCollection = ResolutionScope.COMPILE, threadSafe = true)
+public class SecondMojo extends AbstractMojo {
+ public void execute() {}
}
diff --git a/maven-plugin-plugin/src/it/annotation-with-inheritance/src/main/java/org/apache/maven/plugin/coreit/ThirdMojo.java b/maven-plugin-plugin/src/it/annotation-with-inheritance/src/main/java/org/apache/maven/plugin/coreit/ThirdMojo.java
index 4a352624..f0bf8151 100644
--- a/maven-plugin-plugin/src/it/annotation-with-inheritance/src/main/java/org/apache/maven/plugin/coreit/ThirdMojo.java
+++ b/maven-plugin-plugin/src/it/annotation-with-inheritance/src/main/java/org/apache/maven/plugin/coreit/ThirdMojo.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugin.coreit;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,65 +16,58 @@ package org.apache.maven.plugin.coreit;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.plugin.coreit;
+
+import java.util.Set;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.annotations.Component;
-import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.plugins.annotations.Execute;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.project.MavenProjectHelper;
-import java.util.Set;
-
/**
* Touches a test file.
*
* @since 1.2
* @deprecated Don't use!
*/
-@Mojo( name = "third", requiresDependencyResolution = ResolutionScope.COMPILE,
- defaultPhase = LifecyclePhase.INTEGRATION_TEST )
-@Execute( phase = LifecyclePhase.GENERATE_SOURCES, lifecycle = "cobertura" )
-public class ThirdMojo
- extends AbstractFooMojo
-{
+@Mojo(
+ name = "third",
+ requiresDependencyResolution = ResolutionScope.COMPILE,
+ defaultPhase = LifecyclePhase.INTEGRATION_TEST)
+@Execute(phase = LifecyclePhase.GENERATE_SOURCES, lifecycle = "cobertura")
+public class ThirdMojo extends AbstractFooMojo {
/**
* @since 0.1
* @deprecated As of 0.2
*/
- @Parameter( alias = "alias" )
+ @Parameter(alias = "alias")
private String aliasedParam;
- @Component( role = MavenProjectHelper.class )//, roleHint = "default"
+ @Component(role = MavenProjectHelper.class) // , roleHint = "default"
private Object projectHelper;
- @Parameter( defaultValue = "${project.artifacts}", required = true, readonly = true )
+ @Parameter(defaultValue = "${project.artifacts}", required = true, readonly = true)
private Set<Artifact> dependencies;
- public void execute()
- throws MojoExecutionException
- {
- if ( basedir == null )
- {
- throw new MojoExecutionException( "basedir == null" );
+ public void execute() throws MojoExecutionException {
+ if (basedir == null) {
+ throw new MojoExecutionException("basedir == null");
}
- if ( touchFile == null )
- {
- throw new MojoExecutionException( "touchFile == null" );
+ if (touchFile == null) {
+ throw new MojoExecutionException("touchFile == null");
}
- if ( projectHelper == null )
- {
- throw new MojoExecutionException( "projectHelper == null" );
+ if (projectHelper == null) {
+ throw new MojoExecutionException("projectHelper == null");
}
- if ( dependencies.isEmpty() )
- {
- throw new MojoExecutionException( "dependencies.isEmpty()" );
+ if (dependencies.isEmpty()) {
+ throw new MojoExecutionException("dependencies.isEmpty()");
}
-
}
-
}
diff --git a/maven-plugin-plugin/src/it/ant-reference-parameter/src/main/java/org/apache/maven/plugins/antWithRefs/ArtifactsTask.java b/maven-plugin-plugin/src/it/ant-reference-parameter/src/main/java/org/apache/maven/plugins/antWithRefs/ArtifactsTask.java
index c41989d3..3098d66e 100644
--- a/maven-plugin-plugin/src/it/ant-reference-parameter/src/main/java/org/apache/maven/plugins/antWithRefs/ArtifactsTask.java
+++ b/maven-plugin-plugin/src/it/ant-reference-parameter/src/main/java/org/apache/maven/plugins/antWithRefs/ArtifactsTask.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugins.antWithRefs;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,18 +16,14 @@ package org.apache.maven.plugins.antWithRefs;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.plugins.antWithRefs;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Task;
-public class ArtifactsTask
- extends Task
-{
+public class ArtifactsTask extends Task {
- public void execute()
- throws BuildException
- {
- log( String.valueOf( ( Object ) getProject().getReference( "artifacts" ) ) );
+ public void execute() throws BuildException {
+ log(String.valueOf((Object) getProject().getReference("artifacts")));
}
-
}
diff --git a/maven-plugin-plugin/src/it/asm-failure/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java b/maven-plugin-plugin/src/it/asm-failure/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java
index 8b4d041d..d941f695 100644
--- a/maven-plugin-plugin/src/it/asm-failure/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java
+++ b/maven-plugin-plugin/src/it/asm-failure/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugin.coreit;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,10 +16,10 @@ package org.apache.maven.plugin.coreit;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.plugin.coreit;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
@@ -30,22 +28,17 @@ import org.apache.maven.plugins.annotations.Parameter;
*
* @since 1.2
*/
-@Mojo( name = "first" )
-public class FirstMojo
- extends AbstractMojo
-{
+@Mojo(name = "first")
+public class FirstMojo extends AbstractMojo {
/**
* @since 0.1
* @deprecated As of 0.2
*/
- @Parameter( alias = "alias" )
+ @Parameter(alias = "alias")
private String aliasedParam;
- public void execute()
- throws MojoExecutionException
- {
- getLog().info( "touch" );
+ public void execute() throws MojoExecutionException {
+ getLog().info("touch");
}
-
}
diff --git a/maven-plugin-plugin/src/it/help-basic-deprecated-annotation-only/src/main/java/test/MyMojo.java b/maven-plugin-plugin/src/it/help-basic-deprecated-annotation-only/src/main/java/test/MyMojo.java
index d4c81478..73ea5910 100644
--- a/maven-plugin-plugin/src/it/help-basic-deprecated-annotation-only/src/main/java/test/MyMojo.java
+++ b/maven-plugin-plugin/src/it/help-basic-deprecated-annotation-only/src/main/java/test/MyMojo.java
@@ -1,5 +1,3 @@
-package test;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -8,9 +6,9 @@ package test;
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,6 +16,7 @@ package test;
* specific language governing permissions and limitations
* under the License.
*/
+package test;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugins.annotations.Mojo;
@@ -26,22 +25,20 @@ import org.apache.maven.plugins.annotations.Parameter;
/**
* MOJO-DESCRIPTION. Some "quotation" marks and backslashes '\\', some <strong>important</strong> javadoc<br> and an
* inline link to {@link test.AnotherMojo}.
- *
+ *
* @since 2.1
*/
@Deprecated
-@Mojo( name= "test" )
-public class MyMojo
- extends AbstractMojo
-{
+@Mojo(name = "test")
+public class MyMojo extends AbstractMojo {
/**
* This parameter uses "quotation" marks and backslashes '\\' in its description. Those characters <em>must</em> be
* escaped in Java string literals.
- *
+ *
* @since 2.0
*/
- @Parameter( defaultValue = "escape\\backslash" )
+ @Parameter(defaultValue = "escape\\backslash")
private String defaultParam;
/**
@@ -51,17 +48,14 @@ public class MyMojo
@Parameter
private String deprecatedParam;
- @Parameter( property = "test.undocumented", required = true )
+ @Parameter(property = "test.undocumented", required = true)
private String undocumentedParam;
/**
* Readonly parameter: should not be proposed for configuration.
*/
- @Parameter( defaultValue = "not for configuration", readonly = true )
+ @Parameter(defaultValue = "not for configuration", readonly = true)
private String readonly;
- public void execute()
- {
- }
-
+ public void execute() {}
}
diff --git a/maven-plugin-plugin/src/it/help-basic-jdk11/src/main/java/test/MyMojo.java b/maven-plugin-plugin/src/it/help-basic-jdk11/src/main/java/test/MyMojo.java
index 0be9fd35..480fdbc7 100644
--- a/maven-plugin-plugin/src/it/help-basic-jdk11/src/main/java/test/MyMojo.java
+++ b/maven-plugin-plugin/src/it/help-basic-jdk11/src/main/java/test/MyMojo.java
@@ -1,5 +1,3 @@
-package test;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -8,9 +6,9 @@ package test;
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,6 +16,7 @@ package test;
* specific language governing permissions and limitations
* under the License.
*/
+package test;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugins.annotations.Mojo;
@@ -26,43 +25,38 @@ import org.apache.maven.plugins.annotations.Parameter;
/**
* MOJO-DESCRIPTION. Some "quotation" marks and backslashes '\\', some <strong>important</strong> javadoc<br> and an
* inline link to {@link test.AnotherMojo}.
- *
+ *
* @deprecated As of 1.0, use the "quoted" goal instead.
* @since 2.1
*/
-@Mojo( name= "test" )
-public class MyMojo
- extends AbstractMojo
-{
+@Mojo(name = "test")
+public class MyMojo extends AbstractMojo {
/**
* This parameter uses "quotation" marks and backslashes '\\' in its description. Those characters <em>must</em> be
* escaped in Java string literals.
- *
+ *
* @since 2.0
*/
- @Parameter( defaultValue = "escape\\backslash" )
+ @Parameter(defaultValue = "escape\\backslash")
private String defaultParam;
/**
* This parameter is deprecated.
- *
+ *
* @deprecated As of version 1.0, use the {@link #defaultParam} instead.
*/
@Parameter
private String deprecatedParam;
- @Parameter( property = "test.undocumented", required = true )
+ @Parameter(property = "test.undocumented", required = true)
private String undocumentedParam;
/**
* Readonly parameter: should not be proposed for configuration.
*/
- @Parameter( defaultValue = "not for configuration", readonly = true )
+ @Parameter(defaultValue = "not for configuration", readonly = true)
private String readonly;
- public void execute()
- {
- }
-
+ public void execute() {}
}
diff --git a/maven-plugin-plugin/src/it/help-basic/src/main/java/test/MyMojo.java b/maven-plugin-plugin/src/it/help-basic/src/main/java/test/MyMojo.java
index 0be9fd35..480fdbc7 100644
--- a/maven-plugin-plugin/src/it/help-basic/src/main/java/test/MyMojo.java
+++ b/maven-plugin-plugin/src/it/help-basic/src/main/java/test/MyMojo.java
@@ -1,5 +1,3 @@
-package test;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -8,9 +6,9 @@ package test;
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,6 +16,7 @@ package test;
* specific language governing permissions and limitations
* under the License.
*/
+package test;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugins.annotations.Mojo;
@@ -26,43 +25,38 @@ import org.apache.maven.plugins.annotations.Parameter;
/**
* MOJO-DESCRIPTION. Some "quotation" marks and backslashes '\\', some <strong>important</strong> javadoc<br> and an
* inline link to {@link test.AnotherMojo}.
- *
+ *
* @deprecated As of 1.0, use the "quoted" goal instead.
* @since 2.1
*/
-@Mojo( name= "test" )
-public class MyMojo
- extends AbstractMojo
-{
+@Mojo(name = "test")
+public class MyMojo extends AbstractMojo {
/**
* This parameter uses "quotation" marks and backslashes '\\' in its description. Those characters <em>must</em> be
* escaped in Java string literals.
- *
+ *
* @since 2.0
*/
- @Parameter( defaultValue = "escape\\backslash" )
+ @Parameter(defaultValue = "escape\\backslash")
private String defaultParam;
/**
* This parameter is deprecated.
- *
+ *
* @deprecated As of version 1.0, use the {@link #defaultParam} instead.
*/
@Parameter
private String deprecatedParam;
- @Parameter( property = "test.undocumented", required = true )
+ @Parameter(property = "test.undocumented", required = true)
private String undocumentedParam;
/**
* Readonly parameter: should not be proposed for configuration.
*/
- @Parameter( defaultValue = "not for configuration", readonly = true )
+ @Parameter(defaultValue = "not for configuration", readonly = true)
private String readonly;
- public void execute()
- {
- }
-
+ public void execute() {}
}
diff --git a/maven-plugin-plugin/src/it/help-package/src/main/java/test/MyMojo.java b/maven-plugin-plugin/src/it/help-package/src/main/java/test/MyMojo.java
index 5d2317fe..f5bcf5aa 100644
--- a/maven-plugin-plugin/src/it/help-package/src/main/java/test/MyMojo.java
+++ b/maven-plugin-plugin/src/it/help-package/src/main/java/test/MyMojo.java
@@ -1,5 +1,3 @@
-package test;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -8,9 +6,9 @@ package test;
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,20 +16,16 @@ package test;
* specific language governing permissions and limitations
* under the License.
*/
+package test;
import org.apache.maven.plugin.AbstractMojo;
/**
* MOJO-DESCRIPTION.
- *
+ *
* @goal test
*/
-public class MyMojo
- extends AbstractMojo
-{
-
- public void execute()
- {
- }
+public class MyMojo extends AbstractMojo {
+ public void execute() {}
}
diff --git a/maven-plugin-plugin/src/it/ignore-plugin-class-realm/dep-a/src/main/java/test/ClassA.java b/maven-plugin-plugin/src/it/ignore-plugin-class-realm/dep-a/src/main/java/test/ClassA.java
index 61027678..58b15b26 100644
--- a/maven-plugin-plugin/src/it/ignore-plugin-class-realm/dep-a/src/main/java/test/ClassA.java
+++ b/maven-plugin-plugin/src/it/ignore-plugin-class-realm/dep-a/src/main/java/test/ClassA.java
@@ -1,5 +1,3 @@
-package test;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -8,9 +6,9 @@ package test;
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,7 +16,6 @@ package test;
* specific language governing permissions and limitations
* under the License.
*/
+package test;
-public class ClassA
-{
-}
+public class ClassA {}
diff --git a/maven-plugin-plugin/src/it/ignore-plugin-class-realm/dep-b/src/main/java/test/ClassB.java b/maven-plugin-plugin/src/it/ignore-plugin-class-realm/dep-b/src/main/java/test/ClassB.java
index 452bd720..dc18b09c 100644
--- a/maven-plugin-plugin/src/it/ignore-plugin-class-realm/dep-b/src/main/java/test/ClassB.java
+++ b/maven-plugin-plugin/src/it/ignore-plugin-class-realm/dep-b/src/main/java/test/ClassB.java
@@ -1,5 +1,3 @@
-package test;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -8,9 +6,9 @@ package test;
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,16 +16,13 @@ package test;
* specific language governing permissions and limitations
* under the License.
*/
+package test;
-public class ClassB
-{
+public class ClassB {
/**
* For the test we want to trigger a linkage error when resolving ClassA. However, we want this error to occur when
* analyzing ClassB and not when loading ClassB itself.
*/
- public void triggerLazyLinkageError(ClassA param)
- {
- }
-
+ public void triggerLazyLinkageError(ClassA param) {}
}
diff --git a/maven-plugin-plugin/src/it/ignore-plugin-class-realm/test/src/main/java/test/SomeMojo.java b/maven-plugin-plugin/src/it/ignore-plugin-class-realm/test/src/main/java/test/SomeMojo.java
index f46c3bf2..dc1f6299 100644
--- a/maven-plugin-plugin/src/it/ignore-plugin-class-realm/test/src/main/java/test/SomeMojo.java
+++ b/maven-plugin-plugin/src/it/ignore-plugin-class-realm/test/src/main/java/test/SomeMojo.java
@@ -1,5 +1,3 @@
-package test;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -8,9 +6,9 @@ package test;
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,6 +16,7 @@ package test;
* specific language governing permissions and limitations
* under the License.
*/
+package test;
/**
* This is the source class to be scanned for annotations. While scanning, QDox must not try to resolve references to
@@ -27,8 +26,4 @@ package test;
*
* @goal test
*/
-public class SomeMojo
- extends ClassB
-{
-
-}
+public class SomeMojo extends ClassB {}
diff --git a/maven-plugin-plugin/src/it/java-basic-annotations-jdk8/src/main/java/org/apache/maven/plugin/coreit/CoreIt0014Mojo.java b/maven-plugin-plugin/src/it/java-basic-annotations-jdk8/src/main/java/org/apache/maven/plugin/coreit/CoreIt0014Mojo.java
index 26b9ce6a..e71a566f 100644
--- a/maven-plugin-plugin/src/it/java-basic-annotations-jdk8/src/main/java/org/apache/maven/plugin/coreit/CoreIt0014Mojo.java
+++ b/maven-plugin-plugin/src/it/java-basic-annotations-jdk8/src/main/java/org/apache/maven/plugin/coreit/CoreIt0014Mojo.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugin.coreit;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,49 +16,41 @@ package org.apache.maven.plugin.coreit;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.plugin.coreit;
+
+import java.io.File;
+import java.io.IOException;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
-import java.io.File;
-import java.io.IOException;
-
/**
* Touches a test file.
- *
+ *
*/
-@Mojo( name = "it0014" )
-public class CoreIt0014Mojo
- extends AbstractMojo
-{
-
- @Parameter( property = "project.build.directory", required = true )
+@Mojo(name = "it0014")
+public class CoreIt0014Mojo extends AbstractMojo {
+
+ @Parameter(property = "project.build.directory", required = true)
private String outputDirectory;
- public void execute()
- throws MojoExecutionException
- {
- getLog().info( "outputDirectory = " + outputDirectory );
+ public void execute() throws MojoExecutionException {
+ getLog().info("outputDirectory = " + outputDirectory);
+
+ File f = new File(outputDirectory);
- File f = new File( outputDirectory );
-
- if ( !f.exists() )
- {
+ if (!f.exists()) {
f.mkdirs();
}
-
- File touch = new File( f, "touch.txt" );
-
- try
- {
+
+ File touch = new File(f, "touch.txt");
+
+ try {
touch.createNewFile();
+ } catch (IOException e) {
+ throw new MojoExecutionException("Error writing verification file.", e);
}
- catch ( IOException e )
- {
- throw new MojoExecutionException( "Error writing verification file.", e );
- }
}
-
}
diff --git a/maven-plugin-plugin/src/it/java-basic-annotations-jdk8/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java b/maven-plugin-plugin/src/it/java-basic-annotations-jdk8/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java
index 62247a0f..1248f990 100644
--- a/maven-plugin-plugin/src/it/java-basic-annotations-jdk8/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java
+++ b/maven-plugin-plugin/src/it/java-basic-annotations-jdk8/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugin.coreit;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,9 @@ package org.apache.maven.plugin.coreit;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.plugin.coreit;
+
+import java.io.File;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.AbstractMojo;
@@ -25,47 +26,45 @@ import org.apache.maven.plugin.MojoExecution;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.apache.maven.plugins.annotations.Component;
-import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.plugins.annotations.Execute;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectHelper;
import org.apache.maven.settings.Settings;
-import java.io.File;
-
/**
* Touches a test file.
*
* @since 1.2
* @deprecated Don't use!
*/
-@Mojo( name = "first", requiresDependencyResolution = ResolutionScope.TEST, defaultPhase = LifecyclePhase.INTEGRATION_TEST )
-@Execute( phase = LifecyclePhase.GENERATE_SOURCES, lifecycle = "cobertura" )
-public class FirstMojo
- extends AbstractMojo
-{
+@Mojo(
+ name = "first",
+ requiresDependencyResolution = ResolutionScope.TEST,
+ defaultPhase = LifecyclePhase.INTEGRATION_TEST)
+@Execute(phase = LifecyclePhase.GENERATE_SOURCES, lifecycle = "cobertura")
+public class FirstMojo extends AbstractMojo {
/**
* Project directory.
*/
- @Parameter( defaultValue = "${basedir}", readonly = true )
+ @Parameter(defaultValue = "${basedir}", readonly = true)
private File basedir;
- @Parameter( property = "first.touchFile", defaultValue = "${project.build.directory}/touch.txt",
- required = true )
+ @Parameter(property = "first.touchFile", defaultValue = "${project.build.directory}/touch.txt", required = true)
private File touchFile;
/**
* @since 0.1
* @deprecated As of 0.2
*/
- @Parameter( name = "namedParam", alias = "alias" )
+ @Parameter(name = "namedParam", alias = "alias")
private String aliasedParam;
- @Component( role = MavenProjectHelper.class, hint = "test" )
+ @Component(role = MavenProjectHelper.class, hint = "test")
private Object projectHelper;
@Component
@@ -83,9 +82,5 @@ public class FirstMojo
@Component
private Settings settings;
- public void execute()
- throws MojoExecutionException
- {
- }
-
+ public void execute() throws MojoExecutionException {}
}
diff --git a/maven-plugin-plugin/src/it/java-basic-annotations-jdk8/src/main/java/org/apache/maven/plugin/coreit/MPlugin220Mojo.java b/maven-plugin-plugin/src/it/java-basic-annotations-jdk8/src/main/java/org/apache/maven/plugin/coreit/MPlugin220Mojo.java
index 06b60681..9cc751bd 100644
--- a/maven-plugin-plugin/src/it/java-basic-annotations-jdk8/src/main/java/org/apache/maven/plugin/coreit/MPlugin220Mojo.java
+++ b/maven-plugin-plugin/src/it/java-basic-annotations-jdk8/src/main/java/org/apache/maven/plugin/coreit/MPlugin220Mojo.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugin.coreit;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,30 +16,23 @@ package org.apache.maven.plugin.coreit;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.plugin.coreit;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
-import java.io.File;
-import java.io.IOException;
-
/**
- * Could not use regex in @Parameter(defaultValue)
+ * Could not use regex in @Parameter(defaultValue)
*/
-@Mojo( name = "mplugin-220" )
-public class MPlugin220Mojo
- extends AbstractMojo
-{
-
- @Parameter( defaultValue = "[a-zA-Z]{2,}-\\\\d+" )
+@Mojo(name = "mplugin-220")
+public class MPlugin220Mojo extends AbstractMojo {
+
+ @Parameter(defaultValue = "[a-zA-Z]{2,}-\\\\d+")
private String regex;
- public void execute()
- throws MojoExecutionException
- {
- getLog().info( "regex = " + regex );
+ public void execute() throws MojoExecutionException {
+ getLog().info("regex = " + regex);
}
-
}
diff --git a/maven-plugin-plugin/src/it/java-basic-annotations-jdk8/src/main/java/org/apache/maven/plugin/coreit/Maximal.java b/maven-plugin-plugin/src/it/java-basic-annotations-jdk8/src/main/java/org/apache/maven/plugin/coreit/Maximal.java
index 1ca4ca14..f23eebf3 100644
--- a/maven-plugin-plugin/src/it/java-basic-annotations-jdk8/src/main/java/org/apache/maven/plugin/coreit/Maximal.java
+++ b/maven-plugin-plugin/src/it/java-basic-annotations-jdk8/src/main/java/org/apache/maven/plugin/coreit/Maximal.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugin.coreit;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,15 +16,16 @@ package org.apache.maven.plugin.coreit;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.plugin.coreit;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugins.annotations.Component;
-import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.plugins.annotations.Execute;
import org.apache.maven.plugins.annotations.InstantiationStrategy;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.project.MavenProjectHelper;
/**
@@ -35,42 +34,39 @@ import org.apache.maven.project.MavenProjectHelper;
* @since since-text
* @deprecated deprecated-text
*/
-@Mojo( name = "maximal",
- aggregator = true,
- configurator = "configurator-hint",
- requiresDependencyResolution = ResolutionScope.COMPILE,
- requiresDependencyCollection = ResolutionScope.TEST,
- defaultPhase = LifecyclePhase.PACKAGE,
- executionStrategy = "always",
- instantiationStrategy = InstantiationStrategy.SINGLETON,
- inheritByDefault = false,
- requiresDirectInvocation = true,
- requiresOnline = true,
- requiresProject = false,
- requiresReports = true,
- threadSafe = true )
-@Execute( phase = LifecyclePhase.COMPILE )
-public class Maximal
- extends AbstractMojo
-{
+@Mojo(
+ name = "maximal",
+ aggregator = true,
+ configurator = "configurator-hint",
+ requiresDependencyResolution = ResolutionScope.COMPILE,
+ requiresDependencyCollection = ResolutionScope.TEST,
+ defaultPhase = LifecyclePhase.PACKAGE,
+ executionStrategy = "always",
+ instantiationStrategy = InstantiationStrategy.SINGLETON,
+ inheritByDefault = false,
+ requiresDirectInvocation = true,
+ requiresOnline = true,
+ requiresProject = false,
+ requiresReports = true,
+ threadSafe = true)
+@Execute(phase = LifecyclePhase.COMPILE)
+public class Maximal extends AbstractMojo {
/**
* Parameter description.
*
* @since since-text
* @deprecated deprecated-text
*/
- @Parameter( alias = "myAlias",
- property = "aProperty",
- defaultValue = "${anExpression}",
- readonly = true,
- required = true )
+ @Parameter(
+ alias = "myAlias",
+ property = "aProperty",
+ defaultValue = "${anExpression}",
+ readonly = true,
+ required = true)
private String param;
- @Component( role = MavenProjectHelper.class, hint = "test" )
+ @Component(role = MavenProjectHelper.class, hint = "test")
private Object projectHelper;
- public void execute()
- {
- }
-
+ public void execute() {}
}
diff --git a/maven-plugin-plugin/src/it/java-basic-annotations-jdk8/src/main/java/org/apache/maven/plugin/coreit/Minimal.java b/maven-plugin-plugin/src/it/java-basic-annotations-jdk8/src/main/java/org/apache/maven/plugin/coreit/Minimal.java
index 18f3cfb4..9f3954e5 100644
--- a/maven-plugin-plugin/src/it/java-basic-annotations-jdk8/src/main/java/org/apache/maven/plugin/coreit/Minimal.java
+++ b/maven-plugin-plugin/src/it/java-basic-annotations-jdk8/src/main/java/org/apache/maven/plugin/coreit/Minimal.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugin.coreit;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.plugin.coreit;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.plugin.coreit;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugins.annotations.Component;
@@ -26,18 +25,13 @@ import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProjectHelper;
// minimum annotations => default values
-@Mojo( name = "minimal" )
-public class Minimal
- extends AbstractMojo
-{
+@Mojo(name = "minimal")
+public class Minimal extends AbstractMojo {
@Parameter
private String param;
@Component
private MavenProjectHelper projectHelper;
- public void execute()
- {
- }
-
+ public void execute() {}
}
diff --git a/maven-plugin-plugin/src/it/java-basic-annotations-jdk8/src/main/java/org/apache/maven/plugin/coreit/TestInterface.java b/maven-plugin-plugin/src/it/java-basic-annotations-jdk8/src/main/java/org/apache/maven/plugin/coreit/TestInterface.java
index 16ee6d52..1cca16bf 100644
--- a/maven-plugin-plugin/src/it/java-basic-annotations-jdk8/src/main/java/org/apache/maven/plugin/coreit/TestInterface.java
+++ b/maven-plugin-plugin/src/it/java-basic-annotations-jdk8/src/main/java/org/apache/maven/plugin/coreit/TestInterface.java
@@ -1,5 +1,3 @@
-package fr.ca;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,13 +16,12 @@ package fr.ca;
* specific language governing permissions and limitations
* under the License.
*/
+package fr.ca;
public interface TestInterface {
/**
* Java 8 required to support such default method implementation
*/
- public default void foo(){
-
- }
+ public default void foo() {}
}
diff --git a/maven-plugin-plugin/src/it/java-basic-annotations-jdkcurrent/src/main/java/org/apache/maven/plugin/coreit/CoreIt0014Mojo.java b/maven-plugin-plugin/src/it/java-basic-annotations-jdkcurrent/src/main/java/org/apache/maven/plugin/coreit/CoreIt0014Mojo.java
index 26b9ce6a..e71a566f 100644
--- a/maven-plugin-plugin/src/it/java-basic-annotations-jdkcurrent/src/main/java/org/apache/maven/plugin/coreit/CoreIt0014Mojo.java
+++ b/maven-plugin-plugin/src/it/java-basic-annotations-jdkcurrent/src/main/java/org/apache/maven/plugin/coreit/CoreIt0014Mojo.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugin.coreit;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,49 +16,41 @@ package org.apache.maven.plugin.coreit;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.plugin.coreit;
+
+import java.io.File;
+import java.io.IOException;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
-import java.io.File;
-import java.io.IOException;
-
/**
* Touches a test file.
- *
+ *
*/
-@Mojo( name = "it0014" )
-public class CoreIt0014Mojo
- extends AbstractMojo
-{
-
- @Parameter( property = "project.build.directory", required = true )
+@Mojo(name = "it0014")
+public class CoreIt0014Mojo extends AbstractMojo {
+
+ @Parameter(property = "project.build.directory", required = true)
private String outputDirectory;
- public void execute()
- throws MojoExecutionException
- {
- getLog().info( "outputDirectory = " + outputDirectory );
+ public void execute() throws MojoExecutionException {
+ getLog().info("outputDirectory = " + outputDirectory);
+
+ File f = new File(outputDirectory);
- File f = new File( outputDirectory );
-
- if ( !f.exists() )
- {
+ if (!f.exists()) {
f.mkdirs();
}
-
- File touch = new File( f, "touch.txt" );
-
- try
- {
+
+ File touch = new File(f, "touch.txt");
+
+ try {
touch.createNewFile();
+ } catch (IOException e) {
+ throw new MojoExecutionException("Error writing verification file.", e);
}
- catch ( IOException e )
- {
- throw new MojoExecutionException( "Error writing verification file.", e );
- }
}
-
}
diff --git a/maven-plugin-plugin/src/it/java-basic-annotations-jdkcurrent/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java b/maven-plugin-plugin/src/it/java-basic-annotations-jdkcurrent/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java
index 62247a0f..1248f990 100644
--- a/maven-plugin-plugin/src/it/java-basic-annotations-jdkcurrent/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java
+++ b/maven-plugin-plugin/src/it/java-basic-annotations-jdkcurrent/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugin.coreit;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,9 @@ package org.apache.maven.plugin.coreit;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.plugin.coreit;
+
+import java.io.File;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.AbstractMojo;
@@ -25,47 +26,45 @@ import org.apache.maven.plugin.MojoExecution;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.apache.maven.plugins.annotations.Component;
-import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.plugins.annotations.Execute;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectHelper;
import org.apache.maven.settings.Settings;
-import java.io.File;
-
/**
* Touches a test file.
*
* @since 1.2
* @deprecated Don't use!
*/
-@Mojo( name = "first", requiresDependencyResolution = ResolutionScope.TEST, defaultPhase = LifecyclePhase.INTEGRATION_TEST )
-@Execute( phase = LifecyclePhase.GENERATE_SOURCES, lifecycle = "cobertura" )
-public class FirstMojo
- extends AbstractMojo
-{
+@Mojo(
+ name = "first",
+ requiresDependencyResolution = ResolutionScope.TEST,
+ defaultPhase = LifecyclePhase.INTEGRATION_TEST)
+@Execute(phase = LifecyclePhase.GENERATE_SOURCES, lifecycle = "cobertura")
+public class FirstMojo extends AbstractMojo {
/**
* Project directory.
*/
- @Parameter( defaultValue = "${basedir}", readonly = true )
+ @Parameter(defaultValue = "${basedir}", readonly = true)
private File basedir;
- @Parameter( property = "first.touchFile", defaultValue = "${project.build.directory}/touch.txt",
- required = true )
+ @Parameter(property = "first.touchFile", defaultValue = "${project.build.directory}/touch.txt", required = true)
private File touchFile;
/**
* @since 0.1
* @deprecated As of 0.2
*/
- @Parameter( name = "namedParam", alias = "alias" )
+ @Parameter(name = "namedParam", alias = "alias")
private String aliasedParam;
- @Component( role = MavenProjectHelper.class, hint = "test" )
+ @Component(role = MavenProjectHelper.class, hint = "test")
private Object projectHelper;
@Component
@@ -83,9 +82,5 @@ public class FirstMojo
@Component
private Settings settings;
- public void execute()
- throws MojoExecutionException
- {
- }
-
+ public void execute() throws MojoExecutionException {}
}
diff --git a/maven-plugin-plugin/src/it/java-basic-annotations-jdkcurrent/src/main/java/org/apache/maven/plugin/coreit/MPlugin220Mojo.java b/maven-plugin-plugin/src/it/java-basic-annotations-jdkcurrent/src/main/java/org/apache/maven/plugin/coreit/MPlugin220Mojo.java
index 06b60681..9cc751bd 100644
--- a/maven-plugin-plugin/src/it/java-basic-annotations-jdkcurrent/src/main/java/org/apache/maven/plugin/coreit/MPlugin220Mojo.java
+++ b/maven-plugin-plugin/src/it/java-basic-annotations-jdkcurrent/src/main/java/org/apache/maven/plugin/coreit/MPlugin220Mojo.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugin.coreit;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,30 +16,23 @@ package org.apache.maven.plugin.coreit;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.plugin.coreit;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
-import java.io.File;
-import java.io.IOException;
-
/**
- * Could not use regex in @Parameter(defaultValue)
+ * Could not use regex in @Parameter(defaultValue)
*/
-@Mojo( name = "mplugin-220" )
-public class MPlugin220Mojo
- extends AbstractMojo
-{
-
- @Parameter( defaultValue = "[a-zA-Z]{2,}-\\\\d+" )
+@Mojo(name = "mplugin-220")
+public class MPlugin220Mojo extends AbstractMojo {
+
+ @Parameter(defaultValue = "[a-zA-Z]{2,}-\\\\d+")
private String regex;
- public void execute()
- throws MojoExecutionException
- {
- getLog().info( "regex = " + regex );
+ public void execute() throws MojoExecutionException {
+ getLog().info("regex = " + regex);
}
-
}
diff --git a/maven-plugin-plugin/src/it/java-basic-annotations-jdkcurrent/src/main/java/org/apache/maven/plugin/coreit/Maximal.java b/maven-plugin-plugin/src/it/java-basic-annotations-jdkcurrent/src/main/java/org/apache/maven/plugin/coreit/Maximal.java
index 1ca4ca14..f23eebf3 100644
--- a/maven-plugin-plugin/src/it/java-basic-annotations-jdkcurrent/src/main/java/org/apache/maven/plugin/coreit/Maximal.java
+++ b/maven-plugin-plugin/src/it/java-basic-annotations-jdkcurrent/src/main/java/org/apache/maven/plugin/coreit/Maximal.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugin.coreit;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,15 +16,16 @@ package org.apache.maven.plugin.coreit;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.plugin.coreit;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugins.annotations.Component;
-import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.plugins.annotations.Execute;
import org.apache.maven.plugins.annotations.InstantiationStrategy;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.project.MavenProjectHelper;
/**
@@ -35,42 +34,39 @@ import org.apache.maven.project.MavenProjectHelper;
* @since since-text
* @deprecated deprecated-text
*/
-@Mojo( name = "maximal",
- aggregator = true,
- configurator = "configurator-hint",
- requiresDependencyResolution = ResolutionScope.COMPILE,
- requiresDependencyCollection = ResolutionScope.TEST,
- defaultPhase = LifecyclePhase.PACKAGE,
- executionStrategy = "always",
- instantiationStrategy = InstantiationStrategy.SINGLETON,
- inheritByDefault = false,
- requiresDirectInvocation = true,
- requiresOnline = true,
- requiresProject = false,
- requiresReports = true,
- threadSafe = true )
-@Execute( phase = LifecyclePhase.COMPILE )
-public class Maximal
- extends AbstractMojo
-{
+@Mojo(
+ name = "maximal",
+ aggregator = true,
+ configurator = "configurator-hint",
+ requiresDependencyResolution = ResolutionScope.COMPILE,
+ requiresDependencyCollection = ResolutionScope.TEST,
+ defaultPhase = LifecyclePhase.PACKAGE,
+ executionStrategy = "always",
+ instantiationStrategy = InstantiationStrategy.SINGLETON,
+ inheritByDefault = false,
+ requiresDirectInvocation = true,
+ requiresOnline = true,
+ requiresProject = false,
+ requiresReports = true,
+ threadSafe = true)
+@Execute(phase = LifecyclePhase.COMPILE)
+public class Maximal extends AbstractMojo {
/**
* Parameter description.
*
* @since since-text
* @deprecated deprecated-text
*/
- @Parameter( alias = "myAlias",
- property = "aProperty",
- defaultValue = "${anExpression}",
- readonly = true,
- required = true )
+ @Parameter(
+ alias = "myAlias",
+ property = "aProperty",
+ defaultValue = "${anExpression}",
+ readonly = true,
+ required = true)
private String param;
- @Component( role = MavenProjectHelper.class, hint = "test" )
+ @Component(role = MavenProjectHelper.class, hint = "test")
private Object projectHelper;
- public void execute()
- {
- }
-
+ public void execute() {}
}
diff --git a/maven-plugin-plugin/src/it/java-basic-annotations-jdkcurrent/src/main/java/org/apache/maven/plugin/coreit/Minimal.java b/maven-plugin-plugin/src/it/java-basic-annotations-jdkcurrent/src/main/java/org/apache/maven/plugin/coreit/Minimal.java
index 18f3cfb4..9f3954e5 100644
--- a/maven-plugin-plugin/src/it/java-basic-annotations-jdkcurrent/src/main/java/org/apache/maven/plugin/coreit/Minimal.java
+++ b/maven-plugin-plugin/src/it/java-basic-annotations-jdkcurrent/src/main/java/org/apache/maven/plugin/coreit/Minimal.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugin.coreit;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.plugin.coreit;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.plugin.coreit;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugins.annotations.Component;
@@ -26,18 +25,13 @@ import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProjectHelper;
// minimum annotations => default values
-@Mojo( name = "minimal" )
-public class Minimal
- extends AbstractMojo
-{
+@Mojo(name = "minimal")
+public class Minimal extends AbstractMojo {
@Parameter
private String param;
@Component
private MavenProjectHelper projectHelper;
- public void execute()
- {
- }
-
+ public void execute() {}
}
diff --git a/maven-plugin-plugin/src/it/java-basic-annotations-jdkcurrent/src/main/java/org/apache/maven/plugin/coreit/TestInterface.java b/maven-plugin-plugin/src/it/java-basic-annotations-jdkcurrent/src/main/java/org/apache/maven/plugin/coreit/TestInterface.java
index 16ee6d52..1cca16bf 100644
--- a/maven-plugin-plugin/src/it/java-basic-annotations-jdkcurrent/src/main/java/org/apache/maven/plugin/coreit/TestInterface.java
+++ b/maven-plugin-plugin/src/it/java-basic-annotations-jdkcurrent/src/main/java/org/apache/maven/plugin/coreit/TestInterface.java
@@ -1,5 +1,3 @@
-package fr.ca;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,13 +16,12 @@ package fr.ca;
* specific language governing permissions and limitations
* under the License.
*/
+package fr.ca;
public interface TestInterface {
/**
* Java 8 required to support such default method implementation
*/
- public default void foo(){
-
- }
+ public default void foo() {}
}
diff --git a/maven-plugin-plugin/src/it/java-basic-annotations/src/main/java/org/apache/maven/plugin/coreit/CoreIt0014Mojo.java b/maven-plugin-plugin/src/it/java-basic-annotations/src/main/java/org/apache/maven/plugin/coreit/CoreIt0014Mojo.java
index 26b9ce6a..e71a566f 100644
--- a/maven-plugin-plugin/src/it/java-basic-annotations/src/main/java/org/apache/maven/plugin/coreit/CoreIt0014Mojo.java
+++ b/maven-plugin-plugin/src/it/java-basic-annotations/src/main/java/org/apache/maven/plugin/coreit/CoreIt0014Mojo.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugin.coreit;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,49 +16,41 @@ package org.apache.maven.plugin.coreit;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.plugin.coreit;
+
+import java.io.File;
+import java.io.IOException;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
-import java.io.File;
-import java.io.IOException;
-
/**
* Touches a test file.
- *
+ *
*/
-@Mojo( name = "it0014" )
-public class CoreIt0014Mojo
- extends AbstractMojo
-{
-
- @Parameter( property = "project.build.directory", required = true )
+@Mojo(name = "it0014")
+public class CoreIt0014Mojo extends AbstractMojo {
+
+ @Parameter(property = "project.build.directory", required = true)
private String outputDirectory;
- public void execute()
- throws MojoExecutionException
- {
- getLog().info( "outputDirectory = " + outputDirectory );
+ public void execute() throws MojoExecutionException {
+ getLog().info("outputDirectory = " + outputDirectory);
+
+ File f = new File(outputDirectory);
- File f = new File( outputDirectory );
-
- if ( !f.exists() )
- {
+ if (!f.exists()) {
f.mkdirs();
}
-
- File touch = new File( f, "touch.txt" );
-
- try
- {
+
+ File touch = new File(f, "touch.txt");
+
+ try {
touch.createNewFile();
+ } catch (IOException e) {
+ throw new MojoExecutionException("Error writing verification file.", e);
}
- catch ( IOException e )
- {
- throw new MojoExecutionException( "Error writing verification file.", e );
- }
}
-
}
diff --git a/maven-plugin-plugin/src/it/java-basic-annotations/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java b/maven-plugin-plugin/src/it/java-basic-annotations/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java
index f2848eb5..1342c2d5 100644
--- a/maven-plugin-plugin/src/it/java-basic-annotations/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java
+++ b/maven-plugin-plugin/src/it/java-basic-annotations/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugin.coreit;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,9 @@ package org.apache.maven.plugin.coreit;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.plugin.coreit;
+
+import java.io.File;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.AbstractMojo;
@@ -25,38 +26,36 @@ import org.apache.maven.plugin.MojoExecution;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.apache.maven.plugins.annotations.Component;
-import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.plugins.annotations.Execute;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectHelper;
import org.apache.maven.settings.Settings;
-import java.io.File;
-
/**
* Touches a test file.
*
* @since 1.2
* @deprecated Don't use!
*/
-@Mojo( name = "first", requiresDependencyResolution = ResolutionScope.TEST, defaultPhase = LifecyclePhase.INTEGRATION_TEST )
-@Execute( phase = LifecyclePhase.GENERATE_SOURCES, lifecycle = "cobertura" )
+@Mojo(
+ name = "first",
+ requiresDependencyResolution = ResolutionScope.TEST,
+ defaultPhase = LifecyclePhase.INTEGRATION_TEST)
+@Execute(phase = LifecyclePhase.GENERATE_SOURCES, lifecycle = "cobertura")
@Deprecated
-public class FirstMojo
- extends AbstractMojo
-{
+public class FirstMojo extends AbstractMojo {
/**
* Project directory.
*/
- @Parameter( defaultValue = "${basedir}", readonly = true )
+ @Parameter(defaultValue = "${basedir}", readonly = true)
private File basedir;
- @Parameter( property = "first.touchFile", defaultValue = "${project.build.directory}/touch.txt",
- required = true )
+ @Parameter(property = "first.touchFile", defaultValue = "${project.build.directory}/touch.txt", required = true)
private File touchFile;
/**
@@ -64,10 +63,10 @@ public class FirstMojo
* @deprecated As of 0.2
*/
@Deprecated
- @Parameter( name = "namedParam", alias = "alias" )
+ @Parameter(name = "namedParam", alias = "alias")
private String aliasedParam;
- @Component( role = MavenProjectHelper.class, hint = "test" )
+ @Component(role = MavenProjectHelper.class, hint = "test")
private Object projectHelper;
@Component
@@ -85,9 +84,5 @@ public class FirstMojo
@Component
private Settings settings;
- public void execute()
- throws MojoExecutionException
- {
- }
-
+ public void execute() throws MojoExecutionException {}
}
diff --git a/maven-plugin-plugin/src/it/java-basic-annotations/src/main/java/org/apache/maven/plugin/coreit/MPlugin220Mojo.java b/maven-plugin-plugin/src/it/java-basic-annotations/src/main/java/org/apache/maven/plugin/coreit/MPlugin220Mojo.java
index 06b60681..9cc751bd 100644
--- a/maven-plugin-plugin/src/it/java-basic-annotations/src/main/java/org/apache/maven/plugin/coreit/MPlugin220Mojo.java
+++ b/maven-plugin-plugin/src/it/java-basic-annotations/src/main/java/org/apache/maven/plugin/coreit/MPlugin220Mojo.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugin.coreit;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,30 +16,23 @@ package org.apache.maven.plugin.coreit;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.plugin.coreit;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
-import java.io.File;
-import java.io.IOException;
-
/**
- * Could not use regex in @Parameter(defaultValue)
+ * Could not use regex in @Parameter(defaultValue)
*/
-@Mojo( name = "mplugin-220" )
-public class MPlugin220Mojo
- extends AbstractMojo
-{
-
- @Parameter( defaultValue = "[a-zA-Z]{2,}-\\\\d+" )
+@Mojo(name = "mplugin-220")
+public class MPlugin220Mojo extends AbstractMojo {
+
+ @Parameter(defaultValue = "[a-zA-Z]{2,}-\\\\d+")
private String regex;
- public void execute()
- throws MojoExecutionException
- {
- getLog().info( "regex = " + regex );
+ public void execute() throws MojoExecutionException {
+ getLog().info("regex = " + regex);
}
-
}
diff --git a/maven-plugin-plugin/src/it/java-basic-annotations/src/main/java/org/apache/maven/plugin/coreit/MPlugin396Mojo.java b/maven-plugin-plugin/src/it/java-basic-annotations/src/main/java/org/apache/maven/plugin/coreit/MPlugin396Mojo.java
index 57c45d83..3ff6df0f 100644
--- a/maven-plugin-plugin/src/it/java-basic-annotations/src/main/java/org/apache/maven/plugin/coreit/MPlugin396Mojo.java
+++ b/maven-plugin-plugin/src/it/java-basic-annotations/src/main/java/org/apache/maven/plugin/coreit/MPlugin396Mojo.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugin.coreit;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.plugin.coreit;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.plugin.coreit;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugins.annotations.Component;
@@ -26,10 +25,8 @@ import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProjectHelper;
@Deprecated
-@Mojo( name = "mplugin-396" )
-public class MPlugin396Mojo
- extends AbstractMojo
-{
+@Mojo(name = "mplugin-396")
+public class MPlugin396Mojo extends AbstractMojo {
@Deprecated
@Parameter
private String param;
@@ -37,7 +34,5 @@ public class MPlugin396Mojo
@Component
private MavenProjectHelper projectHelper;
- public void execute()
- {
- }
+ public void execute() {}
}
diff --git a/maven-plugin-plugin/src/it/java-basic-annotations/src/main/java/org/apache/maven/plugin/coreit/Maximal.java b/maven-plugin-plugin/src/it/java-basic-annotations/src/main/java/org/apache/maven/plugin/coreit/Maximal.java
index 1ca4ca14..f23eebf3 100644
--- a/maven-plugin-plugin/src/it/java-basic-annotations/src/main/java/org/apache/maven/plugin/coreit/Maximal.java
+++ b/maven-plugin-plugin/src/it/java-basic-annotations/src/main/java/org/apache/maven/plugin/coreit/Maximal.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugin.coreit;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,15 +16,16 @@ package org.apache.maven.plugin.coreit;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.plugin.coreit;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugins.annotations.Component;
-import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.plugins.annotations.Execute;
import org.apache.maven.plugins.annotations.InstantiationStrategy;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.project.MavenProjectHelper;
/**
@@ -35,42 +34,39 @@ import org.apache.maven.project.MavenProjectHelper;
* @since since-text
* @deprecated deprecated-text
*/
-@Mojo( name = "maximal",
- aggregator = true,
- configurator = "configurator-hint",
- requiresDependencyResolution = ResolutionScope.COMPILE,
- requiresDependencyCollection = ResolutionScope.TEST,
- defaultPhase = LifecyclePhase.PACKAGE,
- executionStrategy = "always",
- instantiationStrategy = InstantiationStrategy.SINGLETON,
- inheritByDefault = false,
- requiresDirectInvocation = true,
- requiresOnline = true,
- requiresProject = false,
- requiresReports = true,
- threadSafe = true )
-@Execute( phase = LifecyclePhase.COMPILE )
-public class Maximal
- extends AbstractMojo
-{
+@Mojo(
+ name = "maximal",
+ aggregator = true,
+ configurator = "configurator-hint",
+ requiresDependencyResolution = ResolutionScope.COMPILE,
+ requiresDependencyCollection = ResolutionScope.TEST,
+ defaultPhase = LifecyclePhase.PACKAGE,
+ executionStrategy = "always",
+ instantiationStrategy = InstantiationStrategy.SINGLETON,
+ inheritByDefault = false,
+ requiresDirectInvocation = true,
+ requiresOnline = true,
+ requiresProject = false,
+ requiresReports = true,
+ threadSafe = true)
+@Execute(phase = LifecyclePhase.COMPILE)
+public class Maximal extends AbstractMojo {
/**
* Parameter description.
*
* @since since-text
* @deprecated deprecated-text
*/
- @Parameter( alias = "myAlias",
- property = "aProperty",
- defaultValue = "${anExpression}",
- readonly = true,
- required = true )
+ @Parameter(
+ alias = "myAlias",
+ property = "aProperty",
+ defaultValue = "${anExpression}",
+ readonly = true,
+ required = true)
private String param;
- @Component( role = MavenProjectHelper.class, hint = "test" )
+ @Component(role = MavenProjectHelper.class, hint = "test")
private Object projectHelper;
- public void execute()
- {
- }
-
+ public void execute() {}
}
diff --git a/maven-plugin-plugin/src/it/java-basic-annotations/src/main/java/org/apache/maven/plugin/coreit/Minimal.java b/maven-plugin-plugin/src/it/java-basic-annotations/src/main/java/org/apache/maven/plugin/coreit/Minimal.java
index 18f3cfb4..9f3954e5 100644
--- a/maven-plugin-plugin/src/it/java-basic-annotations/src/main/java/org/apache/maven/plugin/coreit/Minimal.java
+++ b/maven-plugin-plugin/src/it/java-basic-annotations/src/main/java/org/apache/maven/plugin/coreit/Minimal.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugin.coreit;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.plugin.coreit;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.plugin.coreit;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugins.annotations.Component;
@@ -26,18 +25,13 @@ import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProjectHelper;
// minimum annotations => default values
-@Mojo( name = "minimal" )
-public class Minimal
- extends AbstractMojo
-{
+@Mojo(name = "minimal")
+public class Minimal extends AbstractMojo {
@Parameter
private String param;
@Component
private MavenProjectHelper projectHelper;
- public void execute()
- {
- }
-
+ public void execute() {}
}
diff --git a/maven-plugin-plugin/src/it/java-basic/src/main/java/org/apache/maven/plugin/coreit/CoreIt0013Mojo.java b/maven-plugin-plugin/src/it/java-basic/src/main/java/org/apache/maven/plugin/coreit/CoreIt0013Mojo.java
index 824f0436..ba8a4686 100644
--- a/maven-plugin-plugin/src/it/java-basic/src/main/java/org/apache/maven/plugin/coreit/CoreIt0013Mojo.java
+++ b/maven-plugin-plugin/src/it/java-basic/src/main/java/org/apache/maven/plugin/coreit/CoreIt0013Mojo.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugin.coreit;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,50 +16,42 @@ package org.apache.maven.plugin.coreit;
* specific language governing permissions and limitations
* under the License.
*/
-
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugin.MojoExecutionException;
+package org.apache.maven.plugin.coreit;
import java.io.File;
import java.io.IOException;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+
/**
* Touches a test file.
- *
+ *
* @goal it0013
*/
-public class CoreIt0013Mojo
- extends AbstractMojo
-{
-
+public class CoreIt0013Mojo extends AbstractMojo {
+
/**
* @parameter property="project.build.directory"
* @required
*/
private String outputDirectory;
- public void execute()
- throws MojoExecutionException
- {
- getLog().info( "outputDirectory = " + outputDirectory );
+ public void execute() throws MojoExecutionException {
+ getLog().info("outputDirectory = " + outputDirectory);
+
+ File f = new File(outputDirectory);
- File f = new File( outputDirectory );
-
- if ( !f.exists() )
- {
+ if (!f.exists()) {
f.mkdirs();
}
-
- File touch = new File( f, "touch.txt" );
-
- try
- {
+
+ File touch = new File(f, "touch.txt");
+
+ try {
touch.createNewFile();
+ } catch (IOException e) {
+ throw new MojoExecutionException("Error writing verification file.", e);
}
- catch ( IOException e )
- {
- throw new MojoExecutionException( "Error writing verification file.", e );
- }
}
-
}
diff --git a/maven-plugin-plugin/src/it/java-basic/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java b/maven-plugin-plugin/src/it/java-basic/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java
index 8772049a..6d468d4a 100644
--- a/maven-plugin-plugin/src/it/java-basic/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java
+++ b/maven-plugin-plugin/src/it/java-basic/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugin.coreit;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,9 @@ package org.apache.maven.plugin.coreit;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.plugin.coreit;
+
+import java.io.File;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.AbstractMojo;
@@ -27,12 +28,9 @@ import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.apache.maven.project.MavenProject;
import org.apache.maven.settings.Settings;
-import java.io.File;
-import java.io.IOException;
-
/**
* Touches a test file.
- *
+ *
* @goal first
* @requiresDependencyResolution test
* @phase integration-test
@@ -40,17 +38,15 @@ import java.io.IOException;
* @deprecated Don't use!
* @since 1.2
*/
-public class FirstMojo
- extends AbstractMojo
-{
-
+public class FirstMojo extends AbstractMojo {
+
/**
* Project directory.
* @parameter default-value="${basedir}"
* @readonly
*/
private File basedir;
-
+
/**
* @parameter expression="first.touchFile" default-value="${project.build.directory}/touch.txt"
* @required
@@ -94,9 +90,5 @@ public class FirstMojo
*/
private Settings settings;
- public void execute()
- throws MojoExecutionException
- {
- }
-
+ public void execute() throws MojoExecutionException {}
}
diff --git a/maven-plugin-plugin/src/it/java-basic/src/main/java/org/apache/maven/plugin/coreit/Maximal.java b/maven-plugin-plugin/src/it/java-basic/src/main/java/org/apache/maven/plugin/coreit/Maximal.java
index 1ff8f284..311754af 100644
--- a/maven-plugin-plugin/src/it/java-basic/src/main/java/org/apache/maven/plugin/coreit/Maximal.java
+++ b/maven-plugin-plugin/src/it/java-basic/src/main/java/org/apache/maven/plugin/coreit/Maximal.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugin.coreit;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,9 +16,9 @@ package org.apache.maven.plugin.coreit;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.plugin.coreit;
import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.project.MavenProjectHelper;
/**
* Checks maximum annotations with non-default values.
@@ -43,9 +41,7 @@ import org.apache.maven.project.MavenProjectHelper;
* @since since-text
* @deprecated deprecated-text
*/
-public class Maximal
- extends AbstractMojo
-{
+public class Maximal extends AbstractMojo {
/**
* Parameter description.
*
@@ -64,8 +60,5 @@ public class Maximal
*/
private Object projectHelper;
- public void execute()
- {
- }
-
+ public void execute() {}
}
diff --git a/maven-plugin-plugin/src/it/java-basic/src/main/java/org/apache/maven/plugin/coreit/Minimal.java b/maven-plugin-plugin/src/it/java-basic/src/main/java/org/apache/maven/plugin/coreit/Minimal.java
index 27b91d68..b4361eca 100644
--- a/maven-plugin-plugin/src/it/java-basic/src/main/java/org/apache/maven/plugin/coreit/Minimal.java
+++ b/maven-plugin-plugin/src/it/java-basic/src/main/java/org/apache/maven/plugin/coreit/Minimal.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugin.coreit;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.plugin.coreit;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.plugin.coreit;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.project.MavenProjectHelper;
@@ -26,9 +25,7 @@ import org.apache.maven.project.MavenProjectHelper;
/**
* @goal minimal
*/
-public class Minimal
- extends AbstractMojo
-{
+public class Minimal extends AbstractMojo {
/**
* @parameter
*/
@@ -39,8 +36,5 @@ public class Minimal
*/
private MavenProjectHelper projectHelper;
- public void execute()
- {
- }
-
+ public void execute() {}
}
diff --git a/maven-plugin-plugin/src/it/mplugin-223/src/main/java/org/apache/maven/plugins/plugin/it/MyMojo.java b/maven-plugin-plugin/src/it/mplugin-223/src/main/java/org/apache/maven/plugins/plugin/it/MyMojo.java
index 0f75f16a..d5b9e44a 100644
--- a/maven-plugin-plugin/src/it/mplugin-223/src/main/java/org/apache/maven/plugins/plugin/it/MyMojo.java
+++ b/maven-plugin-plugin/src/it/mplugin-223/src/main/java/org/apache/maven/plugins/plugin/it/MyMojo.java
@@ -1,21 +1,26 @@
-package org.apache.maven.plugins.plugin.it;
-
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
+package org.apache.maven.plugins.plugin.it;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
@@ -23,42 +28,30 @@ import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-
/**
* Goal which touches a timestamp file.
*/
@Mojo(name = "touch", defaultPhase = LifecyclePhase.PROCESS_RESOURCES)
-public class MyMojo
- extends AbstractMojo
-{
+public class MyMojo extends AbstractMojo {
/**
* Location of the file.
*/
@Parameter(defaultValue = "${project.build.directory}", required = true)
private File outputDirectory;
- public void execute()
- throws MojoExecutionException
- {
+ public void execute() throws MojoExecutionException {
File f = outputDirectory;
- if ( !f.exists() )
- {
+ if (!f.exists()) {
f.mkdirs();
}
- File touch = new File( f, "touch.txt" );
+ File touch = new File(f, "touch.txt");
- try ( FileWriter w = new FileWriter( touch ) )
- {
- w.write( "touch.txt" );
- }
- catch ( IOException e )
- {
- throw new MojoExecutionException( "Error creating file " + touch, e );
+ try (FileWriter w = new FileWriter(touch)) {
+ w.write("touch.txt");
+ } catch (IOException e) {
+ throw new MojoExecutionException("Error creating file " + touch, e);
}
}
}
diff --git a/maven-plugin-plugin/src/it/mplugin-272_java8/src/main/java/fr/ca/MyMojo.java b/maven-plugin-plugin/src/it/mplugin-272_java8/src/main/java/fr/ca/MyMojo.java
index 7ba20750..96879b97 100644
--- a/maven-plugin-plugin/src/it/mplugin-272_java8/src/main/java/fr/ca/MyMojo.java
+++ b/maven-plugin-plugin/src/it/mplugin-272_java8/src/main/java/fr/ca/MyMojo.java
@@ -1,5 +1,3 @@
-package fr.ca;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package fr.ca;
* specific language governing permissions and limitations
* under the License.
*/
+package fr.ca;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
@@ -27,10 +26,8 @@ import org.apache.maven.plugins.annotations.Mojo;
/**
* Created by clement.agarini on 04/08/14.
*/
-@Mojo(name="test-plugin",defaultPhase = LifecyclePhase.GENERATE_SOURCES)
+@Mojo(name = "test-plugin", defaultPhase = LifecyclePhase.GENERATE_SOURCES)
public class MyMojo extends AbstractMojo {
@Override
- public void execute() throws MojoExecutionException {
-
- }
+ public void execute() throws MojoExecutionException {}
}
diff --git a/maven-plugin-plugin/src/it/mplugin-272_java8/src/main/java/fr/ca/TestInterface.java b/maven-plugin-plugin/src/it/mplugin-272_java8/src/main/java/fr/ca/TestInterface.java
index 16ee6d52..1cca16bf 100644
--- a/maven-plugin-plugin/src/it/mplugin-272_java8/src/main/java/fr/ca/TestInterface.java
+++ b/maven-plugin-plugin/src/it/mplugin-272_java8/src/main/java/fr/ca/TestInterface.java
@@ -1,5 +1,3 @@
-package fr.ca;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,13 +16,12 @@ package fr.ca;
* specific language governing permissions and limitations
* under the License.
*/
+package fr.ca;
public interface TestInterface {
/**
* Java 8 required to support such default method implementation
*/
- public default void foo(){
-
- }
+ public default void foo() {}
}
diff --git a/maven-plugin-plugin/src/it/mplugin-299_no-configuration/src/main/java/test/MyMojo.java b/maven-plugin-plugin/src/it/mplugin-299_no-configuration/src/main/java/test/MyMojo.java
index 2a5e5183..f3dcc08a 100644
--- a/maven-plugin-plugin/src/it/mplugin-299_no-configuration/src/main/java/test/MyMojo.java
+++ b/maven-plugin-plugin/src/it/mplugin-299_no-configuration/src/main/java/test/MyMojo.java
@@ -1,37 +1,31 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugins.annotations.Mojo;
-import org.apache.maven.plugins.annotations.Parameter;
-
-@Mojo( name= "test" )
-public class MyMojo
- extends AbstractMojo
-{
- @Parameter
- private String empyAnnotatedParameter;
-
- public void execute()
- {
- }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package test;
+
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
+
+@Mojo(name = "test")
+public class MyMojo extends AbstractMojo {
+ @Parameter
+ private String empyAnnotatedParameter;
+
+ public void execute() {}
+}
diff --git a/maven-plugin-plugin/src/it/mplugin-305_defaultMojoDependencies/src/main/java/org/apache/maven/plugins/plugin/it/CustomSurefireMojo.java b/maven-plugin-plugin/src/it/mplugin-305_defaultMojoDependencies/src/main/java/org/apache/maven/plugins/plugin/it/CustomSurefireMojo.java
index 89a197b0..54765bcf 100644
--- a/maven-plugin-plugin/src/it/mplugin-305_defaultMojoDependencies/src/main/java/org/apache/maven/plugins/plugin/it/CustomSurefireMojo.java
+++ b/maven-plugin-plugin/src/it/mplugin-305_defaultMojoDependencies/src/main/java/org/apache/maven/plugins/plugin/it/CustomSurefireMojo.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugins.plugin.it;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.plugins.plugin.it;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.plugins.plugin.it;
import java.io.File;
import java.util.List;
@@ -26,264 +25,189 @@ import org.apache.maven.plugin.surefire.AbstractSurefireMojo;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.surefire.suite.RunResult;
-@Mojo(name="custom-surefire")
+@Mojo(name = "custom-surefire")
public class CustomSurefireMojo extends AbstractSurefireMojo {
- public File getBasedir()
- {
+ public File getBasedir() {
return null;
}
- public File getClassesDirectory()
- {
+ public File getClassesDirectory() {
return null;
}
- public String getDebugForkedProcess()
- {
+ public String getDebugForkedProcess() {
return null;
}
- public Boolean getFailIfNoSpecifiedTests()
- {
+ public Boolean getFailIfNoSpecifiedTests() {
return null;
}
- public int getForkedProcessTimeoutInSeconds()
- {
+ public int getForkedProcessTimeoutInSeconds() {
return 0;
}
- public double getParallelTestsTimeoutForcedInSeconds()
- {
+ public double getParallelTestsTimeoutForcedInSeconds() {
return 0;
}
- public double getParallelTestsTimeoutInSeconds()
- {
+ public double getParallelTestsTimeoutInSeconds() {
return 0;
}
- public String getReportFormat()
- {
+ public String getReportFormat() {
return null;
}
- public File getReportsDirectory()
- {
+ public File getReportsDirectory() {
return null;
}
- public String getShutdown()
- {
+ public String getShutdown() {
return null;
}
- public int getSkipAfterFailureCount()
- {
+ public int getSkipAfterFailureCount() {
return 0;
}
- public String getTest()
- {
+ public String getTest() {
return null;
}
- public File getTestClassesDirectory()
- {
+ public File getTestClassesDirectory() {
return null;
}
- public boolean isPrintSummary()
- {
+ public boolean isPrintSummary() {
return false;
}
- public boolean isSkip()
- {
+ public boolean isSkip() {
return false;
}
- public boolean isSkipExec()
- {
+ public boolean isSkipExec() {
return false;
}
- public boolean isSkipTests()
- {
+ public boolean isSkipTests() {
return false;
}
- public boolean isUseFile()
- {
+ public boolean isUseFile() {
return false;
}
- public boolean isUseManifestOnlyJar()
- {
+ public boolean isUseManifestOnlyJar() {
return false;
}
- public boolean isUseSystemClassLoader()
- {
+ public boolean isUseSystemClassLoader() {
return false;
}
- public void setBasedir( File arg0 )
- {
- }
+ public void setBasedir(File arg0) {}
- public void setClassesDirectory( File arg0 )
- {
- }
+ public void setClassesDirectory(File arg0) {}
- public void setDebugForkedProcess( String arg0 )
- {
- }
+ public void setDebugForkedProcess(String arg0) {}
- public void setFailIfNoSpecifiedTests( boolean arg0 )
- {
- }
+ public void setFailIfNoSpecifiedTests(boolean arg0) {}
- public void setForkedProcessTimeoutInSeconds( int arg0 )
- {
- }
+ public void setForkedProcessTimeoutInSeconds(int arg0) {}
- public void setParallelTestsTimeoutForcedInSeconds( double arg0 )
- {
- }
+ public void setParallelTestsTimeoutForcedInSeconds(double arg0) {}
- public void setParallelTestsTimeoutInSeconds( double arg0 )
- {
- }
+ public void setParallelTestsTimeoutInSeconds(double arg0) {}
- public void setPrintSummary( boolean arg0 )
- {
- }
+ public void setPrintSummary(boolean arg0) {}
- public void setReportFormat( String arg0 )
- {
- }
+ public void setReportFormat(String arg0) {}
- public void setReportsDirectory( File arg0 )
- {
- }
+ public void setReportsDirectory(File arg0) {}
- public void setSkip( boolean arg0 )
- {
- }
+ public void setSkip(boolean arg0) {}
- public void setSkipExec( boolean arg0 )
- {
- }
+ public void setSkipExec(boolean arg0) {}
- public void setSkipTests( boolean arg0 )
- {
- }
+ public void setSkipTests(boolean arg0) {}
- public void setTest( String arg0 )
- {
- }
+ public void setTest(String arg0) {}
- public void setTestClassesDirectory( File arg0 )
- {
- }
+ public void setTestClassesDirectory(File arg0) {}
- public void setUseFile( boolean arg0 )
- {
- }
+ public void setUseFile(boolean arg0) {}
- public void setUseManifestOnlyJar( boolean arg0 )
- {
- }
+ public void setUseManifestOnlyJar(boolean arg0) {}
- public void setUseSystemClassLoader( boolean arg0 )
- {
- }
+ public void setUseSystemClassLoader(boolean arg0) {}
@Override
- protected String[] getDefaultIncludes()
- {
+ protected String[] getDefaultIncludes() {
return null;
}
@Override
- public File getExcludesFile()
- {
+ public File getExcludesFile() {
return null;
}
@Override
- public List<String> getIncludes()
- {
+ public List<String> getIncludes() {
return null;
}
@Override
- public File getIncludesFile()
- {
+ public File getIncludesFile() {
return null;
}
@Override
- protected String getPluginName()
- {
+ protected String getPluginName() {
return null;
}
@Override
- protected int getRerunFailingTestsCount()
- {
+ protected int getRerunFailingTestsCount() {
return 0;
}
@Override
- public String getRunOrder()
- {
+ public String getRunOrder() {
return null;
}
@Override
- public File[] getSuiteXmlFiles()
- {
+ public File[] getSuiteXmlFiles() {
return null;
}
@Override
- protected void handleSummary( RunResult arg0, Exception arg1 )
- {
- }
+ protected void handleSummary(RunResult arg0, Exception arg1) {}
@Override
- protected boolean hasSuiteXmlFiles()
- {
+ protected boolean hasSuiteXmlFiles() {
return false;
}
@Override
- protected boolean isSkipExecution()
- {
+ protected boolean isSkipExecution() {
return false;
}
@Override
- public void setIncludes( List<String> arg0 )
- {
- }
+ public void setIncludes(List<String> arg0) {}
@Override
- public void setRunOrder( String arg0 )
- {
- }
+ public void setRunOrder(String arg0) {}
@Override
- public void setSuiteXmlFiles( File[] arg0 )
- {
- }
+ public void setSuiteXmlFiles(File[] arg0) {}
@Override
- protected List<File> suiteXmlFiles()
- {
+ protected List<File> suiteXmlFiles() {
return null;
}
-}
\ No newline at end of file
+}
diff --git a/maven-plugin-plugin/src/it/mplugin-305_emptyMojoDependencies/src/main/java/org/apache/maven/plugins/plugin/it/CustomSurefireMojo.java b/maven-plugin-plugin/src/it/mplugin-305_emptyMojoDependencies/src/main/java/org/apache/maven/plugins/plugin/it/CustomSurefireMojo.java
index 89a197b0..54765bcf 100644
--- a/maven-plugin-plugin/src/it/mplugin-305_emptyMojoDependencies/src/main/java/org/apache/maven/plugins/plugin/it/CustomSurefireMojo.java
+++ b/maven-plugin-plugin/src/it/mplugin-305_emptyMojoDependencies/src/main/java/org/apache/maven/plugins/plugin/it/CustomSurefireMojo.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugins.plugin.it;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.plugins.plugin.it;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.plugins.plugin.it;
import java.io.File;
import java.util.List;
@@ -26,264 +25,189 @@ import org.apache.maven.plugin.surefire.AbstractSurefireMojo;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.surefire.suite.RunResult;
-@Mojo(name="custom-surefire")
+@Mojo(name = "custom-surefire")
public class CustomSurefireMojo extends AbstractSurefireMojo {
- public File getBasedir()
- {
+ public File getBasedir() {
return null;
}
- public File getClassesDirectory()
- {
+ public File getClassesDirectory() {
return null;
}
- public String getDebugForkedProcess()
- {
+ public String getDebugForkedProcess() {
return null;
}
- public Boolean getFailIfNoSpecifiedTests()
- {
+ public Boolean getFailIfNoSpecifiedTests() {
return null;
}
- public int getForkedProcessTimeoutInSeconds()
- {
+ public int getForkedProcessTimeoutInSeconds() {
return 0;
}
- public double getParallelTestsTimeoutForcedInSeconds()
- {
+ public double getParallelTestsTimeoutForcedInSeconds() {
return 0;
}
- public double getParallelTestsTimeoutInSeconds()
- {
+ public double getParallelTestsTimeoutInSeconds() {
return 0;
}
- public String getReportFormat()
- {
+ public String getReportFormat() {
return null;
}
- public File getReportsDirectory()
- {
+ public File getReportsDirectory() {
return null;
}
- public String getShutdown()
- {
+ public String getShutdown() {
return null;
}
- public int getSkipAfterFailureCount()
- {
+ public int getSkipAfterFailureCount() {
return 0;
}
- public String getTest()
- {
+ public String getTest() {
return null;
}
- public File getTestClassesDirectory()
- {
+ public File getTestClassesDirectory() {
return null;
}
- public boolean isPrintSummary()
- {
+ public boolean isPrintSummary() {
return false;
}
- public boolean isSkip()
- {
+ public boolean isSkip() {
return false;
}
- public boolean isSkipExec()
- {
+ public boolean isSkipExec() {
return false;
}
- public boolean isSkipTests()
- {
+ public boolean isSkipTests() {
return false;
}
- public boolean isUseFile()
- {
+ public boolean isUseFile() {
return false;
}
- public boolean isUseManifestOnlyJar()
- {
+ public boolean isUseManifestOnlyJar() {
return false;
}
- public boolean isUseSystemClassLoader()
- {
+ public boolean isUseSystemClassLoader() {
return false;
}
- public void setBasedir( File arg0 )
- {
- }
+ public void setBasedir(File arg0) {}
- public void setClassesDirectory( File arg0 )
- {
- }
+ public void setClassesDirectory(File arg0) {}
- public void setDebugForkedProcess( String arg0 )
- {
- }
+ public void setDebugForkedProcess(String arg0) {}
- public void setFailIfNoSpecifiedTests( boolean arg0 )
- {
- }
+ public void setFailIfNoSpecifiedTests(boolean arg0) {}
- public void setForkedProcessTimeoutInSeconds( int arg0 )
- {
- }
+ public void setForkedProcessTimeoutInSeconds(int arg0) {}
- public void setParallelTestsTimeoutForcedInSeconds( double arg0 )
- {
- }
+ public void setParallelTestsTimeoutForcedInSeconds(double arg0) {}
- public void setParallelTestsTimeoutInSeconds( double arg0 )
- {
- }
+ public void setParallelTestsTimeoutInSeconds(double arg0) {}
- public void setPrintSummary( boolean arg0 )
- {
- }
+ public void setPrintSummary(boolean arg0) {}
- public void setReportFormat( String arg0 )
- {
- }
+ public void setReportFormat(String arg0) {}
- public void setReportsDirectory( File arg0 )
- {
- }
+ public void setReportsDirectory(File arg0) {}
- public void setSkip( boolean arg0 )
- {
- }
+ public void setSkip(boolean arg0) {}
- public void setSkipExec( boolean arg0 )
- {
- }
+ public void setSkipExec(boolean arg0) {}
- public void setSkipTests( boolean arg0 )
- {
- }
+ public void setSkipTests(boolean arg0) {}
- public void setTest( String arg0 )
- {
- }
+ public void setTest(String arg0) {}
- public void setTestClassesDirectory( File arg0 )
- {
- }
+ public void setTestClassesDirectory(File arg0) {}
- public void setUseFile( boolean arg0 )
- {
- }
+ public void setUseFile(boolean arg0) {}
- public void setUseManifestOnlyJar( boolean arg0 )
- {
- }
+ public void setUseManifestOnlyJar(boolean arg0) {}
- public void setUseSystemClassLoader( boolean arg0 )
- {
- }
+ public void setUseSystemClassLoader(boolean arg0) {}
@Override
- protected String[] getDefaultIncludes()
- {
+ protected String[] getDefaultIncludes() {
return null;
}
@Override
- public File getExcludesFile()
- {
+ public File getExcludesFile() {
return null;
}
@Override
- public List<String> getIncludes()
- {
+ public List<String> getIncludes() {
return null;
}
@Override
- public File getIncludesFile()
- {
+ public File getIncludesFile() {
return null;
}
@Override
- protected String getPluginName()
- {
+ protected String getPluginName() {
return null;
}
@Override
- protected int getRerunFailingTestsCount()
- {
+ protected int getRerunFailingTestsCount() {
return 0;
}
@Override
- public String getRunOrder()
- {
+ public String getRunOrder() {
return null;
}
@Override
- public File[] getSuiteXmlFiles()
- {
+ public File[] getSuiteXmlFiles() {
return null;
}
@Override
- protected void handleSummary( RunResult arg0, Exception arg1 )
- {
- }
+ protected void handleSummary(RunResult arg0, Exception arg1) {}
@Override
- protected boolean hasSuiteXmlFiles()
- {
+ protected boolean hasSuiteXmlFiles() {
return false;
}
@Override
- protected boolean isSkipExecution()
- {
+ protected boolean isSkipExecution() {
return false;
}
@Override
- public void setIncludes( List<String> arg0 )
- {
- }
+ public void setIncludes(List<String> arg0) {}
@Override
- public void setRunOrder( String arg0 )
- {
- }
+ public void setRunOrder(String arg0) {}
@Override
- public void setSuiteXmlFiles( File[] arg0 )
- {
- }
+ public void setSuiteXmlFiles(File[] arg0) {}
@Override
- protected List<File> suiteXmlFiles()
- {
+ protected List<File> suiteXmlFiles() {
return null;
}
-}
\ No newline at end of file
+}
diff --git a/maven-plugin-plugin/src/it/mplugin-305_singleMojoDependencies/src/main/java/org/apache/maven/plugins/plugin/it/CustomSurefireMojo.java b/maven-plugin-plugin/src/it/mplugin-305_singleMojoDependencies/src/main/java/org/apache/maven/plugins/plugin/it/CustomSurefireMojo.java
index 89a197b0..54765bcf 100644
--- a/maven-plugin-plugin/src/it/mplugin-305_singleMojoDependencies/src/main/java/org/apache/maven/plugins/plugin/it/CustomSurefireMojo.java
+++ b/maven-plugin-plugin/src/it/mplugin-305_singleMojoDependencies/src/main/java/org/apache/maven/plugins/plugin/it/CustomSurefireMojo.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugins.plugin.it;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.plugins.plugin.it;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.plugins.plugin.it;
import java.io.File;
import java.util.List;
@@ -26,264 +25,189 @@ import org.apache.maven.plugin.surefire.AbstractSurefireMojo;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.surefire.suite.RunResult;
-@Mojo(name="custom-surefire")
+@Mojo(name = "custom-surefire")
public class CustomSurefireMojo extends AbstractSurefireMojo {
- public File getBasedir()
- {
+ public File getBasedir() {
return null;
}
- public File getClassesDirectory()
- {
+ public File getClassesDirectory() {
return null;
}
- public String getDebugForkedProcess()
- {
+ public String getDebugForkedProcess() {
return null;
}
- public Boolean getFailIfNoSpecifiedTests()
- {
+ public Boolean getFailIfNoSpecifiedTests() {
return null;
}
- public int getForkedProcessTimeoutInSeconds()
- {
+ public int getForkedProcessTimeoutInSeconds() {
return 0;
}
- public double getParallelTestsTimeoutForcedInSeconds()
- {
+ public double getParallelTestsTimeoutForcedInSeconds() {
return 0;
}
- public double getParallelTestsTimeoutInSeconds()
- {
+ public double getParallelTestsTimeoutInSeconds() {
return 0;
}
- public String getReportFormat()
- {
+ public String getReportFormat() {
return null;
}
- public File getReportsDirectory()
- {
+ public File getReportsDirectory() {
return null;
}
- public String getShutdown()
- {
+ public String getShutdown() {
return null;
}
- public int getSkipAfterFailureCount()
- {
+ public int getSkipAfterFailureCount() {
return 0;
}
- public String getTest()
- {
+ public String getTest() {
return null;
}
- public File getTestClassesDirectory()
- {
+ public File getTestClassesDirectory() {
return null;
}
- public boolean isPrintSummary()
- {
+ public boolean isPrintSummary() {
return false;
}
- public boolean isSkip()
- {
+ public boolean isSkip() {
return false;
}
- public boolean isSkipExec()
- {
+ public boolean isSkipExec() {
return false;
}
- public boolean isSkipTests()
- {
+ public boolean isSkipTests() {
return false;
}
- public boolean isUseFile()
- {
+ public boolean isUseFile() {
return false;
}
- public boolean isUseManifestOnlyJar()
- {
+ public boolean isUseManifestOnlyJar() {
return false;
}
- public boolean isUseSystemClassLoader()
- {
+ public boolean isUseSystemClassLoader() {
return false;
}
- public void setBasedir( File arg0 )
- {
- }
+ public void setBasedir(File arg0) {}
- public void setClassesDirectory( File arg0 )
- {
- }
+ public void setClassesDirectory(File arg0) {}
- public void setDebugForkedProcess( String arg0 )
- {
- }
+ public void setDebugForkedProcess(String arg0) {}
- public void setFailIfNoSpecifiedTests( boolean arg0 )
- {
- }
+ public void setFailIfNoSpecifiedTests(boolean arg0) {}
- public void setForkedProcessTimeoutInSeconds( int arg0 )
- {
- }
+ public void setForkedProcessTimeoutInSeconds(int arg0) {}
- public void setParallelTestsTimeoutForcedInSeconds( double arg0 )
- {
- }
+ public void setParallelTestsTimeoutForcedInSeconds(double arg0) {}
- public void setParallelTestsTimeoutInSeconds( double arg0 )
- {
- }
+ public void setParallelTestsTimeoutInSeconds(double arg0) {}
- public void setPrintSummary( boolean arg0 )
- {
- }
+ public void setPrintSummary(boolean arg0) {}
- public void setReportFormat( String arg0 )
- {
- }
+ public void setReportFormat(String arg0) {}
- public void setReportsDirectory( File arg0 )
- {
- }
+ public void setReportsDirectory(File arg0) {}
- public void setSkip( boolean arg0 )
- {
- }
+ public void setSkip(boolean arg0) {}
- public void setSkipExec( boolean arg0 )
- {
- }
+ public void setSkipExec(boolean arg0) {}
- public void setSkipTests( boolean arg0 )
- {
- }
+ public void setSkipTests(boolean arg0) {}
- public void setTest( String arg0 )
- {
- }
+ public void setTest(String arg0) {}
- public void setTestClassesDirectory( File arg0 )
- {
- }
+ public void setTestClassesDirectory(File arg0) {}
- public void setUseFile( boolean arg0 )
- {
- }
+ public void setUseFile(boolean arg0) {}
- public void setUseManifestOnlyJar( boolean arg0 )
- {
- }
+ public void setUseManifestOnlyJar(boolean arg0) {}
- public void setUseSystemClassLoader( boolean arg0 )
- {
- }
+ public void setUseSystemClassLoader(boolean arg0) {}
@Override
- protected String[] getDefaultIncludes()
- {
+ protected String[] getDefaultIncludes() {
return null;
}
@Override
- public File getExcludesFile()
- {
+ public File getExcludesFile() {
return null;
}
@Override
- public List<String> getIncludes()
- {
+ public List<String> getIncludes() {
return null;
}
@Override
- public File getIncludesFile()
- {
+ public File getIncludesFile() {
return null;
}
@Override
- protected String getPluginName()
- {
+ protected String getPluginName() {
return null;
}
@Override
- protected int getRerunFailingTestsCount()
- {
+ protected int getRerunFailingTestsCount() {
return 0;
}
@Override
- public String getRunOrder()
- {
+ public String getRunOrder() {
return null;
}
@Override
- public File[] getSuiteXmlFiles()
- {
+ public File[] getSuiteXmlFiles() {
return null;
}
@Override
- protected void handleSummary( RunResult arg0, Exception arg1 )
- {
- }
+ protected void handleSummary(RunResult arg0, Exception arg1) {}
@Override
- protected boolean hasSuiteXmlFiles()
- {
+ protected boolean hasSuiteXmlFiles() {
return false;
}
@Override
- protected boolean isSkipExecution()
- {
+ protected boolean isSkipExecution() {
return false;
}
@Override
- public void setIncludes( List<String> arg0 )
- {
- }
+ public void setIncludes(List<String> arg0) {}
@Override
- public void setRunOrder( String arg0 )
- {
- }
+ public void setRunOrder(String arg0) {}
@Override
- public void setSuiteXmlFiles( File[] arg0 )
- {
- }
+ public void setSuiteXmlFiles(File[] arg0) {}
@Override
- protected List<File> suiteXmlFiles()
- {
+ protected List<File> suiteXmlFiles() {
return null;
}
-}
\ No newline at end of file
+}
diff --git a/maven-plugin-plugin/src/it/mplugin-324_javadoc/src/main/java/test/MyMojo.java b/maven-plugin-plugin/src/it/mplugin-324_javadoc/src/main/java/test/MyMojo.java
index 8e7dec5d..85c19ed6 100644
--- a/maven-plugin-plugin/src/it/mplugin-324_javadoc/src/main/java/test/MyMojo.java
+++ b/maven-plugin-plugin/src/it/mplugin-324_javadoc/src/main/java/test/MyMojo.java
@@ -1,68 +1,62 @@
-package test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugins.annotations.Mojo;
-import org.apache.maven.plugins.annotations.Parameter;
-
-/**
- * MOJO-DESCRIPTION. Some "quotation" marks and backslashes '\\', some <strong>important</strong> javadoc<br> and an
- * inline link to {@link org.apache.maven.plugin.AbstractMojo}.
- *
- * @deprecated As of 1.0, use the "quoted" goal instead.
- * @since 2.1
- */
-@Mojo( name= "test" )
-public class MyMojo
- extends AbstractMojo
-{
-
- /**
- * This parameter uses "quotation" marks and backslashes '\\' in its description. Those characters <em>must</em> be
- * escaped in Java string literals.
- *
- * @since 2.0
- */
- @Parameter( defaultValue = "escape\\backslash" )
- private String defaultParam;
-
- /**
- * This parameter is deprecated.
- *
- * @deprecated As of version 1.0, use the {@link #defaultParam} instead.
- */
- @Parameter
- private String deprecatedParam;
-
- @Parameter( property = "test.undocumented", required = true )
- private String undocumentedParam;
-
- /**
- * Readonly parameter: should not be proposed for configuration.
- */
- @Parameter( defaultValue = "not for configuration", readonly = true )
- private String readonly;
-
- public void execute()
- {
- }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package test;
+
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
+
+/**
+ * MOJO-DESCRIPTION. Some "quotation" marks and backslashes '\\', some <strong>important</strong> javadoc<br> and an
+ * inline link to {@link org.apache.maven.plugin.AbstractMojo}.
+ *
+ * @deprecated As of 1.0, use the "quoted" goal instead.
+ * @since 2.1
+ */
+@Mojo(name = "test")
+public class MyMojo extends AbstractMojo {
+
+ /**
+ * This parameter uses "quotation" marks and backslashes '\\' in its description. Those characters <em>must</em> be
+ * escaped in Java string literals.
+ *
+ * @since 2.0
+ */
+ @Parameter(defaultValue = "escape\\backslash")
+ private String defaultParam;
+
+ /**
+ * This parameter is deprecated.
+ *
+ * @deprecated As of version 1.0, use the {@link #defaultParam} instead.
+ */
+ @Parameter
+ private String deprecatedParam;
+
+ @Parameter(property = "test.undocumented", required = true)
+ private String undocumentedParam;
+
+ /**
+ * Readonly parameter: should not be proposed for configuration.
+ */
+ @Parameter(defaultValue = "not for configuration", readonly = true)
+ private String readonly;
+
+ public void execute() {}
+}
diff --git a/maven-plugin-plugin/src/it/mplugin-363_help-reproducible/src/main/java/test/MyMojo.java b/maven-plugin-plugin/src/it/mplugin-363_help-reproducible/src/main/java/test/MyMojo.java
index 0be9fd35..480fdbc7 100644
--- a/maven-plugin-plugin/src/it/mplugin-363_help-reproducible/src/main/java/test/MyMojo.java
+++ b/maven-plugin-plugin/src/it/mplugin-363_help-reproducible/src/main/java/test/MyMojo.java
@@ -1,5 +1,3 @@
-package test;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -8,9 +6,9 @@ package test;
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,6 +16,7 @@ package test;
* specific language governing permissions and limitations
* under the License.
*/
+package test;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugins.annotations.Mojo;
@@ -26,43 +25,38 @@ import org.apache.maven.plugins.annotations.Parameter;
/**
* MOJO-DESCRIPTION. Some "quotation" marks and backslashes '\\', some <strong>important</strong> javadoc<br> and an
* inline link to {@link test.AnotherMojo}.
- *
+ *
* @deprecated As of 1.0, use the "quoted" goal instead.
* @since 2.1
*/
-@Mojo( name= "test" )
-public class MyMojo
- extends AbstractMojo
-{
+@Mojo(name = "test")
+public class MyMojo extends AbstractMojo {
/**
* This parameter uses "quotation" marks and backslashes '\\' in its description. Those characters <em>must</em> be
* escaped in Java string literals.
- *
+ *
* @since 2.0
*/
- @Parameter( defaultValue = "escape\\backslash" )
+ @Parameter(defaultValue = "escape\\backslash")
private String defaultParam;
/**
* This parameter is deprecated.
- *
+ *
* @deprecated As of version 1.0, use the {@link #defaultParam} instead.
*/
@Parameter
private String deprecatedParam;
- @Parameter( property = "test.undocumented", required = true )
+ @Parameter(property = "test.undocumented", required = true)
private String undocumentedParam;
/**
* Readonly parameter: should not be proposed for configuration.
*/
- @Parameter( defaultValue = "not for configuration", readonly = true )
+ @Parameter(defaultValue = "not for configuration", readonly = true)
private String readonly;
- public void execute()
- {
- }
-
+ public void execute() {}
}
diff --git a/maven-plugin-plugin/src/it/mplugin-370-maven-deps-scope-bad/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java b/maven-plugin-plugin/src/it/mplugin-370-maven-deps-scope-bad/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java
index b8f7f62c..2968e8af 100644
--- a/maven-plugin-plugin/src/it/mplugin-370-maven-deps-scope-bad/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java
+++ b/maven-plugin-plugin/src/it/mplugin-370-maven-deps-scope-bad/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugin.coreit;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,36 +16,34 @@ package org.apache.maven.plugin.coreit;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.plugin.coreit;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugins.annotations.Component;
-import org.apache.maven.plugins.annotations.ResolutionScope;
-import org.apache.maven.plugins.annotations.Execute;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.plugins.annotations.ResolutionScope;
/**
* Touches a test file.
*
* @since 1.2
*/
-@Mojo( name = "first", requiresDependencyResolution = ResolutionScope.TEST, defaultPhase = LifecyclePhase.INTEGRATION_TEST )
-public class FirstMojo
- extends AbstractMojo
-{
+@Mojo(
+ name = "first",
+ requiresDependencyResolution = ResolutionScope.TEST,
+ defaultPhase = LifecyclePhase.INTEGRATION_TEST)
+public class FirstMojo extends AbstractMojo {
/**
* @since 0.1
* @deprecated As of 0.2
*/
- @Parameter( alias = "alias" )
+ @Parameter(alias = "alias")
private String aliasedParam;
- public void execute()
- throws MojoExecutionException
- {
+ public void execute() throws MojoExecutionException {
// nothing
}
}
diff --git a/maven-plugin-plugin/src/it/mplugin-370-maven-deps-scope-good/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java b/maven-plugin-plugin/src/it/mplugin-370-maven-deps-scope-good/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java
index b8f7f62c..2968e8af 100644
--- a/maven-plugin-plugin/src/it/mplugin-370-maven-deps-scope-good/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java
+++ b/maven-plugin-plugin/src/it/mplugin-370-maven-deps-scope-good/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugin.coreit;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,36 +16,34 @@ package org.apache.maven.plugin.coreit;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.plugin.coreit;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugins.annotations.Component;
-import org.apache.maven.plugins.annotations.ResolutionScope;
-import org.apache.maven.plugins.annotations.Execute;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.plugins.annotations.ResolutionScope;
/**
* Touches a test file.
*
* @since 1.2
*/
-@Mojo( name = "first", requiresDependencyResolution = ResolutionScope.TEST, defaultPhase = LifecyclePhase.INTEGRATION_TEST )
-public class FirstMojo
- extends AbstractMojo
-{
+@Mojo(
+ name = "first",
+ requiresDependencyResolution = ResolutionScope.TEST,
+ defaultPhase = LifecyclePhase.INTEGRATION_TEST)
+public class FirstMojo extends AbstractMojo {
/**
* @since 0.1
* @deprecated As of 0.2
*/
- @Parameter( alias = "alias" )
+ @Parameter(alias = "alias")
private String aliasedParam;
- public void execute()
- throws MojoExecutionException
- {
+ public void execute() throws MojoExecutionException {
// nothing
}
}
diff --git a/maven-plugin-plugin/src/it/mplugin-372-annotation-with-inheritance-from-provided-deps/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java b/maven-plugin-plugin/src/it/mplugin-372-annotation-with-inheritance-from-provided-deps/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java
index 6615b6a6..f5ef74da 100644
--- a/maven-plugin-plugin/src/it/mplugin-372-annotation-with-inheritance-from-provided-deps/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java
+++ b/maven-plugin-plugin/src/it/mplugin-372-annotation-with-inheritance-from-provided-deps/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugin.coreit;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,52 +16,47 @@ package org.apache.maven.plugin.coreit;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.plugin.coreit;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.annotations.Component;
-import org.apache.maven.plugins.annotations.ResolutionScope;
-import org.apache.maven.plugins.annotations.Execute;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
-import org.apache.maven.tools.plugin.extractor.annotations.FooMojo;
+import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.project.MavenProjectHelper;
+import org.apache.maven.tools.plugin.extractor.annotations.FooMojo;
/**
* Touches a test file.
*
* @since 1.2
*/
-@Mojo( name = "first", requiresDependencyResolution = ResolutionScope.TEST, defaultPhase = LifecyclePhase.INTEGRATION_TEST )
-public class FirstMojo
- extends FooMojo
-{
+@Mojo(
+ name = "first",
+ requiresDependencyResolution = ResolutionScope.TEST,
+ defaultPhase = LifecyclePhase.INTEGRATION_TEST)
+public class FirstMojo extends FooMojo {
/**
* @since 0.1
* @deprecated As of 0.2
*/
- @Parameter( alias = "alias" )
+ @Parameter(alias = "alias")
private String aliasedParam;
- @Component( role = MavenProjectHelper.class )// , roleHint = "default"
+ @Component(role = MavenProjectHelper.class) // , roleHint = "default"
private Object projectHelper;
- public void execute()
- throws MojoExecutionException
- {
- if ( bar == null )
- {
- throw new MojoExecutionException( "bar == null" );
+ public void execute() throws MojoExecutionException {
+ if (bar == null) {
+ throw new MojoExecutionException("bar == null");
}
- if ( beer == null )
- {
- throw new MojoExecutionException( "beer == null" );
+ if (beer == null) {
+ throw new MojoExecutionException("beer == null");
}
- if ( projectHelper == null )
- {
- throw new MojoExecutionException( "projectHelper == null" );
+ if (projectHelper == null) {
+ throw new MojoExecutionException("projectHelper == null");
}
}
-
}
diff --git a/maven-plugin-plugin/src/it/mplugin-382-exclude-provided-dependency/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java b/maven-plugin-plugin/src/it/mplugin-382-exclude-provided-dependency/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java
index b8f7f62c..2968e8af 100644
--- a/maven-plugin-plugin/src/it/mplugin-382-exclude-provided-dependency/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java
+++ b/maven-plugin-plugin/src/it/mplugin-382-exclude-provided-dependency/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugin.coreit;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,36 +16,34 @@ package org.apache.maven.plugin.coreit;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.plugin.coreit;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugins.annotations.Component;
-import org.apache.maven.plugins.annotations.ResolutionScope;
-import org.apache.maven.plugins.annotations.Execute;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.plugins.annotations.ResolutionScope;
/**
* Touches a test file.
*
* @since 1.2
*/
-@Mojo( name = "first", requiresDependencyResolution = ResolutionScope.TEST, defaultPhase = LifecyclePhase.INTEGRATION_TEST )
-public class FirstMojo
- extends AbstractMojo
-{
+@Mojo(
+ name = "first",
+ requiresDependencyResolution = ResolutionScope.TEST,
+ defaultPhase = LifecyclePhase.INTEGRATION_TEST)
+public class FirstMojo extends AbstractMojo {
/**
* @since 0.1
* @deprecated As of 0.2
*/
- @Parameter( alias = "alias" )
+ @Parameter(alias = "alias")
private String aliasedParam;
- public void execute()
- throws MojoExecutionException
- {
+ public void execute() throws MojoExecutionException {
// nothing
}
}
diff --git a/maven-plugin-plugin/src/it/mplugin-390/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java b/maven-plugin-plugin/src/it/mplugin-390/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java
index b8f7f62c..2968e8af 100644
--- a/maven-plugin-plugin/src/it/mplugin-390/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java
+++ b/maven-plugin-plugin/src/it/mplugin-390/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugin.coreit;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,36 +16,34 @@ package org.apache.maven.plugin.coreit;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.plugin.coreit;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugins.annotations.Component;
-import org.apache.maven.plugins.annotations.ResolutionScope;
-import org.apache.maven.plugins.annotations.Execute;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.plugins.annotations.ResolutionScope;
/**
* Touches a test file.
*
* @since 1.2
*/
-@Mojo( name = "first", requiresDependencyResolution = ResolutionScope.TEST, defaultPhase = LifecyclePhase.INTEGRATION_TEST )
-public class FirstMojo
- extends AbstractMojo
-{
+@Mojo(
+ name = "first",
+ requiresDependencyResolution = ResolutionScope.TEST,
+ defaultPhase = LifecyclePhase.INTEGRATION_TEST)
+public class FirstMojo extends AbstractMojo {
/**
* @since 0.1
* @deprecated As of 0.2
*/
- @Parameter( alias = "alias" )
+ @Parameter(alias = "alias")
private String aliasedParam;
- public void execute()
- throws MojoExecutionException
- {
+ public void execute() throws MojoExecutionException {
// nothing
}
}
diff --git a/maven-plugin-plugin/src/it/packaging-jar/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java b/maven-plugin-plugin/src/it/packaging-jar/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java
index bb31a860..a9a098ef 100644
--- a/maven-plugin-plugin/src/it/packaging-jar/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java
+++ b/maven-plugin-plugin/src/it/packaging-jar/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java
@@ -1,19 +1,22 @@
-package org.apache.maven.plugin.coreit;
-
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
- * agreements. See the NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License. You may obtain a
- * copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
+package org.apache.maven.plugin.coreit;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
@@ -22,14 +25,8 @@ import org.apache.maven.plugins.annotations.Mojo;
/**
* @deprecated Don't use!
*/
-@Mojo( name = "first" )
-public class FirstMojo
- extends AbstractMojo
-{
-
- public void execute()
- throws MojoExecutionException
- {
- }
+@Mojo(name = "first")
+public class FirstMojo extends AbstractMojo {
+ public void execute() throws MojoExecutionException {}
}
diff --git a/maven-plugin-plugin/src/it/skip/src/main/java/org/apache/maven/plugin/coreit/CoreIt0013Mojo.java b/maven-plugin-plugin/src/it/skip/src/main/java/org/apache/maven/plugin/coreit/CoreIt0013Mojo.java
index 69354f68..45320b84 100644
--- a/maven-plugin-plugin/src/it/skip/src/main/java/org/apache/maven/plugin/coreit/CoreIt0013Mojo.java
+++ b/maven-plugin-plugin/src/it/skip/src/main/java/org/apache/maven/plugin/coreit/CoreIt0013Mojo.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugin.coreit;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,50 +16,42 @@ package org.apache.maven.plugin.coreit;
* specific language governing permissions and limitations
* under the License.
*/
-
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugin.MojoExecutionException;
+package org.apache.maven.plugin.coreit;
import java.io.File;
import java.io.IOException;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+
/**
* Touches a test file.
- *
+ *
* @goal it0013
*/
-public class CoreIt0013Mojo
- extends AbstractMojo
-{
-
+public class CoreIt0013Mojo extends AbstractMojo {
+
/**
* @parameter expression="${project.build.directory}"
* @required
*/
private String outputDirectory;
- public void execute()
- throws MojoExecutionException
- {
- getLog().info( "outputDirectory = " + outputDirectory );
+ public void execute() throws MojoExecutionException {
+ getLog().info("outputDirectory = " + outputDirectory);
+
+ File f = new File(outputDirectory);
- File f = new File( outputDirectory );
-
- if ( !f.exists() )
- {
+ if (!f.exists()) {
f.mkdirs();
}
-
- File touch = new File( f, "touch.txt" );
-
- try
- {
+
+ File touch = new File(f, "touch.txt");
+
+ try {
touch.createNewFile();
+ } catch (IOException e) {
+ throw new MojoExecutionException("Error writing verification file.", e);
}
- catch ( IOException e )
- {
- throw new MojoExecutionException( "Error writing verification file.", e );
- }
}
-
}
diff --git a/maven-plugin-plugin/src/it/skip/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java b/maven-plugin-plugin/src/it/skip/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java
index 18ce947e..9768fd76 100644
--- a/maven-plugin-plugin/src/it/skip/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java
+++ b/maven-plugin-plugin/src/it/skip/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugin.coreit;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,16 +16,16 @@ package org.apache.maven.plugin.coreit;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.plugin.coreit;
+
+import java.io.File;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
-import java.io.File;
-import java.io.IOException;
-
/**
* Touches a test file.
- *
+ *
* @goal first
* @requiresDependencyResolution test
* @phase integration-test
@@ -35,17 +33,15 @@ import java.io.IOException;
* @deprecated Don't use!
* @since 1.2
*/
-public class FirstMojo
- extends AbstractMojo
-{
-
+public class FirstMojo extends AbstractMojo {
+
/**
* Project directory.
* @parameter default-value="${basedir}"
* @readonly
*/
private File basedir;
-
+
/**
* @parameter expression="${first.touchFile}" default-value="${project.build.directory}/touch.txt"
* @required
@@ -64,9 +60,5 @@ public class FirstMojo
*/
private Object projectHelper;
- public void execute()
- throws MojoExecutionException
- {
- }
-
+ public void execute() throws MojoExecutionException {}
}
diff --git a/maven-plugin-plugin/src/it/skip/src/main/java/org/apache/maven/plugin/coreit/SecondMojo.java b/maven-plugin-plugin/src/it/skip/src/main/java/org/apache/maven/plugin/coreit/SecondMojo.java
index ef12e162..8365fc15 100644
--- a/maven-plugin-plugin/src/it/skip/src/main/java/org/apache/maven/plugin/coreit/SecondMojo.java
+++ b/maven-plugin-plugin/src/it/skip/src/main/java/org/apache/maven/plugin/coreit/SecondMojo.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugin.coreit;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,22 +16,18 @@ package org.apache.maven.plugin.coreit;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.plugin.coreit;
import org.apache.maven.plugin.AbstractMojo;
/**
* Does nothing special.
- *
+ *
* @goal second
* @requiresDependencyCollection compile
* @threadSafe
*/
-public class SecondMojo
- extends AbstractMojo
-{
-
- public void execute()
- {
- }
+public class SecondMojo extends AbstractMojo {
+ public void execute() {}
}
diff --git a/maven-plugin-plugin/src/it/source-encoding/latin-1/src/main/java/test/MyMojo.java b/maven-plugin-plugin/src/it/source-encoding/latin-1/src/main/java/test/MyMojo.java
index 97d8ef85..d9c1c732 100644
--- a/maven-plugin-plugin/src/it/source-encoding/latin-1/src/main/java/test/MyMojo.java
+++ b/maven-plugin-plugin/src/it/source-encoding/latin-1/src/main/java/test/MyMojo.java
@@ -1,5 +1,3 @@
-package test;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package test;
* specific language governing permissions and limitations
* under the License.
*/
+package test;
// NOTE: This source file is by design encoded using ISO-8859-1!
@@ -25,15 +24,10 @@ import org.apache.maven.plugin.AbstractMojo;
/**
* TEST-CHARS: �������
- *
+ *
* @goal test
*/
-public class MyMojo
- extends AbstractMojo
-{
-
- public void execute()
- {
- }
+public class MyMojo extends AbstractMojo {
+ public void execute() {}
}
diff --git a/maven-plugin-plugin/src/it/source-encoding/utf-8/src/main/java/test/MyMojo.java b/maven-plugin-plugin/src/it/source-encoding/utf-8/src/main/java/test/MyMojo.java
index 08a0fea1..f7e30bd3 100644
--- a/maven-plugin-plugin/src/it/source-encoding/utf-8/src/main/java/test/MyMojo.java
+++ b/maven-plugin-plugin/src/it/source-encoding/utf-8/src/main/java/test/MyMojo.java
@@ -1,5 +1,3 @@
-package test;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package test;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package test;
* specific language governing permissions and limitations
* under the License.
*/
+package test;
// NOTE: This source file is by design encoded using UTF-8!
@@ -25,15 +24,10 @@ import org.apache.maven.plugin.AbstractMojo;
/**
* TEST-CHARS: ßıΣЯא€
- *
+ *
* @goal test
*/
-public class MyMojo
- extends AbstractMojo
-{
-
- public void execute()
- {
- }
+public class MyMojo extends AbstractMojo {
+ public void execute() {}
}
diff --git a/maven-plugin-plugin/src/it/v4api/src/main/java/org/apache/maven/its/v4api/FirstMojo.java b/maven-plugin-plugin/src/it/v4api/src/main/java/org/apache/maven/its/v4api/FirstMojo.java
index d66e135e..879f3cef 100644
--- a/maven-plugin-plugin/src/it/v4api/src/main/java/org/apache/maven/its/v4api/FirstMojo.java
+++ b/maven-plugin-plugin/src/it/v4api/src/main/java/org/apache/maven/its/v4api/FirstMojo.java
@@ -1,5 +1,3 @@
-package org.apache.maven.its.v4api;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,8 +16,12 @@ package org.apache.maven.its.v4api;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.its.v4api;
+
+import java.nio.file.Path;
import org.apache.maven.api.MojoExecution;
+import org.apache.maven.api.Project;
import org.apache.maven.api.ResolutionScope;
import org.apache.maven.api.Session;
import org.apache.maven.api.plugin.Log;
@@ -29,12 +31,9 @@ import org.apache.maven.api.plugin.annotations.Execute;
import org.apache.maven.api.plugin.annotations.LifecyclePhase;
import org.apache.maven.api.plugin.annotations.Mojo;
import org.apache.maven.api.plugin.annotations.Parameter;
-import org.apache.maven.api.Project;
import org.apache.maven.api.services.ArtifactInstaller;
import org.apache.maven.api.settings.Settings;
-import java.nio.file.Path;
-
/**
* Test mojo for the v4 api plugin descriptor generation.
* This mojo is not actually runnable because:
@@ -43,21 +42,20 @@ import java.nio.file.Path;
*
* @since 1.2
*/
-@Mojo( name = "first", requiresDependencyResolution = ResolutionScope.TEST,
- defaultPhase = LifecyclePhase.INTEGRATION_TEST )
-@Execute( phase = LifecyclePhase.GENERATE_SOURCES, lifecycle = "cobertura" )
-public class FirstMojo
- implements org.apache.maven.api.plugin.Mojo
-{
+@Mojo(
+ name = "first",
+ requiresDependencyResolution = ResolutionScope.TEST,
+ defaultPhase = LifecyclePhase.INTEGRATION_TEST)
+@Execute(phase = LifecyclePhase.GENERATE_SOURCES, lifecycle = "cobertura")
+public class FirstMojo implements org.apache.maven.api.plugin.Mojo {
/**
* Project directory.
*/
- @Parameter( defaultValue = "${basedir}", readonly = true )
+ @Parameter(defaultValue = "${basedir}", readonly = true)
private Path basedir;
- @Parameter( property = "first.touchFile", defaultValue = "${project.build.directory}/touch.txt",
- required = true )
+ @Parameter(property = "first.touchFile", defaultValue = "${project.build.directory}/touch.txt", required = true)
private Path touchFile;
/**
@@ -65,7 +63,7 @@ public class FirstMojo
* @deprecated As of 0.2
*/
@Deprecated
- @Parameter( name = "namedParam", alias = "alias" )
+ @Parameter(name = "namedParam", alias = "alias")
private String aliasedParam;
@Component
@@ -83,12 +81,8 @@ public class FirstMojo
@Component
private Log log;
- @Component( role = ArtifactInstaller.class, hint = "test" )
+ @Component(role = ArtifactInstaller.class, hint = "test")
private Object custom;
- public void execute()
- throws MojoException
- {
- }
-
+ public void execute() throws MojoException {}
}
diff --git a/maven-plugin-plugin/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java b/maven-plugin-plugin/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java
index b55bcb32..1101ae5a 100644
--- a/maven-plugin-plugin/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java
+++ b/maven-plugin-plugin/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java
@@ -1,5 +1,3 @@
-package org.apache.maven.artifact.repository.metadata;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.artifact.repository.metadata;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.artifact.repository.metadata;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.artifact.repository.metadata;
import java.util.Iterator;
import java.util.List;
@@ -31,91 +30,70 @@ import org.apache.maven.artifact.repository.ArtifactRepository;
*
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
*/
-public class GroupRepositoryMetadata
- extends AbstractRepositoryMetadata
-{
+public class GroupRepositoryMetadata extends AbstractRepositoryMetadata {
private final String groupId;
- public GroupRepositoryMetadata( String groupId )
- {
- super( new Metadata() );
+ public GroupRepositoryMetadata(String groupId) {
+ super(new Metadata());
this.groupId = groupId;
}
- public boolean storedInGroupDirectory()
- {
+ public boolean storedInGroupDirectory() {
return true;
}
- public boolean storedInArtifactVersionDirectory()
- {
+ public boolean storedInArtifactVersionDirectory() {
return false;
}
- public String getGroupId()
- {
+ public String getGroupId() {
return groupId;
}
- public String getArtifactId()
- {
+ public String getArtifactId() {
return null;
}
- public String getBaseVersion()
- {
+ public String getBaseVersion() {
return null;
}
- public void addPluginMapping( String goalPrefix,
- String artifactId )
- {
- addPluginMapping( goalPrefix, artifactId, artifactId );
+ public void addPluginMapping(String goalPrefix, String artifactId) {
+ addPluginMapping(goalPrefix, artifactId, artifactId);
}
- public void addPluginMapping( String goalPrefix,
- String artifactId,
- String name )
- {
+ public void addPluginMapping(String goalPrefix, String artifactId, String name) {
List<Plugin> plugins = getMetadata().getPlugins();
boolean found = false;
- for ( Iterator<Plugin> i = plugins.iterator(); i.hasNext() && !found; )
- {
+ for (Iterator<Plugin> i = plugins.iterator(); i.hasNext() && !found; ) {
Plugin plugin = i.next();
- if ( plugin.getPrefix().equals( goalPrefix ) )
- {
+ if (plugin.getPrefix().equals(goalPrefix)) {
found = true;
}
}
- if ( !found )
- {
+ if (!found) {
Plugin plugin = new Plugin();
- plugin.setPrefix( goalPrefix );
- plugin.setArtifactId( artifactId );
- plugin.setName( name );
-
+ plugin.setPrefix(goalPrefix);
+ plugin.setArtifactId(artifactId);
+ plugin.setName(name);
- getMetadata().addPlugin( plugin );
+ getMetadata().addPlugin(plugin);
}
}
- public Object getKey()
- {
+ public Object getKey() {
return groupId;
}
- public boolean isSnapshot()
- {
+ public boolean isSnapshot() {
return false;
}
- public ArtifactRepository getRepository()
- {
+ public ArtifactRepository getRepository() {
return null;
}
- public void setRepository( ArtifactRepository remoteRepository )
- {
+ public void setRepository(ArtifactRepository remoteRepository) {
// intentionally blank
}
}
diff --git a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/AbstractGeneratorMojo.java b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/AbstractGeneratorMojo.java
index adf2ffc5..9399c22c 100644
--- a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/AbstractGeneratorMojo.java
+++ b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/AbstractGeneratorMojo.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugin.plugin;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.plugin.plugin;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.plugin.plugin;
import java.util.Collections;
import java.util.List;
@@ -34,13 +33,11 @@ import org.apache.maven.project.MavenProject;
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
*
*/
-public abstract class AbstractGeneratorMojo
- extends AbstractMojo
-{
+public abstract class AbstractGeneratorMojo extends AbstractMojo {
/**
* The project currently being built.
*/
- @Parameter( defaultValue = "${project}", readonly = true )
+ @Parameter(defaultValue = "${project}", readonly = true)
protected MavenProject project;
/**
@@ -54,16 +51,16 @@ public abstract class AbstractGeneratorMojo
*
* @since 2.8
*/
- @Parameter( defaultValue = "false", property = "maven.plugin.skip" )
+ @Parameter(defaultValue = "false", property = "maven.plugin.skip")
private boolean skip;
/**
* Maven plugin packaging types. Default is single "maven-plugin".
- *
+ *
* @since 3.3
*/
@Parameter
- private List<String> packagingTypes = Collections.singletonList( "maven-plugin" );
+ private List<String> packagingTypes = Collections.singletonList("maven-plugin");
/**
* System/OS line separator: used to format console messages.
@@ -73,51 +70,38 @@ public abstract class AbstractGeneratorMojo
protected abstract void generate() throws MojoExecutionException;
@Override
- public void execute()
- throws MojoExecutionException
- {
- if ( !packagingTypes.contains( project.getPackaging() ) )
- {
- getLog().info( "Unsupported packaging type " + project.getPackaging() + ", execution skipped" );
+ public void execute() throws MojoExecutionException {
+ if (!packagingTypes.contains(project.getPackaging())) {
+ getLog().info("Unsupported packaging type " + project.getPackaging() + ", execution skipped");
return;
}
- if ( skip )
- {
- getLog().warn( "Execution skipped" );
+ if (skip) {
+ getLog().warn("Execution skipped");
return;
}
- String defaultGoalPrefix = getDefaultGoalPrefix( project );
+ String defaultGoalPrefix = getDefaultGoalPrefix(project);
- if ( goalPrefix == null )
- {
+ if (goalPrefix == null) {
goalPrefix = defaultGoalPrefix;
- }
- else if ( !goalPrefix.equals( defaultGoalPrefix ) )
- {
- getLog().warn(
- LS + LS + "Goal prefix is specified as: '" + goalPrefix + "'. " + "Maven currently expects it to be '"
- + defaultGoalPrefix + "'." + LS );
+ } else if (!goalPrefix.equals(defaultGoalPrefix)) {
+ getLog().warn(LS + LS + "Goal prefix is specified as: '" + goalPrefix + "'. "
+ + "Maven currently expects it to be '" + defaultGoalPrefix + "'." + LS);
}
generate();
}
- static String getDefaultGoalPrefix( MavenProject project )
- {
+ static String getDefaultGoalPrefix(MavenProject project) {
String defaultGoalPrefix;
- if ( "maven-plugin-report-plugin".equalsIgnoreCase( project.getArtifactId() ) )
- {
+ if ("maven-plugin-report-plugin".equalsIgnoreCase(project.getArtifactId())) {
defaultGoalPrefix = "plugin-report";
- }
- else if ( "maven-plugin".equalsIgnoreCase( project.getArtifactId() ) )
- {
- defaultGoalPrefix = project.getGroupId().substring( project.getGroupId().lastIndexOf( '.' ) + 1 );
- }
- else
- {
- defaultGoalPrefix = PluginDescriptor.getGoalPrefixFromArtifactId( project.getArtifactId() );
+ } else if ("maven-plugin".equalsIgnoreCase(project.getArtifactId())) {
+ defaultGoalPrefix =
+ project.getGroupId().substring(project.getGroupId().lastIndexOf('.') + 1);
+ } else {
+ defaultGoalPrefix = PluginDescriptor.getGoalPrefixFromArtifactId(project.getArtifactId());
}
return defaultGoalPrefix;
}
diff --git a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojo.java b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojo.java
index 0002b1e9..72b67ea0 100644
--- a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojo.java
+++ b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojo.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugin.plugin;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.plugin.plugin;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.plugin.plugin;
import java.io.File;
import java.net.URI;
@@ -66,17 +65,18 @@ import org.sonatype.plexus.build.incremental.BuildContext;
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
* @since 2.0
*/
-@Mojo( name = "descriptor", defaultPhase = LifecyclePhase.PROCESS_CLASSES,
- requiresDependencyResolution = ResolutionScope.COMPILE_PLUS_RUNTIME, threadSafe = true )
-public class DescriptorGeneratorMojo
- extends AbstractGeneratorMojo
-{
+@Mojo(
+ name = "descriptor",
+ defaultPhase = LifecyclePhase.PROCESS_CLASSES,
+ requiresDependencyResolution = ResolutionScope.COMPILE_PLUS_RUNTIME,
+ threadSafe = true)
+public class DescriptorGeneratorMojo extends AbstractGeneratorMojo {
private static final String VALUE_AUTO = "auto";
/**
* The directory where the generated <code>plugin.xml</code> file will be put.
*/
- @Parameter( defaultValue = "${project.build.outputDirectory}/META-INF/maven", readonly = true )
+ @Parameter(defaultValue = "${project.build.outputDirectory}/META-INF/maven", readonly = true)
private File outputDirectory;
/**
@@ -84,7 +84,7 @@ public class DescriptorGeneratorMojo
*
* @since 2.5
*/
- @Parameter( property = "encoding", defaultValue = "${project.build.sourceEncoding}" )
+ @Parameter(property = "encoding", defaultValue = "${project.build.sourceEncoding}")
private String encoding;
/**
@@ -92,7 +92,7 @@ public class DescriptorGeneratorMojo
*
* @since 2.6
*/
- @Parameter( defaultValue = "false" )
+ @Parameter(defaultValue = "false")
private boolean skipDescriptor;
/**
@@ -136,7 +136,7 @@ public class DescriptorGeneratorMojo
*
* @since 3.0
*/
- @Parameter( property = "maven.plugin.skipErrorNoDescriptorsFound", defaultValue = "false" )
+ @Parameter(property = "maven.plugin.skipErrorNoDescriptorsFound", defaultValue = "false")
private boolean skipErrorNoDescriptorsFound;
/**
@@ -145,7 +145,7 @@ public class DescriptorGeneratorMojo
*
* @since 3.6.3
*/
- @Parameter( defaultValue = "true", property = "maven.plugin.checkExpectedProvidedScope" )
+ @Parameter(defaultValue = "true", property = "maven.plugin.checkExpectedProvidedScope")
private boolean checkExpectedProvidedScope = true;
/**
@@ -155,7 +155,7 @@ public class DescriptorGeneratorMojo
* @since 3.6.3
*/
@Parameter
- private List<String> expectedProvidedScopeGroupIds = Collections.singletonList( "org.apache.maven" );
+ private List<String> expectedProvidedScopeGroupIds = Collections.singletonList("org.apache.maven");
/**
* List of {@code groupId:artifactId} strings of artifact coordinates that are to be excluded from "expected
@@ -166,9 +166,7 @@ public class DescriptorGeneratorMojo
*/
@Parameter
private List<String> expectedProvidedScopeExclusions = Arrays.asList(
- "org.apache.maven:maven-archiver",
- "org.apache.maven:maven-jxr",
- "org.apache.maven:plexus-utils" );
+ "org.apache.maven:maven-archiver", "org.apache.maven:maven-jxr", "org.apache.maven:plexus-utils");
/**
* Specify the dependencies as {@code groupId:artifactId} containing (abstract) Mojos, to filter
@@ -198,7 +196,7 @@ public class DescriptorGeneratorMojo
* Using this parameter requires connectivity to the given URLs during the goal execution.
* @since 3.7.0
*/
- @Parameter( property = "externalJavadocBaseUrls", alias = "links" )
+ @Parameter(property = "externalJavadocBaseUrls", alias = "links")
protected List<URI> externalJavadocBaseUrls;
/**
@@ -210,17 +208,17 @@ public class DescriptorGeneratorMojo
* <a href="../maven-plugin-report-plugin/index.html">Plugin Report</a>.</b>
* @since 3.7.0
*/
- @Parameter( property = "internalJavadocBaseUrl" )
+ @Parameter(property = "internalJavadocBaseUrl")
protected URI internalJavadocBaseUrl;
/**
* The version of the javadoc tool (equal to the container JDK version) used to generate the internal javadoc
* Only relevant if {@link #internalJavadocBaseUrl} is set.
* The default value needs to be overwritten in case toolchains are being used for generating Javadoc.
- *
+ *
* @since 3.7.0
*/
- @Parameter( property = "internalJavadocVersion", defaultValue = "${java.version}" )
+ @Parameter(property = "internalJavadocVersion", defaultValue = "${java.version}")
protected String internalJavadocVersion;
/**
@@ -228,7 +226,7 @@ public class DescriptorGeneratorMojo
*
* @since 3.7.0
*/
- @Parameter( defaultValue = "${settings}", readonly = true, required = true )
+ @Parameter(defaultValue = "${settings}", readonly = true, required = true)
private Settings settings;
/**
@@ -236,7 +234,7 @@ public class DescriptorGeneratorMojo
*
* @since 3.0
*/
- @Parameter( defaultValue = "${project.remoteArtifactRepositories}", required = true, readonly = true )
+ @Parameter(defaultValue = "${project.remoteArtifactRepositories}", required = true, readonly = true)
private List<ArtifactRepository> remoteRepos;
/**
@@ -244,13 +242,13 @@ public class DescriptorGeneratorMojo
*
* @since 3.0
*/
- @Parameter( defaultValue = "${localRepository}", required = true, readonly = true )
+ @Parameter(defaultValue = "${localRepository}", required = true, readonly = true)
private ArtifactRepository local;
/**
* The required Java version to set in the plugin descriptor. This is evaluated by Maven 4 and ignored by earlier
* Maven versions. Can be either one of the following formats:
- *
+ *
* <ul>
* <li>A version range which specifies the supported Java versions. It can either use the usual mathematical
* syntax like {@code "[2.0.10,2.1.0),[3.0,)"} or use a single version like {@code "2.2.1"}. The latter is a short
@@ -258,16 +256,16 @@ public class DescriptorGeneratorMojo
* <li>{@code "auto"} to determine the minimum Java version from the binary class version being generated during
* compilation (determined by the extractor).</li>
* </ul>
- *
+ *
* @since 3.8.0
*/
- @Parameter( defaultValue = VALUE_AUTO )
+ @Parameter(defaultValue = VALUE_AUTO)
String requiredJavaVersion;
/**
* The required Maven version to set in the plugin descriptor. This is evaluated by Maven 4 and ignored by earlier
* Maven versions. Can be either one of the following formats:
- *
+ *
* <ul>
* <li>A version range which specifies the supported Maven versions. It can either use the usual mathematical
* syntax like {@code "[2.0.10,2.1.0),[3.0,)"} or use a single version like {@code "2.2.1"}. The latter is a short
@@ -275,12 +273,12 @@ public class DescriptorGeneratorMojo
* <li>{@code "auto"} to determine the minimum Maven version from the POM's Maven prerequisite, or if not set the
* referenced Maven Plugin API version.</li>
* </ul>
- * This value takes precedence over the
+ * This value takes precedence over the
* <a href="https://maven.apache.org/pom.html#Prerequisites">POM's Maven prerequisite</a> in Maven 4.
- *
+ *
* @since 3.8.0
*/
- @Parameter( defaultValue = VALUE_AUTO )
+ @Parameter(defaultValue = VALUE_AUTO)
String requiredMavenVersion;
/**
@@ -292,188 +290,158 @@ public class DescriptorGeneratorMojo
@Component
protected BuildContext buildContext;
- public void generate()
- throws MojoExecutionException
- {
-
- if ( !"maven-plugin".equalsIgnoreCase( project.getArtifactId() )
- && project.getArtifactId().toLowerCase().startsWith( "maven-" )
- && project.getArtifactId().toLowerCase().endsWith( "-plugin" )
- && !"org.apache.maven.plugins".equals( project.getGroupId() ) )
- {
- getLog().warn( LS + LS + "Artifact Ids of the format maven-___-plugin are reserved for" + LS
- + "plugins in the Group Id org.apache.maven.plugins" + LS
- + "Please change your artifactId to the format ___-maven-plugin" + LS
- + "In the future this error will break the build." + LS + LS );
+ public void generate() throws MojoExecutionException {
+
+ if (!"maven-plugin".equalsIgnoreCase(project.getArtifactId())
+ && project.getArtifactId().toLowerCase().startsWith("maven-")
+ && project.getArtifactId().toLowerCase().endsWith("-plugin")
+ && !"org.apache.maven.plugins".equals(project.getGroupId())) {
+ getLog().warn(LS + LS + "Artifact Ids of the format maven-___-plugin are reserved for" + LS
+ + "plugins in the Group Id org.apache.maven.plugins" + LS
+ + "Please change your artifactId to the format ___-maven-plugin" + LS
+ + "In the future this error will break the build." + LS + LS);
}
- if ( skipDescriptor )
- {
- getLog().warn( "Execution skipped" );
+ if (skipDescriptor) {
+ getLog().warn("Execution skipped");
return;
}
- if ( checkExpectedProvidedScope )
- {
+ if (checkExpectedProvidedScope) {
Set<Artifact> wrongScopedArtifacts = dependenciesNotInProvidedScope();
- if ( !wrongScopedArtifacts.isEmpty() )
- {
+ if (!wrongScopedArtifacts.isEmpty()) {
StringBuilder message = new StringBuilder(
- LS + LS + "Some dependencies of Maven Plugins are expected to be in provided scope." + LS
- + "Please make sure that dependencies listed below declared in POM" + LS
- + "have set '<scope>provided</scope>' as well." + LS + LS
- + "The following dependencies are in wrong scope:" + LS
- );
- for ( Artifact artifact : wrongScopedArtifacts )
- {
- message.append( " * " ).append( artifact ).append( LS );
+ LS + LS + "Some dependencies of Maven Plugins are expected to be in provided scope." + LS
+ + "Please make sure that dependencies listed below declared in POM" + LS
+ + "have set '<scope>provided</scope>' as well." + LS + LS
+ + "The following dependencies are in wrong scope:" + LS);
+ for (Artifact artifact : wrongScopedArtifacts) {
+ message.append(" * ").append(artifact).append(LS);
}
- message.append( LS ).append( LS );
+ message.append(LS).append(LS);
- getLog().warn( message.toString() );
+ getLog().warn(message.toString());
}
}
- mojoScanner.setActiveExtractors( extractors );
+ mojoScanner.setActiveExtractors(extractors);
// TODO: could use this more, eg in the writing of the plugin descriptor!
PluginDescriptor pluginDescriptor = new PluginDescriptor();
- pluginDescriptor.setGroupId( project.getGroupId() );
+ pluginDescriptor.setGroupId(project.getGroupId());
- pluginDescriptor.setArtifactId( project.getArtifactId() );
+ pluginDescriptor.setArtifactId(project.getArtifactId());
- pluginDescriptor.setVersion( project.getVersion() );
+ pluginDescriptor.setVersion(project.getVersion());
- pluginDescriptor.setGoalPrefix( goalPrefix );
+ pluginDescriptor.setGoalPrefix(goalPrefix);
- pluginDescriptor.setName( project.getName() );
+ pluginDescriptor.setName(project.getName());
- pluginDescriptor.setDescription( project.getDescription() );
+ pluginDescriptor.setDescription(project.getDescription());
- if ( encoding == null || encoding.length() < 1 )
- {
- getLog().warn( "Using platform encoding (" + ReaderFactory.FILE_ENCODING
- + " actually) to read mojo source files, i.e. build is platform dependent!" );
- }
- else
- {
- getLog().info( "Using '" + encoding + "' encoding to read mojo source files." );
+ if (encoding == null || encoding.length() < 1) {
+ getLog().warn("Using platform encoding (" + ReaderFactory.FILE_ENCODING
+ + " actually) to read mojo source files, i.e. build is platform dependent!");
+ } else {
+ getLog().info("Using '" + encoding + "' encoding to read mojo source files.");
}
- if ( internalJavadocBaseUrl != null && !internalJavadocBaseUrl.getPath().endsWith( "/" ) )
- {
- throw new MojoExecutionException( "Given parameter 'internalJavadocBaseUrl' must end with a slash but is '"
- + internalJavadocBaseUrl + "'" );
+ if (internalJavadocBaseUrl != null && !internalJavadocBaseUrl.getPath().endsWith("/")) {
+ throw new MojoExecutionException("Given parameter 'internalJavadocBaseUrl' must end with a slash but is '"
+ + internalJavadocBaseUrl + "'");
}
- try
- {
- List<ComponentDependency> deps = GeneratorUtils.toComponentDependencies( project.getArtifacts() );
- pluginDescriptor.setDependencies( deps );
-
- PluginToolsRequest request = new DefaultPluginToolsRequest( project, pluginDescriptor );
- request.setEncoding( encoding );
- request.setSkipErrorNoDescriptorsFound( skipErrorNoDescriptorsFound );
- request.setDependencies( filterMojoDependencies() );
- request.setLocal( this.local );
- request.setRemoteRepos( this.remoteRepos );
- request.setInternalJavadocBaseUrl( internalJavadocBaseUrl );
- request.setInternalJavadocVersion( internalJavadocVersion );
- request.setExternalJavadocBaseUrls( externalJavadocBaseUrls );
- request.setSettings( settings );
-
- mojoScanner.populatePluginDescriptor( request );
- request.setPluginDescriptor( extendPluginDescriptor( request ) );
+ try {
+ List<ComponentDependency> deps = GeneratorUtils.toComponentDependencies(project.getArtifacts());
+ pluginDescriptor.setDependencies(deps);
+
+ PluginToolsRequest request = new DefaultPluginToolsRequest(project, pluginDescriptor);
+ request.setEncoding(encoding);
+ request.setSkipErrorNoDescriptorsFound(skipErrorNoDescriptorsFound);
+ request.setDependencies(filterMojoDependencies());
+ request.setLocal(this.local);
+ request.setRemoteRepos(this.remoteRepos);
+ request.setInternalJavadocBaseUrl(internalJavadocBaseUrl);
+ request.setInternalJavadocVersion(internalJavadocVersion);
+ request.setExternalJavadocBaseUrls(externalJavadocBaseUrls);
+ request.setSettings(settings);
+
+ mojoScanner.populatePluginDescriptor(request);
+ request.setPluginDescriptor(extendPluginDescriptor(request));
outputDirectory.mkdirs();
PluginDescriptorFilesGenerator pluginDescriptorGenerator = new PluginDescriptorFilesGenerator();
- pluginDescriptorGenerator.execute( outputDirectory, request );
-
- buildContext.refresh( outputDirectory );
- }
- catch ( GeneratorException e )
- {
- throw new MojoExecutionException( "Error writing plugin descriptor", e );
- }
- catch ( InvalidPluginDescriptorException | ExtractionException e )
- {
- throw new MojoExecutionException( "Error extracting plugin descriptor: '" + e.getLocalizedMessage() + "'",
- e );
- }
- catch ( LinkageError e )
- {
- throw new MojoExecutionException( "The API of the mojo scanner is not compatible with this plugin version."
- + " Please check the plugin dependencies configured"
- + " in the POM and ensure the versions match.",
- e );
+ pluginDescriptorGenerator.execute(outputDirectory, request);
+
+ buildContext.refresh(outputDirectory);
+ } catch (GeneratorException e) {
+ throw new MojoExecutionException("Error writing plugin descriptor", e);
+ } catch (InvalidPluginDescriptorException | ExtractionException e) {
+ throw new MojoExecutionException(
+ "Error extracting plugin descriptor: '" + e.getLocalizedMessage() + "'", e);
+ } catch (LinkageError e) {
+ throw new MojoExecutionException(
+ "The API of the mojo scanner is not compatible with this plugin version."
+ + " Please check the plugin dependencies configured"
+ + " in the POM and ensure the versions match.",
+ e);
}
}
- private PluginDescriptor extendPluginDescriptor( PluginToolsRequest request )
- {
- ExtendedPluginDescriptor extendedPluginDescriptor =
- new ExtendedPluginDescriptor( request.getPluginDescriptor() );
- extendedPluginDescriptor.setRequiredJavaVersion( getRequiredJavaVersion( request ) );
- extendedPluginDescriptor.setRequiredMavenVersion( getRequiredMavenVersion( request ) );
+ private PluginDescriptor extendPluginDescriptor(PluginToolsRequest request) {
+ ExtendedPluginDescriptor extendedPluginDescriptor = new ExtendedPluginDescriptor(request.getPluginDescriptor());
+ extendedPluginDescriptor.setRequiredJavaVersion(getRequiredJavaVersion(request));
+ extendedPluginDescriptor.setRequiredMavenVersion(getRequiredMavenVersion(request));
return extendedPluginDescriptor;
}
- private String getRequiredMavenVersion( PluginToolsRequest request )
- {
- if ( !VALUE_AUTO.equals( requiredMavenVersion ) )
- {
+ private String getRequiredMavenVersion(PluginToolsRequest request) {
+ if (!VALUE_AUTO.equals(requiredMavenVersion)) {
return requiredMavenVersion;
}
- getLog().debug( "Trying to derive Maven version automatically from project prerequisites..." );
- String requiredMavenVersion = project.getPrerequisites() != null ? project.getPrerequisites().getMaven()
- : null;
- if ( requiredMavenVersion == null )
- {
- getLog().debug( "Trying to derive Maven version automatically from referenced Maven Plugin API artifact "
- + "version..." );
+ getLog().debug("Trying to derive Maven version automatically from project prerequisites...");
+ String requiredMavenVersion =
+ project.getPrerequisites() != null ? project.getPrerequisites().getMaven() : null;
+ if (requiredMavenVersion == null) {
+ getLog().debug("Trying to derive Maven version automatically from referenced Maven Plugin API artifact "
+ + "version...");
requiredMavenVersion = request.getUsedMavenApiVersion();
}
- if ( requiredMavenVersion == null )
- {
- getLog().warn( "Cannot determine the required Maven version automatically, it is recommended to "
- + "configure some explicit value manually." );
+ if (requiredMavenVersion == null) {
+ getLog().warn("Cannot determine the required Maven version automatically, it is recommended to "
+ + "configure some explicit value manually.");
}
return requiredMavenVersion;
}
- private String getRequiredJavaVersion( PluginToolsRequest request )
- {
- if ( !VALUE_AUTO.equals( requiredJavaVersion ) )
- {
+ private String getRequiredJavaVersion(PluginToolsRequest request) {
+ if (!VALUE_AUTO.equals(requiredJavaVersion)) {
return requiredJavaVersion;
}
String minRequiredJavaVersion = request.getRequiredJavaVersion();
- if ( minRequiredJavaVersion == null )
- {
- getLog().warn( "Cannot determine the minimally required Java version automatically, it is recommended to "
- + "configure some explicit value manually." );
+ if (minRequiredJavaVersion == null) {
+ getLog().warn("Cannot determine the minimally required Java version automatically, it is recommended to "
+ + "configure some explicit value manually.");
return null;
}
-
+
return minRequiredJavaVersion;
}
/**
* Collects all dependencies expected to be in "provided" scope but are NOT in "provided" scope.
*/
- private Set<Artifact> dependenciesNotInProvidedScope()
- {
+ private Set<Artifact> dependenciesNotInProvidedScope() {
LinkedHashSet<Artifact> wrongScopedDependencies = new LinkedHashSet<>();
- for ( Artifact dependency : project.getArtifacts() )
- {
+ for (Artifact dependency : project.getArtifacts()) {
String ga = dependency.getGroupId() + ":" + dependency.getArtifactId();
- if ( expectedProvidedScopeGroupIds.contains( dependency.getGroupId() )
- && !expectedProvidedScopeExclusions.contains( ga )
- && !Artifact.SCOPE_PROVIDED.equals( dependency.getScope() ) )
- {
- wrongScopedDependencies.add( dependency );
+ if (expectedProvidedScopeGroupIds.contains(dependency.getGroupId())
+ && !expectedProvidedScopeExclusions.contains(ga)
+ && !Artifact.SCOPE_PROVIDED.equals(dependency.getScope())) {
+ wrongScopedDependencies.add(dependency);
}
}
@@ -487,28 +455,20 @@ public class DescriptorGeneratorMojo
* list
* @see #mojoDependencies
*/
- private Set<Artifact> filterMojoDependencies()
- {
+ private Set<Artifact> filterMojoDependencies() {
Set<Artifact> filteredArtifacts;
- if ( mojoDependencies == null )
- {
- filteredArtifacts = new LinkedHashSet<>( project.getArtifacts() );
- }
- else if ( mojoDependencies.isEmpty() )
- {
+ if (mojoDependencies == null) {
+ filteredArtifacts = new LinkedHashSet<>(project.getArtifacts());
+ } else if (mojoDependencies.isEmpty()) {
filteredArtifacts = null;
- }
- else
- {
+ } else {
filteredArtifacts = new LinkedHashSet<>();
- ArtifactFilter filter = new IncludesArtifactFilter( mojoDependencies );
+ ArtifactFilter filter = new IncludesArtifactFilter(mojoDependencies);
- for ( Artifact artifact : project.getArtifacts() )
- {
- if ( filter.include( artifact ) )
- {
- filteredArtifacts.add( artifact );
+ for (Artifact artifact : project.getArtifacts()) {
+ if (filter.include(artifact)) {
+ filteredArtifacts.add(artifact);
}
}
}
diff --git a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/HelpGeneratorMojo.java b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/HelpGeneratorMojo.java
index 679b5945..eeadd65e 100644
--- a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/HelpGeneratorMojo.java
+++ b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/HelpGeneratorMojo.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugin.plugin;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.plugin.plugin;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.plugin.plugin;
import javax.lang.model.SourceVersion;
@@ -43,15 +42,16 @@ import org.codehaus.plexus.velocity.VelocityComponent;
* @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
* @since 2.4
*/
-@Mojo( name = "helpmojo", defaultPhase = LifecyclePhase.GENERATE_SOURCES, threadSafe = true,
- requiresDependencyResolution = ResolutionScope.COMPILE )
-public class HelpGeneratorMojo
- extends AbstractGeneratorMojo
-{
+@Mojo(
+ name = "helpmojo",
+ defaultPhase = LifecyclePhase.GENERATE_SOURCES,
+ threadSafe = true,
+ requiresDependencyResolution = ResolutionScope.COMPILE)
+public class HelpGeneratorMojo extends AbstractGeneratorMojo {
/**
* The directory where the generated <code>HelpMojo</code> file will be put.
*/
- @Parameter( defaultValue = "${project.build.directory}/generated-sources/plugin" )
+ @Parameter(defaultValue = "${project.build.directory}/generated-sources/plugin")
protected File outputDirectory;
/**
@@ -74,59 +74,47 @@ public class HelpGeneratorMojo
@Component
private VelocityComponent velocity;
- String getHelpPackageName()
- {
+ String getHelpPackageName() {
String packageName = null;
- if ( StringUtils.isNotBlank( helpPackageName ) )
- {
+ if (StringUtils.isNotBlank(helpPackageName)) {
packageName = helpPackageName;
}
- if ( packageName == null )
- {
+ if (packageName == null) {
packageName = project.getGroupId() + "." + project.getArtifactId();
- packageName = packageName.replace( "-", "_" );
+ packageName = packageName.replace("-", "_");
- String[] packageItems = packageName.split( "\\." );
- packageName = Arrays.stream( packageItems )
- .map( this::prefixSpecialCase )
- .collect( Collectors.joining( "." ) );
+ String[] packageItems = packageName.split("\\.");
+ packageName =
+ Arrays.stream(packageItems).map(this::prefixSpecialCase).collect(Collectors.joining("."));
}
return packageName;
}
- private String prefixSpecialCase( String name )
- {
- if ( SourceVersion.isKeyword( name ) || !Character.isJavaIdentifierStart( name.charAt( 0 ) ) )
- {
+ private String prefixSpecialCase(String name) {
+ if (SourceVersion.isKeyword(name) || !Character.isJavaIdentifierStart(name.charAt(0))) {
name = "_" + name;
}
return name;
}
@Override
- protected void generate() throws MojoExecutionException
- {
+ protected void generate() throws MojoExecutionException {
PluginHelpGenerator pluginHelpGenerator = new PluginHelpGenerator()
- .setMavenProject( project )
- .setHelpPackageName( getHelpPackageName() )
- .setGoalPrefix( goalPrefix )
- .setVelocityComponent( velocity );
-
- try
- {
- pluginHelpGenerator.execute( outputDirectory );
- }
- catch ( GeneratorException e )
- {
- throw new MojoExecutionException( e.getMessage(), e );
+ .setMavenProject(project)
+ .setHelpPackageName(getHelpPackageName())
+ .setGoalPrefix(goalPrefix)
+ .setVelocityComponent(velocity);
+
+ try {
+ pluginHelpGenerator.execute(outputDirectory);
+ } catch (GeneratorException e) {
+ throw new MojoExecutionException(e.getMessage(), e);
}
- if ( !project.getCompileSourceRoots().contains( outputDirectory.getAbsolutePath() ) )
- {
- project.addCompileSourceRoot( outputDirectory.getAbsolutePath() );
+ if (!project.getCompileSourceRoots().contains(outputDirectory.getAbsolutePath())) {
+ project.addCompileSourceRoot(outputDirectory.getAbsolutePath());
}
}
-
}
diff --git a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/AddPluginArtifactMetadataMojo.java b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/AddPluginArtifactMetadataMojo.java
index 0711980a..c98ca295 100644
--- a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/AddPluginArtifactMetadataMojo.java
+++ b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/AddPluginArtifactMetadataMojo.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugin.plugin.metadata;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.plugin.plugin.metadata;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.plugin.plugin.metadata;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.metadata.ArtifactRepositoryMetadata;
@@ -47,14 +46,12 @@ import org.apache.maven.project.MavenProject;
*
* @since 2.0
*/
-@Mojo( name = "addPluginArtifactMetadata", defaultPhase = LifecyclePhase.PACKAGE, threadSafe = true )
-public class AddPluginArtifactMetadataMojo
- extends AbstractMojo
-{
+@Mojo(name = "addPluginArtifactMetadata", defaultPhase = LifecyclePhase.PACKAGE, threadSafe = true)
+public class AddPluginArtifactMetadataMojo extends AbstractMojo {
/**
* The project artifact, which should have the <code>latest</code> metadata added to it.
*/
- @Parameter( defaultValue = "${project}", readonly = true )
+ @Parameter(defaultValue = "${project}", readonly = true)
private MavenProject project;
/**
@@ -68,41 +65,36 @@ public class AddPluginArtifactMetadataMojo
*
* @since 2.8
*/
- @Parameter( defaultValue = "false", property = "maven.plugin.skip" )
+ @Parameter(defaultValue = "false", property = "maven.plugin.skip")
private boolean skip;
/** {@inheritDoc} */
@Override
- public void execute()
- throws MojoExecutionException
- {
- if ( skip )
- {
- getLog().warn( "Execution skipped" );
+ public void execute() throws MojoExecutionException {
+ if (skip) {
+ getLog().warn("Execution skipped");
return;
}
Artifact projectArtifact = project.getArtifact();
Versioning versioning = new Versioning();
- versioning.setLatest( projectArtifact.getVersion() );
+ versioning.setLatest(projectArtifact.getVersion());
versioning.updateTimestamp();
- ArtifactRepositoryMetadata metadata = new ArtifactRepositoryMetadata( projectArtifact, versioning );
- projectArtifact.addMetadata( metadata );
+ ArtifactRepositoryMetadata metadata = new ArtifactRepositoryMetadata(projectArtifact, versioning);
+ projectArtifact.addMetadata(metadata);
- GroupRepositoryMetadata groupMetadata = new GroupRepositoryMetadata( project.getGroupId() );
- groupMetadata.addPluginMapping( getGoalPrefix(), project.getArtifactId(), project.getName() );
+ GroupRepositoryMetadata groupMetadata = new GroupRepositoryMetadata(project.getGroupId());
+ groupMetadata.addPluginMapping(getGoalPrefix(), project.getArtifactId(), project.getName());
- projectArtifact.addMetadata( groupMetadata );
+ projectArtifact.addMetadata(groupMetadata);
}
/**
* @return the goal prefix parameter or the goal prefix from the Plugin artifactId.
*/
- private String getGoalPrefix()
- {
- if ( goalPrefix == null )
- {
- goalPrefix = PluginDescriptor.getGoalPrefixFromArtifactId( project.getArtifactId() );
+ private String getGoalPrefix() {
+ if (goalPrefix == null) {
+ goalPrefix = PluginDescriptor.getGoalPrefixFromArtifactId(project.getArtifactId());
}
return goalPrefix;
diff --git a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/report_old/PluginReport.java b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/report_old/PluginReport.java
index 34f39632..ae3ffe85 100644
--- a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/report_old/PluginReport.java
+++ b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/report_old/PluginReport.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugin.plugin.report_old;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.plugin.plugin.report_old;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.plugin.plugin.report_old;
import java.io.File;
import java.io.IOException;
@@ -69,15 +68,13 @@ import org.codehaus.plexus.util.xml.Xpp3Dom;
* @deprecated use the maven-plugin-report-plugin instead
*/
@Deprecated
-@Mojo( name = "report", threadSafe = true )
-@Execute( phase = LifecyclePhase.PROCESS_CLASSES )
-public class PluginReport
- extends AbstractMavenReport
-{
+@Mojo(name = "report", threadSafe = true)
+@Execute(phase = LifecyclePhase.PROCESS_CLASSES)
+public class PluginReport extends AbstractMavenReport {
/**
* Report output directory for mojos' documentation.
*/
- @Parameter( defaultValue = "${project.build.directory}/generated-site/xdoc" )
+ @Parameter(defaultValue = "${project.build.directory}/generated-site/xdoc")
private File outputDirectory;
/**
@@ -88,7 +85,7 @@ public class PluginReport
* @since 2.7
*/
@Deprecated
- @Parameter( property = "encoding", defaultValue = "${project.build.sourceEncoding}" )
+ @Parameter(property = "encoding", defaultValue = "${project.build.sourceEncoding}")
private String encoding;
/**
@@ -141,7 +138,7 @@ public class PluginReport
* @since 2.4
*/
@Deprecated
- @Parameter( property = "goalPrefix" )
+ @Parameter(property = "goalPrefix")
protected String goalPrefix;
/**
@@ -152,7 +149,7 @@ public class PluginReport
* @since 2.8
*/
@Deprecated
- @Parameter( defaultValue = "false", property = "maven.plugin.skip" )
+ @Parameter(defaultValue = "false", property = "maven.plugin.skip")
private boolean skipReport;
/**
@@ -160,7 +157,7 @@ public class PluginReport
*
* @since 2.8
*/
- @Parameter( defaultValue = "false", property = "maven.plugin.report.skip" )
+ @Parameter(defaultValue = "false", property = "maven.plugin.report.skip")
private boolean skip;
/**
@@ -169,7 +166,7 @@ public class PluginReport
*
* @since 3.7.0
*/
- @Parameter( defaultValue = "false", property = "maven.plugin.report.hasExtensionsToLoad" )
+ @Parameter(defaultValue = "false", property = "maven.plugin.report.hasExtensionsToLoad")
private boolean hasExtensionsToLoad;
/**
@@ -204,8 +201,10 @@ public class PluginReport
* @since 3.5.1
* @deprecated No longer evaluated, use {@link #enhancedPluginXmlFile}.
*/
- @Parameter( defaultValue = "${project.build.outputDirectory}/META-INF/maven/plugin.xml", required = true,
- readonly = true )
+ @Parameter(
+ defaultValue = "${project.build.outputDirectory}/META-INF/maven/plugin.xml",
+ required = true,
+ readonly = true)
@Deprecated
private File pluginXmlFile;
@@ -214,8 +213,7 @@ public class PluginReport
*
* @since 3.7.0
*/
- @Parameter( defaultValue = "${project.build.directory}/plugin-enhanced.xml", required = true,
- readonly = true )
+ @Parameter(defaultValue = "${project.build.directory}/plugin-enhanced.xml", required = true, readonly = true)
private File enhancedPluginXmlFile;
/**
@@ -225,18 +223,17 @@ public class PluginReport
* This might have the drawback that some links being generated in the report might be broken
* in case not all parameter types and javadoc link references are resolvable through the sites being given to
* {@link DescriptorGeneratorMojo}.
- *
+ *
* @since 3.7.0
*/
- @Parameter( property = "maven.plugin.report.disableInternalJavadocLinkValidation" )
+ @Parameter(property = "maven.plugin.report.disableInternalJavadocLinkValidation")
private boolean disableInternalJavadocLinkValidation;
/**
* {@inheritDoc}
*/
@Override
- protected String getOutputDirectory()
- {
+ protected String getOutputDirectory() {
// PLUGIN-191: output directory of plugin.html, not *-mojo.xml
return project.getReporting().getOutputDirectory();
}
@@ -245,8 +242,7 @@ public class PluginReport
* {@inheritDoc}
*/
@Override
- public boolean canGenerateReport()
- {
+ public boolean canGenerateReport() {
return enhancedPluginXmlFile != null && enhancedPluginXmlFile.isFile() && enhancedPluginXmlFile.canRead();
}
@@ -254,71 +250,64 @@ public class PluginReport
* {@inheritDoc}
*/
@Override
- protected void executeReport( Locale locale )
- throws MavenReportException
- {
- getLog().warn( "The 'report' goal of the maven-plugin-plugin is deprecated, please use "
+ protected void executeReport(Locale locale) throws MavenReportException {
+ getLog().warn("The 'report' goal of the maven-plugin-plugin is deprecated, please use "
+ "the 'report' goal from the maven-plugin-report-plugin instead. This goal will be removed "
- + "in version 4.0.0." );
+ + "in version 4.0.0.");
- if ( skip || skipReport )
- {
- getLog().info( "Maven Plugin Plugin Report generation skipped." );
+ if (skip || skipReport) {
+ getLog().info("Maven Plugin Plugin Report generation skipped.");
return;
}
PluginDescriptor pluginDescriptor = extractPluginDescriptor();
// Generate the mojos' documentation
- generateMojosDocumentation( pluginDescriptor, locale );
+ generateMojosDocumentation(pluginDescriptor, locale);
// Write the overview
- PluginOverviewRenderer r =
- new PluginOverviewRenderer( getProject(), requirements, requirementsHistories, getSink(),
- pluginDescriptor, locale, hasExtensionsToLoad );
+ PluginOverviewRenderer r = new PluginOverviewRenderer(
+ getProject(),
+ requirements,
+ requirementsHistories,
+ getSink(),
+ pluginDescriptor,
+ locale,
+ hasExtensionsToLoad);
r.render();
}
- private PluginDescriptor extractPluginDescriptor()
- throws MavenReportException
- {
- PluginDescriptorBuilder builder = new EnhancedPluginDescriptorBuilder( rtInfo );
+ private PluginDescriptor extractPluginDescriptor() throws MavenReportException {
+ PluginDescriptorBuilder builder = new EnhancedPluginDescriptorBuilder(rtInfo);
- try ( Reader input = new XmlStreamReader( Files.newInputStream( enhancedPluginXmlFile.toPath() ) ) )
- {
- return builder.build( input );
- }
- catch ( IOException | PlexusConfigurationException e )
- {
- throw new MavenReportException( "Error extracting plugin descriptor from " + enhancedPluginXmlFile, e );
+ try (Reader input = new XmlStreamReader(Files.newInputStream(enhancedPluginXmlFile.toPath()))) {
+ return builder.build(input);
+ } catch (IOException | PlexusConfigurationException e) {
+ throw new MavenReportException("Error extracting plugin descriptor from " + enhancedPluginXmlFile, e);
}
-
}
/**
* {@inheritDoc}
*/
@Override
- public String getDescription( Locale locale )
- {
- return getBundle( locale ).getString( "report.plugin.description" );
+ public String getDescription(Locale locale) {
+ return getBundle(locale).getString("report.plugin.description");
}
/**
* {@inheritDoc}
*/
@Override
- public String getName( Locale locale )
- {
- return getBundle( locale ).getString( "report.plugin.name" );
+ public String getName(Locale locale) {
+ return getBundle(locale).getString("report.plugin.name");
}
/**
* {@inheritDoc}
*/
@Override
- public String getOutputName()
- {
+ public String getOutputName() {
return "plugin-info";
}
@@ -329,42 +318,34 @@ public class PluginReport
* @param locale not null
* @throws MavenReportException if any
*/
- private void generateMojosDocumentation( PluginDescriptor pluginDescriptor, Locale locale )
- throws MavenReportException
- {
- try
- {
+ private void generateMojosDocumentation(PluginDescriptor pluginDescriptor, Locale locale)
+ throws MavenReportException {
+ try {
File outputDir = outputDirectory;
outputDir.mkdirs();
- PluginXdocGenerator generator = new PluginXdocGenerator( getProject(), locale, getReportOutputDirectory(),
- disableInternalJavadocLinkValidation );
- PluginToolsRequest pluginToolsRequest = new DefaultPluginToolsRequest( getProject(), pluginDescriptor );
- generator.execute( outputDir, pluginToolsRequest );
- }
- catch ( GeneratorException e )
- {
- throw new MavenReportException( "Error writing plugin documentation", e );
+ PluginXdocGenerator generator = new PluginXdocGenerator(
+ getProject(), locale, getReportOutputDirectory(), disableInternalJavadocLinkValidation);
+ PluginToolsRequest pluginToolsRequest = new DefaultPluginToolsRequest(getProject(), pluginDescriptor);
+ generator.execute(outputDir, pluginToolsRequest);
+ } catch (GeneratorException e) {
+ throw new MavenReportException("Error writing plugin documentation", e);
}
-
}
/**
* @param locale not null
* @return the bundle for this report
*/
- protected static ResourceBundle getBundle( Locale locale )
- {
- return ResourceBundle.getBundle( "plugin-report", locale, PluginReport.class.getClassLoader() );
+ protected static ResourceBundle getBundle(Locale locale) {
+ return ResourceBundle.getBundle("plugin-report", locale, PluginReport.class.getClassLoader());
}
/**
* Generates an overview page with the list of goals
* and a link to the goal's page.
*/
- static class PluginOverviewRenderer
- extends AbstractMavenReportRenderer
- {
+ static class PluginOverviewRenderer extends AbstractMavenReportRenderer {
private final MavenProject project;
private final Requirements requirements;
@@ -385,15 +366,19 @@ public class PluginReport
* @param pluginDescriptor not null
* @param locale not null
*/
- PluginOverviewRenderer( MavenProject project, Requirements requirements,
- List<RequirementsHistory> requirementsHistories, Sink sink,
- PluginDescriptor pluginDescriptor, Locale locale, boolean hasExtensionsToLoad )
- {
- super( sink );
+ PluginOverviewRenderer(
+ MavenProject project,
+ Requirements requirements,
+ List<RequirementsHistory> requirementsHistories,
+ Sink sink,
+ PluginDescriptor pluginDescriptor,
+ Locale locale,
+ boolean hasExtensionsToLoad) {
+ super(sink);
this.project = project;
- this.requirements = ( requirements == null ? new Requirements() : requirements );
+ this.requirements = (requirements == null ? new Requirements() : requirements);
this.requirementsHistories = requirementsHistories;
@@ -408,58 +393,50 @@ public class PluginReport
* {@inheritDoc}
*/
@Override
- public String getTitle()
- {
- return getBundle( locale ).getString( "report.plugin.title" );
+ public String getTitle() {
+ return getBundle(locale).getString("report.plugin.title");
}
/**
* {@inheritDoc}
*/
@Override
- public void renderBody()
- {
- startSection( getTitle() );
+ public void renderBody() {
+ startSection(getTitle());
- if ( !( pluginDescriptor.getMojos() != null && pluginDescriptor.getMojos().size() > 0 ) )
- {
- paragraph( getBundle( locale ).getString( "report.plugin.goals.nogoal" ) );
+ if (!(pluginDescriptor.getMojos() != null
+ && pluginDescriptor.getMojos().size() > 0)) {
+ paragraph(getBundle(locale).getString("report.plugin.goals.nogoal"));
endSection();
return;
}
- paragraph( getBundle( locale ).getString( "report.plugin.goals.intro" ) );
+ paragraph(getBundle(locale).getString("report.plugin.goals.intro"));
boolean hasMavenReport = false;
- for ( Iterator<MojoDescriptor> i = pluginDescriptor.getMojos().iterator(); i.hasNext(); )
- {
+ for (Iterator<MojoDescriptor> i = pluginDescriptor.getMojos().iterator(); i.hasNext(); ) {
MojoDescriptor mojo = i.next();
- if ( GeneratorUtils.isMavenReport( mojo.getImplementation(), project ) )
- {
+ if (GeneratorUtils.isMavenReport(mojo.getImplementation(), project)) {
hasMavenReport = true;
}
}
startTable();
- String goalColumnName = getBundle( locale ).getString( "report.plugin.goals.column.goal" );
- String isMavenReport = getBundle( locale ).getString( "report.plugin.goals.column.isMavenReport" );
- String descriptionColumnName = getBundle( locale ).getString( "report.plugin.goals.column.description" );
- if ( hasMavenReport )
- {
- tableHeader( new String[] {goalColumnName, isMavenReport, descriptionColumnName} );
- }
- else
- {
- tableHeader( new String[] {goalColumnName, descriptionColumnName} );
+ String goalColumnName = getBundle(locale).getString("report.plugin.goals.column.goal");
+ String isMavenReport = getBundle(locale).getString("report.plugin.goals.column.isMavenReport");
+ String descriptionColumnName = getBundle(locale).getString("report.plugin.goals.column.description");
+ if (hasMavenReport) {
+ tableHeader(new String[] {goalColumnName, isMavenReport, descriptionColumnName});
+ } else {
+ tableHeader(new String[] {goalColumnName, descriptionColumnName});
}
List<MojoDescriptor> mojos = new ArrayList<>();
- mojos.addAll( pluginDescriptor.getMojos() );
- PluginUtils.sortMojos( mojos );
- for ( MojoDescriptor mojo : mojos )
- {
+ mojos.addAll(pluginDescriptor.getMojos());
+ PluginUtils.sortMojos(mojos);
+ for (MojoDescriptor mojo : mojos) {
String goalName = mojo.getFullGoalName();
/*
@@ -469,94 +446,81 @@ public class PluginReport
String goalDocumentationLink = "./" + mojo.getGoal() + "-mojo.html";
String description;
- if ( StringUtils.isNotEmpty( mojo.getDeprecated() ) )
- {
- description =
- "<strong>" + getBundle( locale ).getString( "report.plugin.goal.deprecated" ) + "</strong> "
- + mojo.getDeprecated();
- }
- else if ( StringUtils.isNotEmpty( mojo.getDescription() ) )
- {
+ if (StringUtils.isNotEmpty(mojo.getDeprecated())) {
+ description = "<strong>" + getBundle(locale).getString("report.plugin.goal.deprecated")
+ + "</strong> " + mojo.getDeprecated();
+ } else if (StringUtils.isNotEmpty(mojo.getDescription())) {
description = mojo.getDescription();
- }
- else
- {
- description = getBundle( locale ).getString( "report.plugin.goal.nodescription" );
+ } else {
+ description = getBundle(locale).getString("report.plugin.goal.nodescription");
}
sink.tableRow();
- tableCell( createLinkPatternedText( goalName, goalDocumentationLink ) );
- if ( hasMavenReport )
- {
- if ( GeneratorUtils.isMavenReport( mojo.getImplementation(), project ) )
- {
+ tableCell(createLinkPatternedText(goalName, goalDocumentationLink));
+ if (hasMavenReport) {
+ if (GeneratorUtils.isMavenReport(mojo.getImplementation(), project)) {
sink.tableCell();
- sink.text( getBundle( locale ).getString( "report.plugin.isReport" ) );
+ sink.text(getBundle(locale).getString("report.plugin.isReport"));
sink.tableCell_();
- }
- else
- {
+ } else {
sink.tableCell();
- sink.text( getBundle( locale ).getString( "report.plugin.isNotReport" ) );
+ sink.text(getBundle(locale).getString("report.plugin.isNotReport"));
sink.tableCell_();
}
}
- tableCell( description, true );
+ tableCell(description, true);
sink.tableRow_();
}
endTable();
- startSection( getBundle( locale ).getString( "report.plugin.systemrequirements" ) );
+ startSection(getBundle(locale).getString("report.plugin.systemrequirements"));
- paragraph( getBundle( locale ).getString( "report.plugin.systemrequirements.intro" ) );
+ paragraph(getBundle(locale).getString("report.plugin.systemrequirements.intro"));
startTable();
- String maven = discoverMavenRequirement( project, requirements );
+ String maven = discoverMavenRequirement(project, requirements);
sink.tableRow();
- tableCell( getBundle( locale ).getString( "report.plugin.systemrequirements.maven" ) );
- tableCell( ( maven != null
- ? maven
- : getBundle( locale ).getString( "report.plugin.systemrequirements.nominimum" ) ) );
+ tableCell(getBundle(locale).getString("report.plugin.systemrequirements.maven"));
+ tableCell(
+ (maven != null
+ ? maven
+ : getBundle(locale).getString("report.plugin.systemrequirements.nominimum")));
sink.tableRow_();
- String jdk = discoverJdkRequirement( project, requirements );
+ String jdk = discoverJdkRequirement(project, requirements);
sink.tableRow();
- tableCell( getBundle( locale ).getString( "report.plugin.systemrequirements.jdk" ) );
- tableCell(
- ( jdk != null ? jdk : getBundle( locale ).getString( "report.plugin.systemrequirements.nominimum" ) ) );
+ tableCell(getBundle(locale).getString("report.plugin.systemrequirements.jdk"));
+ tableCell((jdk != null ? jdk : getBundle(locale).getString("report.plugin.systemrequirements.nominimum")));
sink.tableRow_();
String memory = requirements.getMemory();
- if ( StringUtils.isNotEmpty( memory ) )
- {
+ if (StringUtils.isNotEmpty(memory)) {
sink.tableRow();
- tableCell( getBundle( locale ).getString( "report.plugin.systemrequirements.memory" ) );
- tableCell( memory );
+ tableCell(getBundle(locale).getString("report.plugin.systemrequirements.memory"));
+ tableCell(memory);
sink.tableRow_();
}
String diskSpace = requirements.getDiskSpace();
- if ( StringUtils.isNotEmpty( diskSpace ) )
- {
+ if (StringUtils.isNotEmpty(diskSpace)) {
sink.tableRow();
- tableCell( getBundle( locale ).getString( "report.plugin.systemrequirements.diskspace" ) );
- tableCell( diskSpace );
+ tableCell(getBundle(locale).getString("report.plugin.systemrequirements.diskspace"));
+ tableCell(diskSpace);
sink.tableRow_();
}
- if ( requirements.getOthers() != null && requirements.getOthers().size() > 0 )
- {
- for ( Iterator it = requirements.getOthers().keySet().iterator(); it.hasNext(); )
- {
+ if (requirements.getOthers() != null && requirements.getOthers().size() > 0) {
+ for (Iterator it = requirements.getOthers().keySet().iterator(); it.hasNext(); ) {
String key = it.next().toString();
sink.tableRow();
- tableCell( key );
- tableCell( ( StringUtils.isNotEmpty( requirements.getOthers().getProperty( key ) )
- ? requirements.getOthers().getProperty( key )
- : getBundle( locale ).getString( "report.plugin.systemrequirements.nominimum" ) ) );
+ tableCell(key);
+ tableCell(
+ (StringUtils.isNotEmpty(requirements.getOthers().getProperty(key))
+ ? requirements.getOthers().getProperty(key)
+ : getBundle(locale).getString("report.plugin.systemrequirements.nominimum")));
sink.tableRow_();
}
}
@@ -566,37 +530,33 @@ public class PluginReport
renderRequirementsHistories();
- renderUsageSection( hasMavenReport );
+ renderUsageSection(hasMavenReport);
endSection();
}
- private void renderRequirementsHistories()
- {
- if ( requirementsHistories.isEmpty() )
- {
+ private void renderRequirementsHistories() {
+ if (requirementsHistories.isEmpty()) {
return;
}
- startSection( getBundle( locale ).getString( "report.plugin.systemrequirements.history" ) );
- paragraph( getBundle( locale ).getString( "report.plugin.systemrequirements.history.intro" ) );
+ startSection(getBundle(locale).getString("report.plugin.systemrequirements.history"));
+ paragraph(getBundle(locale).getString("report.plugin.systemrequirements.history.intro"));
startTable();
- tableHeader( new String[] {
- getBundle( locale ).getString( "report.plugin.systemrequirements.history.version" ),
- getBundle( locale ).getString( "report.plugin.systemrequirements.history.maven" ),
- getBundle( locale ).getString( "report.plugin.systemrequirements.history.jdk" )
- } );
-
- requirementsHistories.forEach(
- requirementsHistory ->
- {
- sink.tableRow();
- tableCell( requirementsHistory.getVersion() );
- tableCell( requirementsHistory.getMaven() );
- tableCell( requirementsHistory.getJdk() );
- sink.tableRow_();
- } );
+ tableHeader(new String[] {
+ getBundle(locale).getString("report.plugin.systemrequirements.history.version"),
+ getBundle(locale).getString("report.plugin.systemrequirements.history.maven"),
+ getBundle(locale).getString("report.plugin.systemrequirements.history.jdk")
+ });
+
+ requirementsHistories.forEach(requirementsHistory -> {
+ sink.tableRow();
+ tableCell(requirementsHistory.getVersion());
+ tableCell(requirementsHistory.getMaven());
+ tableCell(requirementsHistory.getJdk());
+ sink.tableRow_();
+ });
endTable();
endSection();
@@ -607,81 +567,91 @@ public class PluginReport
*
* @param hasMavenReport If the plugin has a report or not
*/
- private void renderUsageSection( boolean hasMavenReport )
- {
- startSection( getBundle( locale ).getString( "report.plugin.usage" ) );
+ private void renderUsageSection(boolean hasMavenReport) {
+ startSection(getBundle(locale).getString("report.plugin.usage"));
// Configuration
sink.paragraph();
- text( getBundle( locale ).getString( "report.plugin.usage.intro" ) );
+ text(getBundle(locale).getString("report.plugin.usage.intro"));
sink.paragraph_();
StringBuilder sb = new StringBuilder();
- sb.append( "<project>" ).append( '\n' );
- sb.append( " ..." ).append( '\n' );
- sb.append( " <build>" ).append( '\n' );
- sb.append(
- " <!-- " + getBundle( locale ).getString( "report.plugin.usage.pluginManagement" ) + " -->" ).append(
- '\n' );
- sb.append( " <pluginManagement>" ).append( '\n' );
- sb.append( " <plugins>" ).append( '\n' );
- sb.append( " <plugin>" ).append( '\n' );
- sb.append( " <groupId>" ).append( pluginDescriptor.getGroupId() ).append( "</groupId>" ).append(
- '\n' );
- sb.append( " <artifactId>" ).append( pluginDescriptor.getArtifactId() ).append(
- "</artifactId>" ).append( '\n' );
- sb.append( " <version>" ).append( pluginDescriptor.getVersion() ).append( "</version>" ).append(
- '\n' );
- if ( hasExtensionsToLoad )
- {
- sb.append( " <extensions>true</extensions>" ).append(
- '\n' );
+ sb.append("<project>").append('\n');
+ sb.append(" ...").append('\n');
+ sb.append(" <build>").append('\n');
+ sb.append(" <!-- " + getBundle(locale).getString("report.plugin.usage.pluginManagement") + " -->")
+ .append('\n');
+ sb.append(" <pluginManagement>").append('\n');
+ sb.append(" <plugins>").append('\n');
+ sb.append(" <plugin>").append('\n');
+ sb.append(" <groupId>")
+ .append(pluginDescriptor.getGroupId())
+ .append("</groupId>")
+ .append('\n');
+ sb.append(" <artifactId>")
+ .append(pluginDescriptor.getArtifactId())
+ .append("</artifactId>")
+ .append('\n');
+ sb.append(" <version>")
+ .append(pluginDescriptor.getVersion())
+ .append("</version>")
+ .append('\n');
+ if (hasExtensionsToLoad) {
+ sb.append(" <extensions>true</extensions>").append('\n');
}
- sb.append( " </plugin>" ).append( '\n' );
- sb.append( " ..." ).append( '\n' );
- sb.append( " </plugins>" ).append( '\n' );
- sb.append( " </pluginManagement>" ).append( '\n' );
- sb.append( " <!-- " + getBundle( locale ).getString( "report.plugin.usage.plugins" ) + " -->" ).append(
- '\n' );
- sb.append( " <plugins>" ).append( '\n' );
- sb.append( " <plugin>" ).append( '\n' );
- sb.append( " <groupId>" ).append( pluginDescriptor.getGroupId() ).append( "</groupId>" ).append(
- '\n' );
- sb.append( " <artifactId>" ).append( pluginDescriptor.getArtifactId() ).append(
- "</artifactId>" ).append( '\n' );
- sb.append( " </plugin>" ).append( '\n' );
- sb.append( " ..." ).append( '\n' );
- sb.append( " </plugins>" ).append( '\n' );
- sb.append( " </build>" ).append( '\n' );
-
- if ( hasMavenReport )
- {
- sb.append( " ..." ).append( '\n' );
- sb.append(
- " <!-- " + getBundle( locale ).getString( "report.plugin.usage.reporting" ) + " -->" ).append(
- '\n' );
- sb.append( " <reporting>" ).append( '\n' );
- sb.append( " <plugins>" ).append( '\n' );
- sb.append( " <plugin>" ).append( '\n' );
- sb.append( " <groupId>" ).append( pluginDescriptor.getGroupId() ).append( "</groupId>" ).append(
- '\n' );
- sb.append( " <artifactId>" ).append( pluginDescriptor.getArtifactId() ).append(
- "</artifactId>" ).append( '\n' );
- sb.append( " <version>" ).append( pluginDescriptor.getVersion() ).append( "</version>" ).append(
- '\n' );
- sb.append( " </plugin>" ).append( '\n' );
- sb.append( " ..." ).append( '\n' );
- sb.append( " </plugins>" ).append( '\n' );
- sb.append( " </reporting>" ).append( '\n' );
+ sb.append(" </plugin>").append('\n');
+ sb.append(" ...").append('\n');
+ sb.append(" </plugins>").append('\n');
+ sb.append(" </pluginManagement>").append('\n');
+ sb.append(" <!-- " + getBundle(locale).getString("report.plugin.usage.plugins") + " -->")
+ .append('\n');
+ sb.append(" <plugins>").append('\n');
+ sb.append(" <plugin>").append('\n');
+ sb.append(" <groupId>")
+ .append(pluginDescriptor.getGroupId())
+ .append("</groupId>")
+ .append('\n');
+ sb.append(" <artifactId>")
+ .append(pluginDescriptor.getArtifactId())
+ .append("</artifactId>")
+ .append('\n');
+ sb.append(" </plugin>").append('\n');
+ sb.append(" ...").append('\n');
+ sb.append(" </plugins>").append('\n');
+ sb.append(" </build>").append('\n');
+
+ if (hasMavenReport) {
+ sb.append(" ...").append('\n');
+ sb.append(" <!-- " + getBundle(locale).getString("report.plugin.usage.reporting") + " -->")
+ .append('\n');
+ sb.append(" <reporting>").append('\n');
+ sb.append(" <plugins>").append('\n');
+ sb.append(" <plugin>").append('\n');
+ sb.append(" <groupId>")
+ .append(pluginDescriptor.getGroupId())
+ .append("</groupId>")
+ .append('\n');
+ sb.append(" <artifactId>")
+ .append(pluginDescriptor.getArtifactId())
+ .append("</artifactId>")
+ .append('\n');
+ sb.append(" <version>")
+ .append(pluginDescriptor.getVersion())
+ .append("</version>")
+ .append('\n');
+ sb.append(" </plugin>").append('\n');
+ sb.append(" ...").append('\n');
+ sb.append(" </plugins>").append('\n');
+ sb.append(" </reporting>").append('\n');
}
- sb.append( " ..." ).append( '\n' );
- sb.append( "</project>" ).append( '\n' );
+ sb.append(" ...").append('\n');
+ sb.append("</project>").append('\n');
- verbatimText( sb.toString() );
+ verbatimText(sb.toString());
sink.paragraph();
- linkPatternedText( getBundle( locale ).getString( "report.plugin.configuration.end" ) );
+ linkPatternedText(getBundle(locale).getString("report.plugin.configuration.end"));
sink.paragraph_();
endSection();
@@ -695,15 +665,14 @@ public class PluginReport
* @param requirements not null
* @return the Maven version
*/
- private static String discoverMavenRequirement( MavenProject project, Requirements requirements )
- {
+ private static String discoverMavenRequirement(MavenProject project, Requirements requirements) {
String maven = requirements.getMaven();
- if ( maven == null )
- {
- maven = ( project.getPrerequisites() != null ? project.getPrerequisites().getMaven() : null );
+ if (maven == null) {
+ maven = (project.getPrerequisites() != null
+ ? project.getPrerequisites().getMaven()
+ : null);
}
- if ( maven == null )
- {
+ if (maven == null) {
maven = "2.0";
}
@@ -723,75 +692,62 @@ public class PluginReport
* @param requirements not null
* @return the JDK version
*/
- private static String discoverJdkRequirement( MavenProject project, Requirements requirements )
- {
+ private static String discoverJdkRequirement(MavenProject project, Requirements requirements) {
String jdk = requirements.getJdk();
- if ( jdk != null )
- {
+ if (jdk != null) {
return jdk;
}
- Plugin compiler = getCompilerPlugin( project.getBuild().getPluginsAsMap() );
- if ( compiler == null )
- {
- compiler = getCompilerPlugin( project.getPluginManagement().getPluginsAsMap() );
+ Plugin compiler = getCompilerPlugin(project.getBuild().getPluginsAsMap());
+ if (compiler == null) {
+ compiler = getCompilerPlugin(project.getPluginManagement().getPluginsAsMap());
}
- jdk = getPluginParameter( compiler, "release" );
- if ( jdk != null )
- {
+ jdk = getPluginParameter(compiler, "release");
+ if (jdk != null) {
return jdk;
}
- jdk = project.getProperties().getProperty( "maven.compiler.release" );
- if ( jdk != null )
- {
+ jdk = project.getProperties().getProperty("maven.compiler.release");
+ if (jdk != null) {
return jdk;
}
- jdk = getPluginParameter( compiler, "target" );
- if ( jdk != null )
- {
+ jdk = getPluginParameter(compiler, "target");
+ if (jdk != null) {
return jdk;
}
// default value
- jdk = project.getProperties().getProperty( "maven.compiler.target" );
- if ( jdk != null )
- {
+ jdk = project.getProperties().getProperty("maven.compiler.target");
+ if (jdk != null) {
return jdk;
}
// return "1.5" by default?
- String version = ( compiler == null ) ? null : compiler.getVersion();
+ String version = (compiler == null) ? null : compiler.getVersion();
- if ( version != null )
- {
+ if (version != null) {
return "Default target for maven-compiler-plugin version " + version;
}
return "Unknown";
}
- private static Plugin getCompilerPlugin( Map<String, Plugin> pluginsAsMap )
- {
- return pluginsAsMap.get( "org.apache.maven.plugins:maven-compiler-plugin" );
+ private static Plugin getCompilerPlugin(Map<String, Plugin> pluginsAsMap) {
+ return pluginsAsMap.get("org.apache.maven.plugins:maven-compiler-plugin");
}
- private static String getPluginParameter( Plugin plugin, String parameter )
- {
- if ( plugin != null )
- {
+ private static String getPluginParameter(Plugin plugin, String parameter) {
+ if (plugin != null) {
Xpp3Dom pluginConf = (Xpp3Dom) plugin.getConfiguration();
- if ( pluginConf != null )
- {
- Xpp3Dom target = pluginConf.getChild( parameter );
+ if (pluginConf != null) {
+ Xpp3Dom target = pluginConf.getChild(parameter);
- if ( target != null )
- {
+ if (target != null) {
return target.getValue();
}
}
diff --git a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/report_old/Requirements.java b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/report_old/Requirements.java
index cb420995..c5302f42 100644
--- a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/report_old/Requirements.java
+++ b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/report_old/Requirements.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugin.plugin.report_old;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.plugin.plugin.report_old;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.plugin.plugin.report_old;
import java.util.Properties;
@@ -27,8 +26,7 @@ import java.util.Properties;
* @deprecated will be removed in the next major version
*/
@Deprecated
-public class Requirements
-{
+public class Requirements {
/**
* The minimum version of Maven to run this plugin.
*/
@@ -54,41 +52,35 @@ public class Requirements
*/
private java.util.Properties others;
- public String getMaven()
- {
+ public String getMaven() {
return maven;
}
- public String getJdk()
- {
+ public String getJdk() {
return jdk;
}
- public String getMemory()
- {
+ public String getMemory() {
return memory;
}
- public String getDiskSpace()
- {
+ public String getDiskSpace() {
return diskSpace;
}
- public Properties getOthers()
- {
+ public Properties getOthers() {
return others;
}
@Override
- public String toString()
- {
- final StringBuilder sb = new StringBuilder( "Requirements{" );
- sb.append( "maven='" ).append( maven ).append( '\'' );
- sb.append( ", jdk='" ).append( jdk ).append( '\'' );
- sb.append( ", memory='" ).append( memory ).append( '\'' );
- sb.append( ", diskSpace='" ).append( diskSpace ).append( '\'' );
- sb.append( ", others=" ).append( others );
- sb.append( '}' );
+ public String toString() {
+ final StringBuilder sb = new StringBuilder("Requirements{");
+ sb.append("maven='").append(maven).append('\'');
+ sb.append(", jdk='").append(jdk).append('\'');
+ sb.append(", memory='").append(memory).append('\'');
+ sb.append(", diskSpace='").append(diskSpace).append('\'');
+ sb.append(", others=").append(others);
+ sb.append('}');
return sb.toString();
}
}
diff --git a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/report_old/RequirementsHistory.java b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/report_old/RequirementsHistory.java
index 438d8d74..974b3dfd 100644
--- a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/report_old/RequirementsHistory.java
+++ b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/report_old/RequirementsHistory.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugin.plugin.report_old;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.plugin.plugin.report_old;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.plugin.plugin.report_old;
/**
* Plugin requirements history.
@@ -25,8 +24,7 @@ package org.apache.maven.plugin.plugin.report_old;
* @author Slawomir Jaranowski
*/
@Deprecated
-public class RequirementsHistory
-{
+public class RequirementsHistory {
/**
* The plugin version.
*/
@@ -42,29 +40,25 @@ public class RequirementsHistory
*/
private String jdk;
- public String getVersion()
- {
+ public String getVersion() {
return version;
}
- public String getMaven()
- {
+ public String getMaven() {
return maven;
}
- public String getJdk()
- {
+ public String getJdk() {
return jdk;
}
@Override
- public String toString()
- {
- final StringBuilder sb = new StringBuilder( "RequirementsHistory{" );
- sb.append( "version='" ).append( version ).append( '\'' );
- sb.append( ", maven='" ).append( maven ).append( '\'' );
- sb.append( ", jdk='" ).append( jdk ).append( '\'' );
- sb.append( '}' );
+ public String toString() {
+ final StringBuilder sb = new StringBuilder("RequirementsHistory{");
+ sb.append("version='").append(version).append('\'');
+ sb.append(", maven='").append(maven).append('\'');
+ sb.append(", jdk='").append(jdk).append('\'');
+ sb.append('}');
return sb.toString();
}
}
diff --git a/maven-plugin-plugin/src/main/java/org/apache/maven/plugins/plugin/descriptor_old/EnhancedPluginDescriptorBuilder.java b/maven-plugin-plugin/src/main/java/org/apache/maven/plugins/plugin/descriptor_old/EnhancedPluginDescriptorBuilder.java
index 75515656..c62b9e7c 100644
--- a/maven-plugin-plugin/src/main/java/org/apache/maven/plugins/plugin/descriptor_old/EnhancedPluginDescriptorBuilder.java
+++ b/maven-plugin-plugin/src/main/java/org/apache/maven/plugins/plugin/descriptor_old/EnhancedPluginDescriptorBuilder.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugins.plugin.descriptor_old;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.plugins.plugin.descriptor_old;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.plugins.plugin.descriptor_old;
import java.net.URI;
@@ -38,49 +37,44 @@ import org.codehaus.plexus.configuration.PlexusConfigurationException;
* Populates the slightly extended {@link Parameter} object {@link EnhancedParameterWrapper}.
*/
@Deprecated
-public class EnhancedPluginDescriptorBuilder extends PluginDescriptorBuilder
-{
+public class EnhancedPluginDescriptorBuilder extends PluginDescriptorBuilder {
private final boolean requireAddingMissingParameterSinceField;
-
- public EnhancedPluginDescriptorBuilder( RuntimeInformation rtInfo )
- {
- this( rtInfo.isMavenVersion( "[,3.3.9]" ) );
+
+ public EnhancedPluginDescriptorBuilder(RuntimeInformation rtInfo) {
+ this(rtInfo.isMavenVersion("[,3.3.9]"));
}
- EnhancedPluginDescriptorBuilder( boolean requireAddingMissingParameterSinceField )
- {
+ EnhancedPluginDescriptorBuilder(boolean requireAddingMissingParameterSinceField) {
this.requireAddingMissingParameterSinceField = requireAddingMissingParameterSinceField;
}
@Override
- public MojoDescriptor buildComponentDescriptor( PlexusConfiguration c, PluginDescriptor pluginDescriptor )
- throws PlexusConfigurationException
- {
- MojoDescriptor mojoDescriptor = super.buildComponentDescriptor( c, pluginDescriptor );
-
+ public MojoDescriptor buildComponentDescriptor(PlexusConfiguration c, PluginDescriptor pluginDescriptor)
+ throws PlexusConfigurationException {
+ MojoDescriptor mojoDescriptor = super.buildComponentDescriptor(c, pluginDescriptor);
+
// ----------------------------------------------------------------------
// Parameters
// ----------------------------------------------------------------------
- PlexusConfiguration[] parameterConfigurations = c.getChild( "parameters" ).getChildren( "parameter" );
+ PlexusConfiguration[] parameterConfigurations = c.getChild("parameters").getChildren("parameter");
- for ( PlexusConfiguration d : parameterConfigurations )
- {
- String parameterName = d.getChild( "name" ).getValue();
- // don't call getParameterMap() to not populate
- Parameter pd = mojoDescriptor.getParameterMap().get( parameterName );
- if ( requireAddingMissingParameterSinceField )
- {
- addMissingParameterSinceField( pd, d );
+ for (PlexusConfiguration d : parameterConfigurations) {
+ String parameterName = d.getChild("name").getValue();
+ // don't call getParameterMap() to not populate
+ Parameter pd = mojoDescriptor.getParameterMap().get(parameterName);
+ if (requireAddingMissingParameterSinceField) {
+ addMissingParameterSinceField(pd, d);
}
- PlexusConfiguration configTypeJavadocUrl = d.getChild( "typeJavadocUrl", false );
- if ( configTypeJavadocUrl != null )
- {
+ PlexusConfiguration configTypeJavadocUrl = d.getChild("typeJavadocUrl", false);
+ if (configTypeJavadocUrl != null) {
String parameterTypeJavadocUrl = configTypeJavadocUrl.getValue();
- EnhancedParameterWrapper enhancedParameter = new EnhancedParameterWrapper( pd );
- enhancedParameter.setTypeJavadocUrl( URI.create( parameterTypeJavadocUrl ) );
- mojoDescriptor.getParameters().set( mojoDescriptor.getParameters().indexOf( pd ), enhancedParameter );
- mojoDescriptor.getParameterMap().put( parameterName, enhancedParameter );
+ EnhancedParameterWrapper enhancedParameter = new EnhancedParameterWrapper(pd);
+ enhancedParameter.setTypeJavadocUrl(URI.create(parameterTypeJavadocUrl));
+ mojoDescriptor
+ .getParameters()
+ .set(mojoDescriptor.getParameters().indexOf(pd), enhancedParameter);
+ mojoDescriptor.getParameterMap().put(parameterName, enhancedParameter);
}
}
return mojoDescriptor;
@@ -90,15 +84,14 @@ public class EnhancedPluginDescriptorBuilder extends PluginDescriptorBuilder
* Reads the plugin descriptor and adds the fix for <a href="https://issues.apache.org/jira/browse/MNG-6109">
* MNG-6109</a> when using Maven-3.3.9 and before.
* Method can be removed once Maven 3.5.0 is the prerequisite for this plugin.
- * @throws PlexusConfigurationException
- *
+ * @throws PlexusConfigurationException
+ *
* @since 3.5.1
* @see <a href="https://issues.apache.org/jira/browse/MNG-6109">MNG-6109</a>
* @see <a href="https://issues.apache.org/jira/browse/MPLUGIN-319">MPLUGIN-319</a>
*/
- void addMissingParameterSinceField( Parameter pd, PlexusConfiguration d ) throws PlexusConfigurationException
- {
- String parameterSince = d.getChild( "since" ).getValue();
- pd.setSince( parameterSince );
- }
+ void addMissingParameterSinceField(Parameter pd, PlexusConfiguration d) throws PlexusConfigurationException {
+ String parameterSince = d.getChild("since").getValue();
+ pd.setSince(parameterSince);
+ }
}
diff --git a/maven-plugin-plugin/src/test/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojoTest.java b/maven-plugin-plugin/src/test/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojoTest.java
index 71444a61..daf24f73 100644
--- a/maven-plugin-plugin/src/test/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojoTest.java
+++ b/maven-plugin-plugin/src/test/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojoTest.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugin.plugin;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.plugin.plugin;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.plugin.plugin;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.plugin.plugin;
import java.util.stream.Stream;
@@ -31,44 +30,35 @@ import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.params.provider.Arguments.arguments;
// at least one test class must be public for test-javadoc report
-public class DescriptorGeneratorMojoTest
-{
- public static Stream<Arguments> goalPrefixes()
- {
+public class DescriptorGeneratorMojoTest {
+ public static Stream<Arguments> goalPrefixes() {
return Stream.of(
- arguments( null, "maven-plugin-plugin", "plugin" ),
- arguments( null, "maven-plugin-report-plugin", "plugin-report" ),
- arguments( null, "maven-default-plugin", "default" ),
- arguments( null, "default-maven-plugin", "default" ),
- arguments( null, "default-maven-plugin", "default" ),
- arguments( "foo.bar", "maven-plugin", "bar" ),
- arguments( "foo", "maven-plugin", "foo" )
- );
+ arguments(null, "maven-plugin-plugin", "plugin"),
+ arguments(null, "maven-plugin-report-plugin", "plugin-report"),
+ arguments(null, "maven-default-plugin", "default"),
+ arguments(null, "default-maven-plugin", "default"),
+ arguments(null, "default-maven-plugin", "default"),
+ arguments("foo.bar", "maven-plugin", "bar"),
+ arguments("foo", "maven-plugin", "foo"));
}
@ParameterizedTest
@MethodSource("goalPrefixes")
- void defaultGoalPrefix(String groupId, String artifactId, String expectedGoal)
- {
- assertThat( DescriptorGeneratorMojo.getDefaultGoalPrefix( newProject( groupId, artifactId ) ),
- is( expectedGoal ) );
+ void defaultGoalPrefix(String groupId, String artifactId, String expectedGoal) {
+ assertThat(DescriptorGeneratorMojo.getDefaultGoalPrefix(newProject(groupId, artifactId)), is(expectedGoal));
}
-
- private MavenProject newProject( final String groupId, final String artifactId )
- {
+
+ private MavenProject newProject(final String groupId, final String artifactId) {
return new MavenProject() {
@Override
- public String getGroupId()
- {
+ public String getGroupId() {
return groupId;
}
-
+
@Override
- public String getArtifactId()
- {
+ public String getArtifactId() {
return artifactId;
}
};
}
-
}
diff --git a/maven-plugin-plugin/src/test/java/org/apache/maven/plugin/plugin/HelpGeneratorMojoTest.java b/maven-plugin-plugin/src/test/java/org/apache/maven/plugin/plugin/HelpGeneratorMojoTest.java
index 5d657091..748a4ad2 100644
--- a/maven-plugin-plugin/src/test/java/org/apache/maven/plugin/plugin/HelpGeneratorMojoTest.java
+++ b/maven-plugin-plugin/src/test/java/org/apache/maven/plugin/plugin/HelpGeneratorMojoTest.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugin.plugin;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.plugin.plugin;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.plugin.plugin;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.plugin.plugin;
import java.util.stream.Stream;
@@ -28,36 +27,31 @@ import org.junit.jupiter.params.provider.MethodSource;
import static org.junit.jupiter.api.Assertions.assertEquals;
-class HelpGeneratorMojoTest
-{
+class HelpGeneratorMojoTest {
- public static Stream<Arguments> packageNameShouldBeCorrect()
- {
+ public static Stream<Arguments> packageNameShouldBeCorrect() {
return Stream.of(
- Arguments.of( aProject( "groupId", "artifactId" ), "groupId.artifactId" ),
- Arguments.of( aProject( "groupId", "123-artifactId" ), "groupId._123_artifactId" ),
- Arguments.of( aProject( "group-Id", "artifact-Id" ), "group_Id.artifact_Id" ),
- Arguments.of( aProject( "group-Id", "int" ), "group_Id._int" )
- );
+ Arguments.of(aProject("groupId", "artifactId"), "groupId.artifactId"),
+ Arguments.of(aProject("groupId", "123-artifactId"), "groupId._123_artifactId"),
+ Arguments.of(aProject("group-Id", "artifact-Id"), "group_Id.artifact_Id"),
+ Arguments.of(aProject("group-Id", "int"), "group_Id._int"));
}
@ParameterizedTest
@MethodSource
- void packageNameShouldBeCorrect( MavenProject project, String expectedPackageName )
- {
+ void packageNameShouldBeCorrect(MavenProject project, String expectedPackageName) {
HelpGeneratorMojo mojo = new HelpGeneratorMojo();
mojo.project = project;
String packageName = mojo.getHelpPackageName();
- assertEquals( expectedPackageName, packageName );
+ assertEquals(expectedPackageName, packageName);
}
- private static MavenProject aProject( String groupId, String artifactId )
- {
+ private static MavenProject aProject(String groupId, String artifactId) {
MavenProject mavenProject = new MavenProject();
- mavenProject.setGroupId( groupId );
- mavenProject.setArtifactId( artifactId );
+ mavenProject.setGroupId(groupId);
+ mavenProject.setArtifactId(artifactId);
return mavenProject;
}
}
diff --git a/maven-plugin-report-plugin/pom.xml b/maven-plugin-report-plugin/pom.xml
index d31cdb4e..0ac78f8f 100644
--- a/maven-plugin-report-plugin/pom.xml
+++ b/maven-plugin-report-plugin/pom.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Licensed to the Apache Software Foundation (ASF) under one
~ or more contributor license agreements. See the NOTICE file
@@ -18,238 +18,236 @@
~ under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>maven-plugin-tools</artifactId>
- <groupId>org.apache.maven.plugin-tools</groupId>
- <version>3.8.0-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools</artifactId>
+ <version>3.8.0-SNAPSHOT</version>
+ </parent>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-report-plugin</artifactId>
- <packaging>maven-plugin</packaging>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-report-plugin</artifactId>
+ <packaging>maven-plugin</packaging>
- <name>Maven Plugin Report Plugin</name>
- <description>
- The Plugin Report Plugin is used to create reports about the plugin being built.
- </description>
+ <name>Maven Plugin Report Plugin</name>
+ <description>The Plugin Report Plugin is used to create reports about the plugin being built.</description>
- <prerequisites>
- <maven>${mavenVersion}</maven>
- </prerequisites>
+ <prerequisites>
+ <maven>${mavenVersion}</maven>
+ </prerequisites>
- <properties>
- <it.debug>true</it.debug>
- </properties>
+ <properties>
+ <it.debug>true</it.debug>
+ </properties>
- <dependencies>
- <!-- Maven -->
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.reporting</groupId>
- <artifactId>maven-reporting-api</artifactId>
- <version>${reportingApiVersion}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-model</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact</artifactId>
- <scope>provided</scope>
- </dependency>
+ <dependencies>
+ <!-- Maven -->
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.reporting</groupId>
+ <artifactId>maven-reporting-api</artifactId>
+ <version>${reportingApiVersion}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-model</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ <scope>provided</scope>
+ </dependency>
- <!-- plugin tools -->
- <dependency>
- <groupId>org.apache.maven.plugin-tools</groupId>
- <artifactId>maven-plugin-annotations</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.plugin-tools</groupId>
- <artifactId>maven-plugin-tools-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.plugin-tools</groupId>
- <artifactId>maven-plugin-tools-generators</artifactId>
- </dependency>
+ <!-- plugin tools -->
+ <dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-annotations</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-generators</artifactId>
+ </dependency>
- <!-- doxia -->
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-sink-api</artifactId>
- </dependency>
+ <!-- doxia -->
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-sink-api</artifactId>
+ </dependency>
- <!-- shared -->
- <dependency>
- <groupId>org.apache.maven.reporting</groupId>
- <artifactId>maven-reporting-impl</artifactId>
- </dependency>
+ <!-- shared -->
+ <dependency>
+ <groupId>org.apache.maven.reporting</groupId>
+ <artifactId>maven-reporting-impl</artifactId>
+ </dependency>
- <!-- plexus -->
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- </dependency>
+ <!-- plexus -->
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </dependency>
- <!-- tests -->
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-api</artifactId>
- <scope>test</scope>
- </dependency>
- <!-- Depenency is listed here because it's used in ITs -->
- <dependency>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-plugin</artifactId>
- <scope>test</scope>
- <optional>true</optional>
- </dependency>
- </dependencies>
+ <!-- tests -->
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <!-- Depenency is listed here because it's used in ITs -->
+ <dependency>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <scope>test</scope>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <filtering>true</filtering>
+ <directory>src/main/filtered-resources</directory>
+ </resource>
+ </resources>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes combine.children="append">
+ <!-- This file should exactly match the output of this project -->
+ <exclude>src/test/resources/plugin-enhanced.xml</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>ensure-no-container-api</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <bannedDependencies>
+ <excludes>
+ <exclude>org.codehaus.plexus:plexus-component-api</exclude>
+ </excludes>
+ <message>The new containers are not supported. You probably added a dependency that is missing the exclusions.</message>
+ </bannedDependencies>
+ </rules>
+ <fail>true</fail>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <configuration>
+ <goalPrefix>plugin-report</goalPrefix>
+ </configuration>
+ <executions>
+ <execution>
+ <id>generated-helpmojo</id>
+ <goals>
+ <goal>helpmojo</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
- <build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- <resource>
- <directory>src/main/filtered-resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <excludes combine.children="append">
- <!-- This file should exactly match the output of this project -->
- <exclude>src/test/resources/plugin-enhanced.xml</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-report-plugin</artifactId>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>report</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ </plugins>
+ </reporting>
+
+ <profiles>
+ <profile>
+ <id>reporting</id>
+ <reporting>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>enforce</goal>
- </goals>
- <id>ensure-no-container-api</id>
- <configuration>
- <rules>
- <bannedDependencies>
- <excludes>
- <exclude>org.codehaus.plexus:plexus-component-api</exclude>
- </excludes>
- <message>The new containers are not supported. You probably added a dependency that is missing the exclusions.</message>
- </bannedDependencies>
- </rules>
- <fail>true</fail>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-plugin</artifactId>
- <executions>
- <execution>
- <id>generated-helpmojo</id>
- <goals>
- <goal>helpmojo</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <goalPrefix>plugin-report</goalPrefix>
- </configuration>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-invoker-plugin</artifactId>
+ </plugin>
</plugins>
- </build>
-
- <reporting>
+ </reporting>
+ </profile>
+ <profile>
+ <id>run-its</id>
+ <build>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-report-plugin</artifactId>
- <reportSets>
- <reportSet>
- <reports>
- <report>report</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-invoker-plugin</artifactId>
+ <configuration>
+ <projectsDirectory>src/it</projectsDirectory>
+ <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
+ <preBuildHookScript>setup</preBuildHookScript>
+ <postBuildHookScript>verify</postBuildHookScript>
+ <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
+ <settingsFile>src/it/settings.xml</settingsFile>
+ <streamLogsOnFailures>true</streamLogsOnFailures>
+ <filterProperties>
+ <sitePluginVersion>3.12.1</sitePluginVersion>
+ <projectInfoReportsPlugin>3.4.1</projectInfoReportsPlugin>
+ <antVersion>${antVersion}</antVersion>
+ </filterProperties>
+ <properties>
+ <maven.compiler.source>${maven.compiler.source}</maven.compiler.source>
+ <maven.compiler.target>${maven.compiler.target}</maven.compiler.target>
+ </properties>
+ </configuration>
+ <executions>
+ <execution>
+ <id>integration-test</id>
+ <goals>
+ <goal>install</goal>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
- </reporting>
-
- <profiles>
- <profile>
- <id>reporting</id>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-invoker-plugin</artifactId>
- </plugin>
- </plugins>
- </reporting>
- </profile>
- <profile>
- <id>run-its</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-invoker-plugin</artifactId>
- <configuration>
- <projectsDirectory>src/it</projectsDirectory>
- <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
- <preBuildHookScript>setup</preBuildHookScript>
- <postBuildHookScript>verify</postBuildHookScript>
- <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
- <settingsFile>src/it/settings.xml</settingsFile>
- <streamLogsOnFailures>true</streamLogsOnFailures>
- <filterProperties>
- <sitePluginVersion>3.12.1</sitePluginVersion>
- <projectInfoReportsPlugin>3.4.1</projectInfoReportsPlugin>
- <antVersion>${antVersion}</antVersion>
- </filterProperties>
- <properties>
- <maven.compiler.source>${maven.compiler.source}</maven.compiler.source>
- <maven.compiler.target>${maven.compiler.target}</maven.compiler.target>
- </properties>
- </configuration>
- <executions>
- <execution>
- <id>integration-test</id>
- <goals>
- <goal>install</goal>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/maven-plugin-report-plugin/src/it/fix-maven-since-3.x/javasample-maven-plugin/src/main/java/test/MyMojo.java b/maven-plugin-report-plugin/src/it/fix-maven-since-3.x/javasample-maven-plugin/src/main/java/test/MyMojo.java
index 978e6242..4a21b144 100644
--- a/maven-plugin-report-plugin/src/it/fix-maven-since-3.x/javasample-maven-plugin/src/main/java/test/MyMojo.java
+++ b/maven-plugin-report-plugin/src/it/fix-maven-since-3.x/javasample-maven-plugin/src/main/java/test/MyMojo.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package test;
/*
@@ -16,24 +34,22 @@ package test;
* limitations under the License.
*/
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugin.MojoExecutionException;
-
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+
/**
* Goal which touches a timestamp file.
*
* @goal touch
* @since 1.0
- *
+ *
* @phase process-sources
*/
-public class MyMojo
- extends AbstractMojo
-{
+public class MyMojo extends AbstractMojo {
/**
* Location of the file.
* @parameter property="project.build.directory"
@@ -41,25 +57,19 @@ public class MyMojo
*/
private File outputDirectory;
- public void execute()
- throws MojoExecutionException
- {
+ public void execute() throws MojoExecutionException {
File f = outputDirectory;
- if ( !f.exists() )
- {
+ if (!f.exists()) {
f.mkdirs();
}
- File touch = new File( f, "touch.txt" );
+ File touch = new File(f, "touch.txt");
- try ( FileWriter w = new FileWriter( touch ) )
- {
- w.write( "touch.txt" );
- }
- catch ( IOException e )
- {
- throw new MojoExecutionException( "Error creating file " + touch, e );
+ try (FileWriter w = new FileWriter(touch)) {
+ w.write("touch.txt");
+ } catch (IOException e) {
+ throw new MojoExecutionException("Error creating file " + touch, e);
}
}
}
diff --git a/maven-plugin-report-plugin/src/it/mplugin-191/src/main/java/org/apache/maven/plugins/plugin/it/MyMojo.java b/maven-plugin-report-plugin/src/it/mplugin-191/src/main/java/org/apache/maven/plugins/plugin/it/MyMojo.java
index 0f75f16a..d5b9e44a 100644
--- a/maven-plugin-report-plugin/src/it/mplugin-191/src/main/java/org/apache/maven/plugins/plugin/it/MyMojo.java
+++ b/maven-plugin-report-plugin/src/it/mplugin-191/src/main/java/org/apache/maven/plugins/plugin/it/MyMojo.java
@@ -1,21 +1,26 @@
-package org.apache.maven.plugins.plugin.it;
-
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
+package org.apache.maven.plugins.plugin.it;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
@@ -23,42 +28,30 @@ import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-
/**
* Goal which touches a timestamp file.
*/
@Mojo(name = "touch", defaultPhase = LifecyclePhase.PROCESS_RESOURCES)
-public class MyMojo
- extends AbstractMojo
-{
+public class MyMojo extends AbstractMojo {
/**
* Location of the file.
*/
@Parameter(defaultValue = "${project.build.directory}", required = true)
private File outputDirectory;
- public void execute()
- throws MojoExecutionException
- {
+ public void execute() throws MojoExecutionException {
File f = outputDirectory;
- if ( !f.exists() )
- {
+ if (!f.exists()) {
f.mkdirs();
}
- File touch = new File( f, "touch.txt" );
+ File touch = new File(f, "touch.txt");
- try ( FileWriter w = new FileWriter( touch ) )
- {
- w.write( "touch.txt" );
- }
- catch ( IOException e )
- {
- throw new MojoExecutionException( "Error creating file " + touch, e );
+ try (FileWriter w = new FileWriter(touch)) {
+ w.write("touch.txt");
+ } catch (IOException e) {
+ throw new MojoExecutionException("Error creating file " + touch, e);
}
}
}
diff --git a/maven-plugin-report-plugin/src/it/mplugin-319_report-since/src/main/java/org/MyMojo.java b/maven-plugin-report-plugin/src/it/mplugin-319_report-since/src/main/java/org/MyMojo.java
index 915a2db1..49b705b2 100644
--- a/maven-plugin-report-plugin/src/it/mplugin-319_report-since/src/main/java/org/MyMojo.java
+++ b/maven-plugin-report-plugin/src/it/mplugin-319_report-since/src/main/java/org/MyMojo.java
@@ -1,67 +1,62 @@
-package org;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.plugin.AbstractMojo;
-
-/**
- * Does nothing.
- *
- * @goal noop
- * @phase process-sources
- * @requiresDependencyResolution test
- * @requiresDirectInvocation true
- * @requiresOnline
- * @inheritByDefault false
- * @execute phase="compile"
- * @aggregator
- * @since 1.0
- *
- * @deprecated You don't use test goals, do you?
- */
-public class MyMojo
- extends AbstractMojo
-{
-
- /**
- * This is a test.
- *
- * @parameter
- * @required
- */
- @SuppressWarnings( "unused" )
- private String required;
-
- /**
- * This is a test.
- *
- * @parameter expression="${string}" default-value="${project.version}/</markup-must-be-escaped>"
- * @deprecated Just testing.
- * @since 1.1
- */
- @SuppressWarnings( "unused" )
- private String string;
-
- public void execute()
- {
- // intentional do nothing
- }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org;
+
+import org.apache.maven.plugin.AbstractMojo;
+
+/**
+ * Does nothing.
+ *
+ * @goal noop
+ * @phase process-sources
+ * @requiresDependencyResolution test
+ * @requiresDirectInvocation true
+ * @requiresOnline
+ * @inheritByDefault false
+ * @execute phase="compile"
+ * @aggregator
+ * @since 1.0
+ *
+ * @deprecated You don't use test goals, do you?
+ */
+public class MyMojo extends AbstractMojo {
+
+ /**
+ * This is a test.
+ *
+ * @parameter
+ * @required
+ */
+ @SuppressWarnings("unused")
+ private String required;
+
+ /**
+ * This is a test.
+ *
+ * @parameter expression="${string}" default-value="${project.version}/</markup-must-be-escaped>"
+ * @deprecated Just testing.
+ * @since 1.1
+ */
+ @SuppressWarnings("unused")
+ private String string;
+
+ public void execute() {
+ // intentional do nothing
+ }
+}
diff --git a/maven-plugin-report-plugin/src/it/mplugin-319_report-since/verify.groovy b/maven-plugin-report-plugin/src/it/mplugin-319_report-since/verify.groovy
index 219a9ba0..d5b23e88 100644
--- a/maven-plugin-report-plugin/src/it/mplugin-319_report-since/verify.groovy
+++ b/maven-plugin-report-plugin/src/it/mplugin-319_report-since/verify.groovy
@@ -1,4 +1,3 @@
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
diff --git a/maven-plugin-report-plugin/src/it/mplugin-394_report-encoding/src/main/java/test/MyMojo.java b/maven-plugin-report-plugin/src/it/mplugin-394_report-encoding/src/main/java/test/MyMojo.java
index 9041f19d..006e7cb0 100644
--- a/maven-plugin-report-plugin/src/it/mplugin-394_report-encoding/src/main/java/test/MyMojo.java
+++ b/maven-plugin-report-plugin/src/it/mplugin-394_report-encoding/src/main/java/test/MyMojo.java
@@ -1,5 +1,3 @@
-package test;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -8,9 +6,9 @@ package test;
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,6 +16,7 @@ package test;
* specific language governing permissions and limitations
* under the License.
*/
+package test;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugins.annotations.Mojo;
@@ -31,10 +30,8 @@ import org.apache.maven.plugins.annotations.Parameter;
* generated site to contain all characters from above, even if the system
* encoding is not UTF-8.
*/
-@Mojo( name= "test" )
-public class MyMojo
- extends AbstractMojo
-{
+@Mojo(name = "test")
+public class MyMojo extends AbstractMojo {
/**
* Parameter-Description with some non-ASCII characters: ÈÉÊË€
@@ -42,9 +39,5 @@ public class MyMojo
@Parameter
private String testParam;
-
- public void execute()
- {
- }
-
+ public void execute() {}
}
diff --git a/maven-plugin-report-plugin/src/it/plugin-info-jdk-default-version/src/main/java/org/apache/maven/plugins/issues/plugin/MyMojo.java b/maven-plugin-report-plugin/src/it/plugin-info-jdk-default-version/src/main/java/org/apache/maven/plugins/issues/plugin/MyMojo.java
index 2cabe0c7..171e9849 100644
--- a/maven-plugin-report-plugin/src/it/plugin-info-jdk-default-version/src/main/java/org/apache/maven/plugins/issues/plugin/MyMojo.java
+++ b/maven-plugin-report-plugin/src/it/plugin-info-jdk-default-version/src/main/java/org/apache/maven/plugins/issues/plugin/MyMojo.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.maven.plugins.issues.plugin;
/*
@@ -16,23 +34,21 @@ package org.apache.maven.plugins.issues.plugin;
* limitations under the License.
*/
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugin.MojoExecutionException;
-
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+
/**
* Goal which touches a timestamp file.
*
* @goal touch
- *
+ *
* @phase process-sources
*/
-public class MyMojo
- extends AbstractMojo
-{
+public class MyMojo extends AbstractMojo {
/**
* Location of the file.
* @parameter expression="${project.build.directory}"
@@ -40,25 +56,19 @@ public class MyMojo
*/
private File outputDirectory;
- public void execute()
- throws MojoExecutionException
- {
+ public void execute() throws MojoExecutionException {
File f = outputDirectory;
- if ( !f.exists() )
- {
+ if (!f.exists()) {
f.mkdirs();
}
- File touch = new File( f, "touch.txt" );
+ File touch = new File(f, "touch.txt");
- try ( FileWriter w = new FileWriter( touch ) )
- {
- w.write( "touch.txt" );
- }
- catch ( IOException e )
- {
- throw new MojoExecutionException( "Error creating file " + touch, e );
+ try (FileWriter w = new FileWriter(touch)) {
+ w.write("touch.txt");
+ } catch (IOException e) {
+ throw new MojoExecutionException("Error creating file " + touch, e);
}
}
}
diff --git a/maven-plugin-report-plugin/src/it/plugin-info-jdk-default-version/verify.groovy b/maven-plugin-report-plugin/src/it/plugin-info-jdk-default-version/verify.groovy
index 45dae759..fb6378ce 100644
--- a/maven-plugin-report-plugin/src/it/plugin-info-jdk-default-version/verify.groovy
+++ b/maven-plugin-report-plugin/src/it/plugin-info-jdk-default-version/verify.groovy
@@ -1,4 +1,3 @@
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
diff --git a/maven-plugin-report-plugin/src/it/plugin-report-annotations/src/main/java/org/DummyReport.java b/maven-plugin-report-plugin/src/it/plugin-report-annotations/src/main/java/org/DummyReport.java
index 24c7a418..bad5436e 100644
--- a/maven-plugin-report-plugin/src/it/plugin-report-annotations/src/main/java/org/DummyReport.java
+++ b/maven-plugin-report-plugin/src/it/plugin-report-annotations/src/main/java/org/DummyReport.java
@@ -1,5 +1,3 @@
-package org;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,11 @@ package org;
* specific language governing permissions and limitations
* under the License.
*/
+package org;
+
+import java.io.File;
+import java.util.Locale;
+import java.util.ResourceBundle;
import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.doxia.siterenderer.Renderer;
@@ -31,22 +34,16 @@ import org.apache.maven.reporting.AbstractMavenReport;
import org.apache.maven.reporting.AbstractMavenReportRenderer;
import org.apache.maven.reporting.MavenReportException;
-import java.io.File;
-import java.util.Locale;
-import java.util.ResourceBundle;
-
/**
* Dummy Reporting Plugin.
*/
-@Mojo( name = "report", requiresReports = true )
-@Execute( phase = LifecyclePhase.COMPILE )
-public class DummyReport
- extends AbstractMavenReport
-{
+@Mojo(name = "report", requiresReports = true)
+@Execute(phase = LifecyclePhase.COMPILE)
+public class DummyReport extends AbstractMavenReport {
/**
* Report output directory.
*/
- @Parameter( defaultValue = "${project.build.directory}/generated-site/xdoc" )
+ @Parameter(defaultValue = "${project.build.directory}/generated-site/xdoc")
private File outputDirectory;
/**
@@ -58,16 +55,15 @@ public class DummyReport
/**
* The Maven Project.
*/
- @Parameter( property = "project", readonly = true, required = true )
+ @Parameter(property = "project", readonly = true, required = true)
private MavenProject project;
-
/**
* The goal prefix that will appear before the ":".
*
* @since 2.4
*/
- @Parameter( property = "goalPrefix" )
+ @Parameter(property = "goalPrefix")
protected String goalPrefix;
/**
@@ -75,7 +71,7 @@ public class DummyReport
*
* @since 2.8
*/
- @Parameter( defaultValue = "false", property = "maven.plugin.skip" )
+ @Parameter(defaultValue = "false", property = "maven.plugin.skip")
private boolean skip;
/**
@@ -83,82 +79,71 @@ public class DummyReport
*
* @since 2.8
*/
- @Parameter( defaultValue = "false", property = "maven.plugin.report.skip" )
+ @Parameter(defaultValue = "false", property = "maven.plugin.report.skip")
private boolean skipReport;
/**
* {@inheritDoc}
*/
- protected Renderer getSiteRenderer()
- {
+ protected Renderer getSiteRenderer() {
return siteRenderer;
}
/**
* {@inheritDoc}
*/
- protected String getOutputDirectory()
- {
+ protected String getOutputDirectory() {
return outputDirectory.getPath();
}
/**
* {@inheritDoc}
*/
- protected MavenProject getProject()
- {
+ protected MavenProject getProject() {
return project;
}
/**
* {@inheritDoc}
*/
- public boolean canGenerateReport()
- {
+ public boolean canGenerateReport() {
return true;
}
/**
* {@inheritDoc}
*/
- protected void executeReport( Locale locale )
- throws MavenReportException
- {
- if ( !canGenerateReport() )
- {
+ protected void executeReport(Locale locale) throws MavenReportException {
+ if (!canGenerateReport()) {
return;
}
- if ( skip || skipReport )
- {
- getLog().info( "Maven Plugin Plugin Report generation skipped." );
+ if (skip || skipReport) {
+ getLog().info("Maven Plugin Plugin Report generation skipped.");
return;
}
// Generate the plugin's documentation
- generatePluginDocumentation( locale );
+ generatePluginDocumentation(locale);
}
/**
* {@inheritDoc}
*/
- public String getDescription( Locale locale )
- {
- return getBundle( locale ).getString( "report.plugin.description" );
+ public String getDescription(Locale locale) {
+ return getBundle(locale).getString("report.plugin.description");
}
/**
* {@inheritDoc}
*/
- public String getName( Locale locale )
- {
- return getBundle( locale ).getString( "report.plugin.name" );
+ public String getName(Locale locale) {
+ return getBundle(locale).getString("report.plugin.name");
}
/**
* {@inheritDoc}
*/
- public String getOutputName()
- {
+ public String getOutputName() {
return "plugin-info";
}
@@ -167,12 +152,10 @@ public class DummyReport
* @param locale not null
* @throws MavenReportException if any
*/
- private void generatePluginDocumentation( Locale locale )
- throws MavenReportException
- {
- File outputDir = new File( getOutputDirectory() );
+ private void generatePluginDocumentation(Locale locale) throws MavenReportException {
+ File outputDir = new File(getOutputDirectory());
outputDir.mkdirs();
- PluginOverviewRenderer r = new PluginOverviewRenderer( getSink(), locale );
+ PluginOverviewRenderer r = new PluginOverviewRenderer(getSink(), locale);
r.render();
}
@@ -180,27 +163,23 @@ public class DummyReport
* @param locale not null
* @return the bundle for this report
*/
- protected static ResourceBundle getBundle( Locale locale )
- {
- return ResourceBundle.getBundle( "plugin-report", locale, DummyReport.class.getClassLoader() );
+ protected static ResourceBundle getBundle(Locale locale) {
+ return ResourceBundle.getBundle("plugin-report", locale, DummyReport.class.getClassLoader());
}
/**
* Generates an overview page with the list of goals
* and a link to the goal's page.
*/
- static class PluginOverviewRenderer
- extends AbstractMavenReportRenderer
- {
+ static class PluginOverviewRenderer extends AbstractMavenReportRenderer {
private final Locale locale;
/**
* @param sink not null
* @param locale not null
*/
- PluginOverviewRenderer( Sink sink, Locale locale )
- {
- super( sink );
+ PluginOverviewRenderer(Sink sink, Locale locale) {
+ super(sink);
this.locale = locale;
}
@@ -208,18 +187,16 @@ public class DummyReport
/**
* {@inheritDoc}
*/
- public String getTitle()
- {
- return getBundle( locale ).getString( "report.plugin.title" );
+ public String getTitle() {
+ return getBundle(locale).getString("report.plugin.title");
}
/**
* {@inheritDoc}
*/
- public void renderBody()
- {
- startSection( getTitle() );
- paragraph( "This is a report." );
+ public void renderBody() {
+ startSection(getTitle());
+ paragraph("This is a report.");
endSection();
}
}
diff --git a/maven-plugin-report-plugin/src/it/plugin-report-annotations/src/main/java/org/MyMojo.java b/maven-plugin-report-plugin/src/it/plugin-report-annotations/src/main/java/org/MyMojo.java
index 82a95ab3..d2f2e77f 100644
--- a/maven-plugin-report-plugin/src/it/plugin-report-annotations/src/main/java/org/MyMojo.java
+++ b/maven-plugin-report-plugin/src/it/plugin-report-annotations/src/main/java/org/MyMojo.java
@@ -1,5 +1,3 @@
-package org;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,13 +16,14 @@ package org;
* specific language governing permissions and limitations
* under the License.
*/
+package org;
import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.plugins.annotations.Execute;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.plugins.annotations.ResolutionScope;
/**
* Does nothing.
@@ -32,19 +31,22 @@ import org.apache.maven.plugins.annotations.Parameter;
* @since 1.0
* @deprecated You don't use test goals, do you?
*/
-@Mojo( name = "noop", defaultPhase = LifecyclePhase.PROCESS_SOURCES,
- requiresDependencyResolution = ResolutionScope.TEST,
- requiresDirectInvocation = true, requiresOnline = true, inheritByDefault = false, aggregator = true )
-@Execute( phase = LifecyclePhase.COMPILE )
-public class MyMojo
- extends AbstractMojo
-{
+@Mojo(
+ name = "noop",
+ defaultPhase = LifecyclePhase.PROCESS_SOURCES,
+ requiresDependencyResolution = ResolutionScope.TEST,
+ requiresDirectInvocation = true,
+ requiresOnline = true,
+ inheritByDefault = false,
+ aggregator = true)
+@Execute(phase = LifecyclePhase.COMPILE)
+public class MyMojo extends AbstractMojo {
/**
* This is a test.
*/
- @SuppressWarnings( "unused" )
- @Parameter( required = true )
+ @SuppressWarnings("unused")
+ @Parameter(required = true)
private String required;
/**
@@ -53,13 +55,11 @@ public class MyMojo
* @since 1.1
* @deprecated Just testing.
*/
- @SuppressWarnings( "unused" )
- @Parameter( property = "string", defaultValue = "${project.version}/</markup-must-be-escaped>" )
+ @SuppressWarnings("unused")
+ @Parameter(property = "string", defaultValue = "${project.version}/</markup-must-be-escaped>")
private String string;
- public void execute()
- {
+ public void execute() {
// intentional do nothing
}
-
}
diff --git a/maven-plugin-report-plugin/src/it/plugin-report-requirements-history/src/main/java/org/MyMojo.java b/maven-plugin-report-plugin/src/it/plugin-report-requirements-history/src/main/java/org/MyMojo.java
index 82a95ab3..d2f2e77f 100644
--- a/maven-plugin-report-plugin/src/it/plugin-report-requirements-history/src/main/java/org/MyMojo.java
+++ b/maven-plugin-report-plugin/src/it/plugin-report-requirements-history/src/main/java/org/MyMojo.java
@@ -1,5 +1,3 @@
-package org;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,13 +16,14 @@ package org;
* specific language governing permissions and limitations
* under the License.
*/
+package org;
import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.plugins.annotations.Execute;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.plugins.annotations.ResolutionScope;
/**
* Does nothing.
@@ -32,19 +31,22 @@ import org.apache.maven.plugins.annotations.Parameter;
* @since 1.0
* @deprecated You don't use test goals, do you?
*/
-@Mojo( name = "noop", defaultPhase = LifecyclePhase.PROCESS_SOURCES,
- requiresDependencyResolution = ResolutionScope.TEST,
- requiresDirectInvocation = true, requiresOnline = true, inheritByDefault = false, aggregator = true )
-@Execute( phase = LifecyclePhase.COMPILE )
-public class MyMojo
- extends AbstractMojo
-{
+@Mojo(
+ name = "noop",
+ defaultPhase = LifecyclePhase.PROCESS_SOURCES,
+ requiresDependencyResolution = ResolutionScope.TEST,
+ requiresDirectInvocation = true,
+ requiresOnline = true,
+ inheritByDefault = false,
+ aggregator = true)
+@Execute(phase = LifecyclePhase.COMPILE)
+public class MyMojo extends AbstractMojo {
/**
* This is a test.
*/
- @SuppressWarnings( "unused" )
- @Parameter( required = true )
+ @SuppressWarnings("unused")
+ @Parameter(required = true)
private String required;
/**
@@ -53,13 +55,11 @@ public class MyMojo
* @since 1.1
* @deprecated Just testing.
*/
- @SuppressWarnings( "unused" )
- @Parameter( property = "string", defaultValue = "${project.version}/</markup-must-be-escaped>" )
+ @SuppressWarnings("unused")
+ @Parameter(property = "string", defaultValue = "${project.version}/</markup-must-be-escaped>")
private String string;
- public void execute()
- {
+ public void execute() {
// intentional do nothing
}
-
}
diff --git a/maven-plugin-report-plugin/src/it/plugin-report-with-javadoc-links/src/main/java/org/MyMojo.java b/maven-plugin-report-plugin/src/it/plugin-report-with-javadoc-links/src/main/java/org/MyMojo.java
index 368081e4..28b153f0 100644
--- a/maven-plugin-report-plugin/src/it/plugin-report-with-javadoc-links/src/main/java/org/MyMojo.java
+++ b/maven-plugin-report-plugin/src/it/plugin-report-with-javadoc-links/src/main/java/org/MyMojo.java
@@ -1,5 +1,3 @@
-package org;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org;
* specific language governing permissions and limitations
* under the License.
*/
+package org;
import java.util.Collection;
import java.util.Map;
@@ -28,14 +27,12 @@ import org.apache.maven.plugins.annotations.Parameter;
/**
* Some description
- *
+ *
* @see java.util.Collections
*
*/
-@Mojo( name = "test" )
-public class MyMojo
- extends AbstractMojo
-{
+@Mojo(name = "test")
+public class MyMojo extends AbstractMojo {
/**
* beans parameter leveraging {@link SimpleBean}.
@@ -47,14 +44,12 @@ public class MyMojo
* invalid javadoc reference {@link org.apache.maven.artifact.Artifact}.
*/
@Parameter
- public Map<String,Boolean> invalidReference;
+ public Map<String, Boolean> invalidReference;
@Parameter
org.internal.PrivateBean privateBean;
- public void execute()
- {
+ public void execute() {
// intentional do nothing
}
-
}
diff --git a/maven-plugin-report-plugin/src/it/plugin-report-with-javadoc-links/src/main/java/org/SimpleBean.java b/maven-plugin-report-plugin/src/it/plugin-report-with-javadoc-links/src/main/java/org/SimpleBean.java
index 3d1bb4b4..6c3ceb26 100644
--- a/maven-plugin-report-plugin/src/it/plugin-report-with-javadoc-links/src/main/java/org/SimpleBean.java
+++ b/maven-plugin-report-plugin/src/it/plugin-report-with-javadoc-links/src/main/java/org/SimpleBean.java
@@ -1,5 +1,3 @@
-package org;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,11 +16,11 @@ package org;
* specific language governing permissions and limitations
* under the License.
*/
+package org;
/**
* Some simple bean used in parameters of {@link MyMojo}.
*/
-public class SimpleBean
-{
+public class SimpleBean {
public Integer field1;
}
diff --git a/maven-plugin-report-plugin/src/it/plugin-report-with-javadoc-links/src/main/java/org/internal/PrivateBean.java b/maven-plugin-report-plugin/src/it/plugin-report-with-javadoc-links/src/main/java/org/internal/PrivateBean.java
index 6295a3a4..5f5b098a 100644
--- a/maven-plugin-report-plugin/src/it/plugin-report-with-javadoc-links/src/main/java/org/internal/PrivateBean.java
+++ b/maven-plugin-report-plugin/src/it/plugin-report-with-javadoc-links/src/main/java/org/internal/PrivateBean.java
@@ -1,5 +1,3 @@
-package org.internal;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,11 +16,11 @@ package org.internal;
* specific language governing permissions and limitations
* under the License.
*/
+package org.internal;
/**
* Bean which does not have javadoc
*/
-public class PrivateBean
-{
+public class PrivateBean {
public Integer field1;
}
diff --git a/maven-plugin-report-plugin/src/it/plugin-report/src/main/java/org/DummyReport.java b/maven-plugin-report-plugin/src/it/plugin-report/src/main/java/org/DummyReport.java
index bc0447e5..1389f397 100644
--- a/maven-plugin-report-plugin/src/it/plugin-report/src/main/java/org/DummyReport.java
+++ b/maven-plugin-report-plugin/src/it/plugin-report/src/main/java/org/DummyReport.java
@@ -1,5 +1,3 @@
-package org;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org;
* specific language governing permissions and limitations
* under the License.
*/
+package org;
import java.io.File;
import java.util.Locale;
@@ -37,9 +36,7 @@ import org.apache.maven.reporting.MavenReportException;
* @requiresReports true
* @execute phase="compile"
*/
-public class DummyReport
- extends AbstractMavenReport
-{
+public class DummyReport extends AbstractMavenReport {
/**
* Report output directory.
*
@@ -63,7 +60,6 @@ public class DummyReport
*/
private MavenProject project;
-
/**
* The goal prefix that will appear before the ":".
*
@@ -89,62 +85,51 @@ public class DummyReport
private boolean skipReport;
/** {@inheritDoc} */
- protected Renderer getSiteRenderer()
- {
+ protected Renderer getSiteRenderer() {
return siteRenderer;
}
/** {@inheritDoc} */
- protected String getOutputDirectory()
- {
+ protected String getOutputDirectory() {
return outputDirectory.getPath();
}
/** {@inheritDoc} */
- protected MavenProject getProject()
- {
+ protected MavenProject getProject() {
return project;
}
/** {@inheritDoc} */
- public boolean canGenerateReport()
- {
+ public boolean canGenerateReport() {
return true;
}
/** {@inheritDoc} */
- protected void executeReport( Locale locale )
- throws MavenReportException
- {
- if ( !canGenerateReport() )
- {
+ protected void executeReport(Locale locale) throws MavenReportException {
+ if (!canGenerateReport()) {
return;
}
- if ( skip || skipReport )
- {
- getLog().info( "Maven Plugin Plugin Report generation skipped." );
+ if (skip || skipReport) {
+ getLog().info("Maven Plugin Plugin Report generation skipped.");
return;
}
// Generate the plugin's documentation
- generatePluginDocumentation( locale );
+ generatePluginDocumentation(locale);
}
/** {@inheritDoc} */
- public String getDescription( Locale locale )
- {
- return getBundle( locale ).getString( "report.plugin.description" );
+ public String getDescription(Locale locale) {
+ return getBundle(locale).getString("report.plugin.description");
}
/** {@inheritDoc} */
- public String getName( Locale locale )
- {
- return getBundle( locale ).getString( "report.plugin.name" );
+ public String getName(Locale locale) {
+ return getBundle(locale).getString("report.plugin.name");
}
/** {@inheritDoc} */
- public String getOutputName()
- {
+ public String getOutputName() {
return "plugin-info";
}
@@ -153,12 +138,10 @@ public class DummyReport
* @param locale not null
* @throws MavenReportException if any
*/
- private void generatePluginDocumentation( Locale locale )
- throws MavenReportException
- {
- File outputDir = new File( getOutputDirectory() );
+ private void generatePluginDocumentation(Locale locale) throws MavenReportException {
+ File outputDir = new File(getOutputDirectory());
outputDir.mkdirs();
- PluginOverviewRenderer r = new PluginOverviewRenderer( getSink(), locale );
+ PluginOverviewRenderer r = new PluginOverviewRenderer(getSink(), locale);
r.render();
}
@@ -166,42 +149,36 @@ public class DummyReport
* @param locale not null
* @return the bundle for this report
*/
- protected static ResourceBundle getBundle( Locale locale )
- {
- return ResourceBundle.getBundle( "plugin-report", locale, DummyReport.class.getClassLoader() );
+ protected static ResourceBundle getBundle(Locale locale) {
+ return ResourceBundle.getBundle("plugin-report", locale, DummyReport.class.getClassLoader());
}
/**
* Generates an overview page with the list of goals
* and a link to the goal's page.
*/
- static class PluginOverviewRenderer
- extends AbstractMavenReportRenderer
- {
+ static class PluginOverviewRenderer extends AbstractMavenReportRenderer {
private final Locale locale;
/**
* @param sink not null
* @param locale not null
*/
- PluginOverviewRenderer( Sink sink, Locale locale )
- {
- super( sink );
+ PluginOverviewRenderer(Sink sink, Locale locale) {
+ super(sink);
this.locale = locale;
}
/** {@inheritDoc} */
- public String getTitle()
- {
- return getBundle( locale ).getString( "report.plugin.title" );
+ public String getTitle() {
+ return getBundle(locale).getString("report.plugin.title");
}
/** {@inheritDoc} */
- public void renderBody()
- {
- startSection( getTitle() );
- paragraph( "This is a report." );
+ public void renderBody() {
+ startSection(getTitle());
+ paragraph("This is a report.");
endSection();
}
}
diff --git a/maven-plugin-report-plugin/src/it/plugin-report/src/main/java/org/MyMojo.java b/maven-plugin-report-plugin/src/it/plugin-report/src/main/java/org/MyMojo.java
index 6b8b6865..49b705b2 100644
--- a/maven-plugin-report-plugin/src/it/plugin-report/src/main/java/org/MyMojo.java
+++ b/maven-plugin-report-plugin/src/it/plugin-report/src/main/java/org/MyMojo.java
@@ -1,5 +1,3 @@
-package org;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,12 +16,13 @@ package org;
* specific language governing permissions and limitations
* under the License.
*/
+package org;
import org.apache.maven.plugin.AbstractMojo;
/**
* Does nothing.
- *
+ *
* @goal noop
* @phase process-sources
* @requiresDependencyResolution test
@@ -33,35 +32,31 @@ import org.apache.maven.plugin.AbstractMojo;
* @execute phase="compile"
* @aggregator
* @since 1.0
- *
+ *
* @deprecated You don't use test goals, do you?
*/
-public class MyMojo
- extends AbstractMojo
-{
+public class MyMojo extends AbstractMojo {
/**
* This is a test.
- *
+ *
* @parameter
* @required
*/
- @SuppressWarnings( "unused" )
+ @SuppressWarnings("unused")
private String required;
/**
* This is a test.
- *
+ *
* @parameter expression="${string}" default-value="${project.version}/</markup-must-be-escaped>"
* @deprecated Just testing.
* @since 1.1
*/
- @SuppressWarnings( "unused" )
+ @SuppressWarnings("unused")
private String string;
- public void execute()
- {
+ public void execute() {
// intentional do nothing
}
-
}
diff --git a/maven-plugin-report-plugin/src/main/java/org/apache/maven/plugin/plugin/report/PluginReport.java b/maven-plugin-report-plugin/src/main/java/org/apache/maven/plugin/plugin/report/PluginReport.java
index 9eb7ac99..b9dd4e11 100644
--- a/maven-plugin-report-plugin/src/main/java/org/apache/maven/plugin/plugin/report/PluginReport.java
+++ b/maven-plugin-report-plugin/src/main/java/org/apache/maven/plugin/plugin/report/PluginReport.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugin.plugin.report;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.plugin.plugin.report;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.plugin.plugin.report;
import java.io.File;
import java.io.IOException;
@@ -69,17 +68,15 @@ import org.codehaus.plexus.util.xml.Xpp3Dom;
* @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
* @since 3.7.0
*/
-@Mojo( name = "report", threadSafe = true )
-@Execute( phase = LifecyclePhase.PROCESS_CLASSES )
-public class PluginReport
- extends AbstractMavenReport
-{
+@Mojo(name = "report", threadSafe = true)
+@Execute(phase = LifecyclePhase.PROCESS_CLASSES)
+public class PluginReport extends AbstractMavenReport {
/**
* Report output directory for mojos' documentation.
*
* @since 3.7.0
*/
- @Parameter( defaultValue = "${project.build.directory}/generated-site/xdoc" )
+ @Parameter(defaultValue = "${project.build.directory}/generated-site/xdoc")
private File outputDirectory;
/**
@@ -87,7 +84,7 @@ public class PluginReport
*
* @since 3.7.0
*/
- @Parameter( defaultValue = "false", property = "maven.plugin.report.skip" )
+ @Parameter(defaultValue = "false", property = "maven.plugin.report.skip")
private boolean skip;
/**
@@ -96,7 +93,7 @@ public class PluginReport
*
* @since 3.7.0
*/
- @Parameter( defaultValue = "false", property = "maven.plugin.report.hasExtensionsToLoad" )
+ @Parameter(defaultValue = "false", property = "maven.plugin.report.hasExtensionsToLoad")
private boolean hasExtensionsToLoad;
/**
@@ -127,8 +124,7 @@ public class PluginReport
*
* @since 3.7.0
*/
- @Parameter( defaultValue = "${project.build.directory}/plugin-enhanced.xml", required = true,
- readonly = true )
+ @Parameter(defaultValue = "${project.build.directory}/plugin-enhanced.xml", required = true, readonly = true)
private File enhancedPluginXmlFile;
/**
@@ -138,18 +134,17 @@ public class PluginReport
* This might have the drawback that some links being generated in the report might be broken
* in case not all parameter types and javadoc link references are resolvable through the sites being given to
* goal {@code plugin:descriptor}.
- *
+ *
* @since 3.7.0
*/
- @Parameter( property = "maven.plugin.report.disableInternalJavadocLinkValidation" )
+ @Parameter(property = "maven.plugin.report.disableInternalJavadocLinkValidation")
private boolean disableInternalJavadocLinkValidation;
/**
* {@inheritDoc}
*/
@Override
- protected String getOutputDirectory()
- {
+ protected String getOutputDirectory() {
// PLUGIN-191: output directory of plugin.html, not *-mojo.xml
return project.getReporting().getOutputDirectory();
}
@@ -158,8 +153,7 @@ public class PluginReport
* {@inheritDoc}
*/
@Override
- public boolean canGenerateReport()
- {
+ public boolean canGenerateReport() {
return enhancedPluginXmlFile != null && enhancedPluginXmlFile.isFile() && enhancedPluginXmlFile.canRead();
}
@@ -167,67 +161,54 @@ public class PluginReport
* {@inheritDoc}
*/
@Override
- protected void executeReport( Locale locale )
- throws MavenReportException
- {
- if ( skip )
- {
- getLog().info( "Maven Plugin Plugin Report generation skipped." );
+ protected void executeReport(Locale locale) throws MavenReportException {
+ if (skip) {
+ getLog().info("Maven Plugin Plugin Report generation skipped.");
return;
}
PluginDescriptor pluginDescriptor = extractPluginDescriptor();
// Generate the mojos' documentation
- generateMojosDocumentation( pluginDescriptor, locale );
+ generateMojosDocumentation(pluginDescriptor, locale);
// Write the overview
- PluginOverviewRenderer r =
- new PluginOverviewRenderer( getProject(), requirementsHistories, getSink(),
- pluginDescriptor, locale, hasExtensionsToLoad );
+ PluginOverviewRenderer r = new PluginOverviewRenderer(
+ getProject(), requirementsHistories, getSink(), pluginDescriptor, locale, hasExtensionsToLoad);
r.render();
}
- private PluginDescriptor extractPluginDescriptor()
- throws MavenReportException
- {
- PluginDescriptorBuilder builder = new EnhancedPluginDescriptorBuilder( rtInfo );
+ private PluginDescriptor extractPluginDescriptor() throws MavenReportException {
+ PluginDescriptorBuilder builder = new EnhancedPluginDescriptorBuilder(rtInfo);
- try ( Reader input = new XmlStreamReader( Files.newInputStream( enhancedPluginXmlFile.toPath() ) ) )
- {
- return builder.build( input );
- }
- catch ( IOException | PlexusConfigurationException e )
- {
- throw new MavenReportException( "Error extracting plugin descriptor from " + enhancedPluginXmlFile, e );
+ try (Reader input = new XmlStreamReader(Files.newInputStream(enhancedPluginXmlFile.toPath()))) {
+ return builder.build(input);
+ } catch (IOException | PlexusConfigurationException e) {
+ throw new MavenReportException("Error extracting plugin descriptor from " + enhancedPluginXmlFile, e);
}
-
}
/**
* {@inheritDoc}
*/
@Override
- public String getDescription( Locale locale )
- {
- return getBundle( locale ).getString( "report.plugin.description" );
+ public String getDescription(Locale locale) {
+ return getBundle(locale).getString("report.plugin.description");
}
/**
* {@inheritDoc}
*/
@Override
- public String getName( Locale locale )
- {
- return getBundle( locale ).getString( "report.plugin.name" );
+ public String getName(Locale locale) {
+ return getBundle(locale).getString("report.plugin.name");
}
/**
* {@inheritDoc}
*/
@Override
- public String getOutputName()
- {
+ public String getOutputName() {
return "plugin-info";
}
@@ -238,42 +219,34 @@ public class PluginReport
* @param locale not null
* @throws MavenReportException if any
*/
- private void generateMojosDocumentation( PluginDescriptor pluginDescriptor, Locale locale )
- throws MavenReportException
- {
- try
- {
+ private void generateMojosDocumentation(PluginDescriptor pluginDescriptor, Locale locale)
+ throws MavenReportException {
+ try {
File outputDir = outputDirectory;
outputDir.mkdirs();
- PluginXdocGenerator generator = new PluginXdocGenerator( getProject(), locale, getReportOutputDirectory(),
- disableInternalJavadocLinkValidation );
- PluginToolsRequest pluginToolsRequest = new DefaultPluginToolsRequest( getProject(), pluginDescriptor );
- generator.execute( outputDir, pluginToolsRequest );
- }
- catch ( GeneratorException e )
- {
- throw new MavenReportException( "Error writing plugin documentation", e );
+ PluginXdocGenerator generator = new PluginXdocGenerator(
+ getProject(), locale, getReportOutputDirectory(), disableInternalJavadocLinkValidation);
+ PluginToolsRequest pluginToolsRequest = new DefaultPluginToolsRequest(getProject(), pluginDescriptor);
+ generator.execute(outputDir, pluginToolsRequest);
+ } catch (GeneratorException e) {
+ throw new MavenReportException("Error writing plugin documentation", e);
}
-
}
/**
* @param locale not null
* @return the bundle for this report
*/
- protected static ResourceBundle getBundle( Locale locale )
- {
- return ResourceBundle.getBundle( "plugin-report", locale, PluginReport.class.getClassLoader() );
+ protected static ResourceBundle getBundle(Locale locale) {
+ return ResourceBundle.getBundle("plugin-report", locale, PluginReport.class.getClassLoader());
}
/**
* Generates an overview page with the list of goals
* and a link to the goal's page.
*/
- static class PluginOverviewRenderer
- extends AbstractMavenReportRenderer
- {
+ static class PluginOverviewRenderer extends AbstractMavenReportRenderer {
private final MavenProject project;
private final List<RequirementsHistory> requirementsHistories;
@@ -291,11 +264,14 @@ public class PluginReport
* @param pluginDescriptor not null
* @param locale not null
*/
- PluginOverviewRenderer( MavenProject project,
- List<RequirementsHistory> requirementsHistories, Sink sink,
- PluginDescriptor pluginDescriptor, Locale locale, boolean hasExtensionsToLoad )
- {
- super( sink );
+ PluginOverviewRenderer(
+ MavenProject project,
+ List<RequirementsHistory> requirementsHistories,
+ Sink sink,
+ PluginDescriptor pluginDescriptor,
+ Locale locale,
+ boolean hasExtensionsToLoad) {
+ super(sink);
this.project = project;
@@ -312,58 +288,50 @@ public class PluginReport
* {@inheritDoc}
*/
@Override
- public String getTitle()
- {
- return getBundle( locale ).getString( "report.plugin.title" );
+ public String getTitle() {
+ return getBundle(locale).getString("report.plugin.title");
}
/**
* {@inheritDoc}
*/
@Override
- public void renderBody()
- {
- startSection( getTitle() );
+ public void renderBody() {
+ startSection(getTitle());
- if ( !( pluginDescriptor.getMojos() != null && pluginDescriptor.getMojos().size() > 0 ) )
- {
- paragraph( getBundle( locale ).getString( "report.plugin.goals.nogoal" ) );
+ if (!(pluginDescriptor.getMojos() != null
+ && pluginDescriptor.getMojos().size() > 0)) {
+ paragraph(getBundle(locale).getString("report.plugin.goals.nogoal"));
endSection();
return;
}
- paragraph( getBundle( locale ).getString( "report.plugin.goals.intro" ) );
+ paragraph(getBundle(locale).getString("report.plugin.goals.intro"));
boolean hasMavenReport = false;
- for ( Iterator<MojoDescriptor> i = pluginDescriptor.getMojos().iterator(); i.hasNext(); )
- {
+ for (Iterator<MojoDescriptor> i = pluginDescriptor.getMojos().iterator(); i.hasNext(); ) {
MojoDescriptor mojo = i.next();
- if ( GeneratorUtils.isMavenReport( mojo.getImplementation(), project ) )
- {
+ if (GeneratorUtils.isMavenReport(mojo.getImplementation(), project)) {
hasMavenReport = true;
}
}
startTable();
- String goalColumnName = getBundle( locale ).getString( "report.plugin.goals.column.goal" );
- String isMavenReport = getBundle( locale ).getString( "report.plugin.goals.column.isMavenReport" );
- String descriptionColumnName = getBundle( locale ).getString( "report.plugin.goals.column.description" );
- if ( hasMavenReport )
- {
- tableHeader( new String[] {goalColumnName, isMavenReport, descriptionColumnName} );
- }
- else
- {
- tableHeader( new String[] {goalColumnName, descriptionColumnName} );
+ String goalColumnName = getBundle(locale).getString("report.plugin.goals.column.goal");
+ String isMavenReport = getBundle(locale).getString("report.plugin.goals.column.isMavenReport");
+ String descriptionColumnName = getBundle(locale).getString("report.plugin.goals.column.description");
+ if (hasMavenReport) {
+ tableHeader(new String[] {goalColumnName, isMavenReport, descriptionColumnName});
+ } else {
+ tableHeader(new String[] {goalColumnName, descriptionColumnName});
}
List<MojoDescriptor> mojos = new ArrayList<>();
- mojos.addAll( pluginDescriptor.getMojos() );
- PluginUtils.sortMojos( mojos );
- for ( MojoDescriptor mojo : mojos )
- {
+ mojos.addAll(pluginDescriptor.getMojos());
+ PluginUtils.sortMojos(mojos);
+ for (MojoDescriptor mojo : mojos) {
String goalName = mojo.getFullGoalName();
/*
@@ -373,63 +341,53 @@ public class PluginReport
String goalDocumentationLink = "./" + mojo.getGoal() + "-mojo.html";
String description;
- if ( StringUtils.isNotEmpty( mojo.getDeprecated() ) )
- {
- description =
- "<strong>" + getBundle( locale ).getString( "report.plugin.goal.deprecated" ) + "</strong> "
- + mojo.getDeprecated();
- }
- else if ( StringUtils.isNotEmpty( mojo.getDescription() ) )
- {
+ if (StringUtils.isNotEmpty(mojo.getDeprecated())) {
+ description = "<strong>" + getBundle(locale).getString("report.plugin.goal.deprecated")
+ + "</strong> " + mojo.getDeprecated();
+ } else if (StringUtils.isNotEmpty(mojo.getDescription())) {
description = mojo.getDescription();
- }
- else
- {
- description = getBundle( locale ).getString( "report.plugin.goal.nodescription" );
+ } else {
+ description = getBundle(locale).getString("report.plugin.goal.nodescription");
}
sink.tableRow();
- tableCell( createLinkPatternedText( goalName, goalDocumentationLink ) );
- if ( hasMavenReport )
- {
- if ( GeneratorUtils.isMavenReport( mojo.getImplementation(), project ) )
- {
+ tableCell(createLinkPatternedText(goalName, goalDocumentationLink));
+ if (hasMavenReport) {
+ if (GeneratorUtils.isMavenReport(mojo.getImplementation(), project)) {
sink.tableCell();
- sink.text( getBundle( locale ).getString( "report.plugin.isReport" ) );
+ sink.text(getBundle(locale).getString("report.plugin.isReport"));
sink.tableCell_();
- }
- else
- {
+ } else {
sink.tableCell();
- sink.text( getBundle( locale ).getString( "report.plugin.isNotReport" ) );
+ sink.text(getBundle(locale).getString("report.plugin.isNotReport"));
sink.tableCell_();
}
}
- tableCell( description, true );
+ tableCell(description, true);
sink.tableRow_();
}
endTable();
- startSection( getBundle( locale ).getString( "report.plugin.systemrequirements" ) );
+ startSection(getBundle(locale).getString("report.plugin.systemrequirements"));
- paragraph( getBundle( locale ).getString( "report.plugin.systemrequirements.intro" ) );
+ paragraph(getBundle(locale).getString("report.plugin.systemrequirements.intro"));
startTable();
- String maven = discoverMavenRequirement( project, pluginDescriptor );
+ String maven = discoverMavenRequirement(project, pluginDescriptor);
sink.tableRow();
- tableCell( getBundle( locale ).getString( "report.plugin.systemrequirements.maven" ) );
- tableCell( ( maven != null
- ? maven
- : getBundle( locale ).getString( "report.plugin.systemrequirements.nominimum" ) ) );
+ tableCell(getBundle(locale).getString("report.plugin.systemrequirements.maven"));
+ tableCell(
+ (maven != null
+ ? maven
+ : getBundle(locale).getString("report.plugin.systemrequirements.nominimum")));
sink.tableRow_();
- String jdk = discoverJdkRequirement( project, pluginDescriptor );
+ String jdk = discoverJdkRequirement(project, pluginDescriptor);
sink.tableRow();
- tableCell( getBundle( locale ).getString( "report.plugin.systemrequirements.jdk" ) );
- tableCell(
- ( jdk != null ? jdk : getBundle( locale ).getString( "report.plugin.systemrequirements.nominimum" ) ) );
+ tableCell(getBundle(locale).getString("report.plugin.systemrequirements.jdk"));
+ tableCell((jdk != null ? jdk : getBundle(locale).getString("report.plugin.systemrequirements.nominimum")));
sink.tableRow_();
endTable();
@@ -438,37 +396,33 @@ public class PluginReport
renderRequirementsHistories();
- renderUsageSection( hasMavenReport );
+ renderUsageSection(hasMavenReport);
endSection();
}
- private void renderRequirementsHistories()
- {
- if ( requirementsHistories.isEmpty() )
- {
+ private void renderRequirementsHistories() {
+ if (requirementsHistories.isEmpty()) {
return;
}
- startSection( getBundle( locale ).getString( "report.plugin.systemrequirements.history" ) );
- paragraph( getBundle( locale ).getString( "report.plugin.systemrequirements.history.intro" ) );
+ startSection(getBundle(locale).getString("report.plugin.systemrequirements.history"));
+ paragraph(getBundle(locale).getString("report.plugin.systemrequirements.history.intro"));
startTable();
- tableHeader( new String[] {
- getBundle( locale ).getString( "report.plugin.systemrequirements.history.version" ),
- getBundle( locale ).getString( "report.plugin.systemrequirements.history.maven" ),
- getBundle( locale ).getString( "report.plugin.systemrequirements.history.jdk" )
- } );
-
- requirementsHistories.forEach(
- requirementsHistory ->
- {
- sink.tableRow();
- tableCell( requirementsHistory.getVersion() );
- tableCell( requirementsHistory.getMaven() );
- tableCell( requirementsHistory.getJdk() );
- sink.tableRow_();
- } );
+ tableHeader(new String[] {
+ getBundle(locale).getString("report.plugin.systemrequirements.history.version"),
+ getBundle(locale).getString("report.plugin.systemrequirements.history.maven"),
+ getBundle(locale).getString("report.plugin.systemrequirements.history.jdk")
+ });
+
+ requirementsHistories.forEach(requirementsHistory -> {
+ sink.tableRow();
+ tableCell(requirementsHistory.getVersion());
+ tableCell(requirementsHistory.getMaven());
+ tableCell(requirementsHistory.getJdk());
+ sink.tableRow_();
+ });
endTable();
endSection();
@@ -479,103 +433,111 @@ public class PluginReport
*
* @param hasMavenReport If the plugin has a report or not
*/
- private void renderUsageSection( boolean hasMavenReport )
- {
- startSection( getBundle( locale ).getString( "report.plugin.usage" ) );
+ private void renderUsageSection(boolean hasMavenReport) {
+ startSection(getBundle(locale).getString("report.plugin.usage"));
// Configuration
sink.paragraph();
- text( getBundle( locale ).getString( "report.plugin.usage.intro" ) );
+ text(getBundle(locale).getString("report.plugin.usage.intro"));
sink.paragraph_();
StringBuilder sb = new StringBuilder();
- sb.append( "<project>" ).append( '\n' );
- sb.append( " ..." ).append( '\n' );
- sb.append( " <build>" ).append( '\n' );
- sb.append(
- " <!-- " + getBundle( locale ).getString( "report.plugin.usage.pluginManagement" ) + " -->" ).append(
- '\n' );
- sb.append( " <pluginManagement>" ).append( '\n' );
- sb.append( " <plugins>" ).append( '\n' );
- sb.append( " <plugin>" ).append( '\n' );
- sb.append( " <groupId>" ).append( pluginDescriptor.getGroupId() ).append( "</groupId>" ).append(
- '\n' );
- sb.append( " <artifactId>" ).append( pluginDescriptor.getArtifactId() ).append(
- "</artifactId>" ).append( '\n' );
- sb.append( " <version>" ).append( pluginDescriptor.getVersion() ).append( "</version>" ).append(
- '\n' );
- if ( hasExtensionsToLoad )
- {
- sb.append( " <extensions>true</extensions>" ).append(
- '\n' );
... 22486 lines suppressed ...
[maven-plugin-tools] 01/02: [MPLUGIN-447] Update to Maven Parent POM 39
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git
commit 2c52e89dbb0a05d71e85e405f034f09d9f120f1c
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Tue Nov 29 19:03:42 2022 +0100
[MPLUGIN-447] Update to Maven Parent POM 39
---
maven-plugin-plugin/pom.xml | 2 +-
maven-plugin-report-plugin/pom.xml | 2 +-
pom.xml | 18 +++++++++++++++++-
3 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/maven-plugin-plugin/pom.xml b/maven-plugin-plugin/pom.xml
index 45ebafcc..4d03fc09 100644
--- a/maven-plugin-plugin/pom.xml
+++ b/maven-plugin-plugin/pom.xml
@@ -251,7 +251,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-plugin</artifactId>
+ <artifactId>maven-plugin-report-plugin</artifactId>
<reportSets>
<reportSet>
<reports>
diff --git a/maven-plugin-report-plugin/pom.xml b/maven-plugin-report-plugin/pom.xml
index e7e66d46..d31cdb4e 100644
--- a/maven-plugin-report-plugin/pom.xml
+++ b/maven-plugin-report-plugin/pom.xml
@@ -189,7 +189,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-plugin</artifactId>
+ <artifactId>maven-plugin-report-plugin</artifactId>
<reportSets>
<reportSet>
<reports>
diff --git a/pom.xml b/pom.xml
index a16314bc..b5fd4fd0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>maven-parent</artifactId>
<groupId>org.apache.maven</groupId>
- <version>37</version>
+ <version>39</version>
<relativePath />
</parent>
@@ -377,6 +377,22 @@
</plugin>
</plugins>
</pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>com.diffplug.spotless</groupId>
+ <artifactId>spotless-maven-plugin</artifactId>
+ <configuration>
+ <java>
+ <includes>
+ <include>src/**/*.java</include>
+ </includes>
+ <excludes>
+ <exclude>**/it/source-encoding/</exclude>
+ </excludes>
+ </java>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
<profiles>