This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch doxia-2.0.0 in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git
discard 7e686743 Prepare for Doxia 2.0.0 add 2c52e89d [MPLUGIN-447] Update to Maven Parent POM 39 add 21f9d21d [MPLUGIN-447] Reformat add ce498163 [MPLUGIN-447] Ignore reformat commit rev in blame add 52be8faf [MPLUGIN-453] Fix Temporary File Information Disclosure (#176) add 4cd8c032 [MPLUGIN-454] Bump junit-bom from 5.9.1 to 5.9.2 (#193) add 25837eed [MPLUGIN-441] Upgrade to maven alpha-4 (#191) add df4b8fda Bump plexus-velocity from 1.2 to 2.0 and velocity from 1.7 to 2.3 (#195) add 84f9a2e7 [MPLUGIN-455] Bump plexus-archiver from 4.5.0 to 4.6.1 (#189) add 9ca8a18d [maven-release-plugin] prepare release maven-plugin-tools-3.8.0 add d99a455f [maven-release-plugin] prepare for next development iteration add 27219448 Revert "Bump plexus-velocity from 1.2 to 2.0 and velocity from 1.7 to 2.3 (#195)" (#198) add b242658b [maven-release-plugin] prepare release maven-plugin-tools-3.8.1 add ece2802b [maven-release-plugin] prepare for next development iteration new 98506d70 Prepare for Doxia 2.0.0 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (7e686743) \ N -- N -- N refs/heads/doxia-2.0.0 (98506d70) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 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: .../invoker.properties => .git-blame-ignore-revs | 5 +- maven-plugin-annotations/pom.xml | 6 +- .../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 | 21 +- .../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 +- maven-plugin-plugin/src/it/v4api/verify.groovy | 2 +- .../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/DescriptorGeneratorMojoTest.java | 46 +- .../maven/plugin/plugin/HelpGeneratorMojoTest.java | 32 +- maven-plugin-report-plugin/pom.xml | 440 +++++----- .../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 | 474 +++++----- .../plugin/plugin/report/RequirementsHistory.java | 28 +- .../EnhancedPluginDescriptorBuilder.java | 109 ++- .../EnhancedPluginDescriptorBuilderTest.java | 63 +- maven-plugin-tools-annotations/pom.xml | 4 +- .../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 | 7 +- .../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 | 10 +- .../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 | 860 ++++++++---------- .../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 | 4 +- .../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 | 6 +- .../extractor/ant/AntMojoDescriptorExtractor.java | 232 +++-- .../ant/AntMojoDescriptorExtractorTest.java | 120 +-- maven-script/maven-plugin-tools-beanshell/pom.xml | 4 +- .../BeanshellMojoDescriptorExtractor.java | 90 +- maven-script/maven-plugin-tools-model/pom.xml | 8 +- .../model/PluginMetadataParseException.java | 153 ++-- .../extractor/model/PluginMetadataParser.java | 361 ++++---- .../extractor/model/PluginMetadataParserTest.java | 63 +- maven-script/maven-script-ant/pom.xml | 2 +- .../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 | 207 ++--- maven-script/maven-script-beanshell/pom.xml | 2 +- .../script/beanshell/BeanshellMojoAdapter.java | 133 ++- maven-script/pom.xml | 3 +- pom.xml | 51 +- 231 files changed, 7958 insertions(+), 10637 deletions(-) copy maven-plugin-report-plugin/src/it/mplugin-187/invoker.properties => .git-blame-ignore-revs (91%)