This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository maven-plugin-tools.
commit 4d3fdd72fc0b96b6280d41ef13b99ec535411d11 Merge: 3b648ad 8e35c03 Author: Emmanuel Bourg <[email protected]> Date: Mon Mar 16 10:39:05 2015 +0100 Merge tag 'upstream/3.3' Upstream version 3.3 .gitignore | 15 + deploySite.sh | 23 + maven-plugin-annotations/pom.xml | 41 + .../maven/plugins/annotations/Component.java | 54 ++ .../apache/maven/plugins/annotations/Execute.java | 58 ++ .../plugins/annotations/InstantiationStrategy.java | 46 ++ .../maven/plugins/annotations/LifecyclePhase.java | 77 ++ .../org/apache/maven/plugins/annotations/Mojo.java | 120 +++ .../maven/plugins/annotations/Parameter.java | 87 +++ .../maven/plugins/annotations/ResolutionScope.java | 75 ++ maven-plugin-annotations/src/site/apt/index.apt.vm | 49 ++ maven-plugin-annotations/src/site/site.xml | 31 + maven-plugin-plugin/pom.xml | 368 +++++++++ .../invoker.properties | 20 + .../annotation-with-inheritance-from-deps/pom.xml | 129 ++++ .../org/apache/maven/plugin/coreit/FirstMojo.java | 75 ++ .../main/resources/META-INF/maven/lifecycle.xml | 37 + .../verify.groovy | 99 +++ .../invoker.properties | 20 + .../module-abstract-mojo/pom.xml | 32 + .../apache/maven/plugins/AbstractFirstMojo.java | 64 ++ .../module-mojo/pom.xml | 62 ++ .../apache/maven/plugin/coreit/CoreIt0014Mojo.java | 66 ++ .../org/apache/maven/plugin/coreit/FirstMojo.java | 80 ++ .../org/apache/maven/plugin/coreit/SecondMojo.java | 39 + .../main/resources/META-INF/maven/lifecycle.xml | 37 + .../it/annotation-with-inheritance-reactor/pom.xml | 100 +++ .../verify.groovy | 99 +++ .../annotation-with-inheritance/invoker.properties | 22 + .../src/it/annotation-with-inheritance/pom.xml | 134 ++++ .../maven/plugin/coreit/AbstractFirstMojo.java | 63 ++ .../maven/plugin/coreit/AbstractFooMojo.java | 43 ++ .../apache/maven/plugin/coreit/CoreIt0014Mojo.java | 66 ++ .../org/apache/maven/plugin/coreit/FirstMojo.java | 87 +++ .../org/apache/maven/plugin/coreit/SecondMojo.java | 39 + .../org/apache/maven/plugin/coreit/ThirdMojo.java | 87 +++ .../main/resources/META-INF/maven/lifecycle.xml | 37 + .../it/annotation-with-inheritance/verify.groovy | 103 +++ .../src/it/ant-basic/invoker.properties | 20 + maven-plugin-plugin/src/it/ant-basic/pom.xml | 69 ++ .../it/ant-basic/src/main/scripts/touch.build.xml | 27 + .../it/ant-basic/src/main/scripts/touch.mojos.xml | 44 ++ maven-plugin-plugin/src/it/ant-basic/verify.groovy | 30 + .../it/ant-reference-parameter/invoker.properties | 20 + .../src/it/ant-reference-parameter/pom.xml | 65 ++ .../maven/plugins/antWithRefs/ArtifactsTask.java | 35 + .../apache/maven/plugins/antWithRefs/antlib.xml | 25 + .../src/main/scripts/test.build.xml | 29 + .../src/main/scripts/test.mojos.xml | 41 + .../src/it/ant-simple-usage/invoker.properties | 20 + .../src/it/ant-simple-usage/plugin/pom.xml | 69 ++ .../plugin/src/main/scripts/test.build.xml | 26 + .../plugin/src/main/scripts/test.mojos.xml | 40 + .../src/it/ant-simple-usage/pom.xml | 48 ++ .../src/it/ant-simple-usage/usage/pom.xml | 63 ++ .../src/it/ant-since-maven-plugin/pom.xml | 49 ++ .../src/main/scripts/sample.build.xml | 35 + .../src/main/scripts/sample.mojos.xml | 46 ++ .../src/it/beanshell-simple/invoker.properties | 20 + .../src/it/beanshell-simple/pom.xml | 68 ++ .../it/beanshell-simple/src/main/scripts/touch.bsh | 65 ++ .../src/it/beanshell-simple/verify.groovy | 27 + .../antsample-maven-plugin/pom.xml | 77 ++ .../src/main/scripts/sample.build.xml | 35 + .../src/main/scripts/sample.mojos.xml | 46 ++ .../antsample-maven-plugin/src/site/site.xml | 36 + .../src/it/fix-maven-since-3.x/invoker.properties | 21 + .../javasample-maven-plugin/pom.xml | 49 ++ .../src/main/java/test/MyMojo.java | 82 ++ .../javasample-maven-plugin/src/site/site.xml | 37 + .../src/it/fix-maven-since-3.x/pom.xml | 94 +++ .../src/it/fix-maven-since-3.x/verify.groovy | 27 + .../src/it/help-basic/expected-help.txt | 25 + .../src/it/help-basic/invoker.properties | 20 + maven-plugin-plugin/src/it/help-basic/pom.xml | 77 ++ .../it/help-basic/src/main/java/test/MyMojo.java | 71 ++ .../src/it/help-basic/test.properties | 19 + .../src/it/help-basic/verify.groovy | 28 + .../src/it/help-package/invoker.properties | 18 + maven-plugin-plugin/src/it/help-package/pom.xml | 80 ++ .../it/help-package/src/main/java/test/MyMojo.java | 37 + maven-plugin-plugin/src/it/help-package/verify.bsh | 26 + .../src/it/ignore-plugin-class-realm/dep-a/pom.xml | 40 + .../dep-a/src/main/java/test/ClassA.java | 24 + .../src/it/ignore-plugin-class-realm/dep-b/pom.xml | 48 ++ .../dep-b/src/main/java/test/ClassB.java | 33 + .../ignore-plugin-class-realm/invoker.properties | 22 + .../src/it/ignore-plugin-class-realm/pom.xml | 64 ++ .../src/it/ignore-plugin-class-realm/test/pom.xml | 73 ++ .../test/src/main/java/test/SomeMojo.java | 34 + .../java-basic-annotations-jdk8/invoker.properties | 21 + .../src/it/java-basic-annotations-jdk8/pom.xml | 102 +++ .../apache/maven/plugin/coreit/CoreIt0014Mojo.java | 66 ++ .../org/apache/maven/plugin/coreit/FirstMojo.java | 91 +++ .../apache/maven/plugin/coreit/MPlugin220Mojo.java | 47 ++ .../org/apache/maven/plugin/coreit/Maximal.java | 76 ++ .../org/apache/maven/plugin/coreit/Minimal.java | 43 ++ .../it/java-basic-annotations-jdk8/verify.groovy | 231 ++++++ .../it/java-basic-annotations/invoker.properties | 20 + .../src/it/java-basic-annotations/pom.xml | 100 +++ .../apache/maven/plugin/coreit/CoreIt0014Mojo.java | 66 ++ .../org/apache/maven/plugin/coreit/FirstMojo.java | 91 +++ .../apache/maven/plugin/coreit/MPlugin220Mojo.java | 47 ++ .../org/apache/maven/plugin/coreit/Maximal.java | 76 ++ .../org/apache/maven/plugin/coreit/Minimal.java | 43 ++ .../src/it/java-basic-annotations/verify.groovy | 231 ++++++ .../src/it/java-basic/invoker.properties | 20 + maven-plugin-plugin/src/it/java-basic/pom.xml | 63 ++ .../apache/maven/plugin/coreit/CoreIt0013Mojo.java | 67 ++ .../org/apache/maven/plugin/coreit/FirstMojo.java | 102 +++ .../org/apache/maven/plugin/coreit/Maximal.java | 71 ++ .../org/apache/maven/plugin/coreit/Minimal.java | 46 ++ .../src/it/java-basic/verify.groovy | 226 ++++++ .../src/it/mplugin-187/invoker.properties | 18 + maven-plugin-plugin/src/it/mplugin-187/pom.xml | 45 ++ .../src/it/mplugin-191/invoker.properties | 18 + maven-plugin-plugin/src/it/mplugin-191/pom.xml | 67 ++ .../org/apache/maven/plugins/plugin/it/MyMojo.java | 81 ++ .../src/it/mplugin-191/verify.groovy | 24 + .../src/it/mplugin-223/invoker.properties | 15 + maven-plugin-plugin/src/it/mplugin-223/pom.xml | 84 +++ .../org/apache/maven/plugins/plugin/it/MyMojo.java | 81 ++ .../src/it/mplugin-223/verify.groovy | 28 + .../src/it/packaging-jar/invoker.properties | 18 + maven-plugin-plugin/src/it/packaging-jar/pom.xml | 102 +++ .../org/apache/maven/plugin/coreit/FirstMojo.java | 35 + .../src/it/packaging-jar/verify.groovy | 31 + .../invoker.properties | 18 + .../src/it/plugin-info-jdk-default-version/pom.xml | 85 +++ .../apache/maven/plugins/issues/plugin/MyMojo.java | 81 ++ .../src/site/site.xml | 30 + .../plugin-info-jdk-default-version/verify.groovy | 27 + .../plugin-report-annotations/invoker.properties | 18 + .../src/it/plugin-report-annotations/pom.xml | 119 +++ .../src/main/java/org/DummyReport.java | 227 ++++++ .../src/main/java/org/MyMojo.java | 65 ++ .../src/it/plugin-report-annotations/verify.bsh | 55 ++ .../src/it/plugin-report/invoker.properties | 18 + maven-plugin-plugin/src/it/plugin-report/pom.xml | 99 +++ .../src/main/java/org/DummyReport.java | 210 ++++++ .../it/plugin-report/src/main/java/org/MyMojo.java | 67 ++ .../src/it/plugin-report/verify.bsh | 56 ++ maven-plugin-plugin/src/it/settings.xml | 62 ++ maven-plugin-plugin/src/it/skip/invoker.properties | 19 + maven-plugin-plugin/src/it/skip/pom.xml | 56 ++ .../apache/maven/plugin/coreit/CoreIt0013Mojo.java | 67 ++ .../org/apache/maven/plugin/coreit/FirstMojo.java | 72 ++ .../org/apache/maven/plugin/coreit/SecondMojo.java | 39 + maven-plugin-plugin/src/it/skip/verify.groovy | 23 + .../src/it/source-encoding/latin-1/pom.xml | 66 ++ .../latin-1/src/main/java/test/MyMojo.java | 39 + maven-plugin-plugin/src/it/source-encoding/pom.xml | 39 + .../src/it/source-encoding/utf-8/pom.xml | 66 ++ .../utf-8/src/main/java/test/MyMojo.java | 39 + .../src/it/source-encoding/verify.groovy | 32 + .../maven/plugin/plugin/AbstractGeneratorMojo.java | 270 +++++++ .../plugin/plugin/DescriptorGeneratorMojo.java | 93 +++ .../maven/plugin/plugin/HelpGeneratorMojo.java | 97 +++ .../apache/maven/plugin/plugin/PluginReport.java | 748 +++++++++++++++++++ .../plugin/plugin/UpdatePluginRegistryMojo.java | 237 ++++++ .../maven/plugin/plugin/XdocGeneratorMojo.java | 57 ++ .../metadata/AddPluginArtifactMetadataMojo.java | 109 +++ .../src/main/mdo/pluginRequirements.mdo | 78 ++ .../src/main/resources/plugin-report.properties | 48 ++ .../src/main/resources/plugin-report_de.properties | 48 ++ .../src/main/resources/plugin-report_en.properties | 23 + .../src/main/resources/plugin-report_fr.properties | 48 ++ .../src/main/resources/plugin-report_sv.properties | 48 ++ .../src/site/apt/examples/ant-mojo.apt.vm | 80 ++ .../src/site/apt/examples/beanshell-mojo.apt.vm | 73 ++ .../site/apt/examples/generate-descriptor.apt.vm | 118 +++ .../src/site/apt/examples/generate-help.apt.vm | 58 ++ .../src/site/apt/examples/generate-report.apt.vm | 50 ++ .../src/site/apt/examples/using-annotations.apt.vm | 133 ++++ maven-plugin-plugin/src/site/apt/index.apt | 89 +++ .../src/site/apt/multiple-language-support.apt | 53 ++ maven-plugin-plugin/src/site/apt/usage.apt | 106 +++ maven-plugin-plugin/src/site/fml/faq.fml | 42 ++ maven-plugin-plugin/src/site/site.xml | 73 ++ maven-plugin-tools-annotations/pom.xml | 138 ++++ .../JavaAnnotationsMojoDescriptorExtractor.java | 724 ++++++++++++++++++ .../annotations/datamodel/AnnotatedContent.java | 65 ++ .../annotations/datamodel/AnnotatedField.java | 61 ++ .../datamodel/ComponentAnnotationContent.java | 92 +++ .../datamodel/ExecuteAnnotationContent.java | 88 +++ .../datamodel/MojoAnnotationContent.java | 232 ++++++ .../datamodel/ParameterAnnotationContent.java | 213 ++++++ .../scanner/DefaultMojoAnnotationsScanner.java | 312 ++++++++ .../annotations/scanner/MojoAnnotatedClass.java | 168 +++++ .../scanner/MojoAnnotationsScanner.java | 53 ++ .../scanner/MojoAnnotationsScannerRequest.java | 102 +++ .../scanner/visitors/MojoAnnotationVisitor.java | 83 +++ .../scanner/visitors/MojoClassVisitor.java | 174 +++++ .../scanner/visitors/MojoFieldVisitor.java | 93 +++ .../src/site/apt/index.apt | 133 ++++ maven-plugin-tools-annotations/src/site/site.xml | 31 + .../maven/tools/plugin/annotations/FooMojo.java | 72 ++ .../plugin/annotations/TestAnnotationsReader.java | 90 +++ maven-plugin-tools-ant/pom.xml | 85 +++ .../extractor/ant/AntMojoDescriptorExtractor.java | 240 ++++++ maven-plugin-tools-ant/src/site/apt/index.apt | 36 + maven-plugin-tools-ant/src/site/site.xml | 31 + .../ant/AntMojoDescriptorExtractorTest.java | 138 ++++ .../src/test/resources/basic/test.build.xml | 29 + .../src/test/resources/basic/test.mojos.xml | 74 ++ maven-plugin-tools-api/pom.xml | 90 +++ .../tools/plugin/DefaultPluginToolsRequest.java | 179 +++++ .../maven/tools/plugin/ExtendedMojoDescriptor.java | 54 ++ .../maven/tools/plugin/PluginToolsRequest.java | 138 ++++ .../AbstractScriptedMojoDescriptorExtractor.java | 228 ++++++ .../plugin/extractor/ExtractionException.java | 50 ++ .../plugin/extractor/MojoDescriptorExtractor.java | 48 ++ .../tools/plugin/scanner/DefaultMojoScanner.java | 157 ++++ .../maven/tools/plugin/scanner/MojoScanner.java | 57 ++ .../maven/tools/plugin/util/PluginUtils.java | 146 ++++ .../main/resources/META-INF/plexus/components.xml | 42 ++ maven-plugin-tools-api/src/site/apt/index.apt | 36 + maven-plugin-tools-api/src/site/site.xml | 31 + .../plugin/scanner/DefaultMojoScannerTest.java | 198 +++++ .../tools/plugin/scanner/ScannerTestExtractor.java | 63 ++ .../maven/tools/plugin/scanner/TestExtractor.java | 53 ++ .../maven/tools/plugin/util/PluginUtilsTest.java | 66 ++ .../apache/maven/tools/plugin/util/TestUtils.java | 70 ++ .../maven/tools/plugin/util/stubs/MojoStub.java | 100 +++ .../META-INF/plexus/scannerTestComponents.xml | 41 + maven-plugin-tools-api/src/test/resources/test.txt | 18 + .../src/test/resources/testExcludes.txt | 18 + maven-plugin-tools-beanshell/pom.xml | 75 ++ .../BeanshellMojoDescriptorExtractor.java | 140 ++++ .../src/main/resources/extractor.bsh | 242 ++++++ .../src/site/apt/index.apt | 32 + maven-plugin-tools-beanshell/src/site/site.xml | 31 + maven-plugin-tools-generators/pom.xml | 141 ++++ .../maven/tools/plugin/generator/Generator.java | 46 ++ .../tools/plugin/generator/GeneratorException.java | 33 + .../tools/plugin/generator/GeneratorUtils.java | 710 ++++++++++++++++++ .../generator/PluginDescriptorGenerator.java | 623 ++++++++++++++++ .../plugin/generator/PluginHelpGenerator.java | 458 ++++++++++++ .../plugin/generator/PluginXdocGenerator.java | 824 +++++++++++++++++++++ .../src/main/resources/help-class-source.vm | 498 +++++++++++++ .../src/main/resources/pluginxdoc.properties | 60 ++ .../src/main/resources/pluginxdoc_de.properties | 54 ++ .../src/main/resources/pluginxdoc_en.properties | 23 + .../src/main/resources/pluginxdoc_fr.properties | 59 ++ maven-plugin-tools-generators/src/site/site.xml | 34 + .../generator/AbstractGeneratorTestCase.java | 173 +++++ .../tools/plugin/generator/GeneratorUtilsTest.java | 205 +++++ .../generator/PluginDescriptorGeneratorTest.java | 130 ++++ .../plugin/generator/PluginHelpGeneratorTest.java | 40 + .../plugin/generator/PluginXdocGeneratorTest.java | 47 ++ .../plugin/generator/stubs/MavenReportStub.java | 80 ++ maven-plugin-tools-java/pom.xml | 113 +++ .../plugin/extractor/java/JavaMojoAnnotation.java | 369 +++++++++ .../java/JavaMojoDescriptorExtractor.java | 744 +++++++++++++++++++ maven-plugin-tools-java/src/site/apt/index.apt | 144 ++++ maven-plugin-tools-java/src/site/site.xml | 31 + .../java/JavaMojoDescriptorExtractorTest.java | 233 ++++++ .../src/test/resources/dir-flag.txt | 27 + .../src/test/resources/java-1.5/MyEnum.java | 33 + .../src/test/resources/java-1.5/MyMojo.java | 40 + .../test/resources/java-1.5/plugin-expected.xml | 50 ++ .../src/test/resources/source/Default.java | 59 ++ .../src/test/resources/source/Full.java | 86 +++ .../src/test/resources/source/package-info.java | 23 + .../src/test/resources/source/plugin-expected.xml | 124 ++++ .../src/test/resources/source2/Bla.java | 24 + .../resources/source2/JavaExtractorTestThree.java | 53 ++ .../src/test/resources/source2/plugin-expected.xml | 61 ++ .../src/test/resources/source2/sub/MyBla.java | 27 + .../src/test/resources/source3/TestAnnotation.java | 27 + .../src/test/resources/source3/plugin-expected.xml | 33 + maven-plugin-tools-javadoc/pom.xml | 139 ++++ maven-plugin-tools-javadoc/src/it/basic/pom.xml | 125 ++++ .../java/org/apache/maven/plugin/my/MyMojo.java | 116 +++ maven-plugin-tools-javadoc/src/it/basic/verify.bsh | 88 +++ maven-plugin-tools-javadoc/src/it/settings.xml | 55 ++ .../plugin/javadoc/AbstractMojoFieldTaglet.java | 93 +++ .../tools/plugin/javadoc/AbstractMojoTaglet.java | 426 +++++++++++ .../plugin/javadoc/AbstractMojoTypeTaglet.java | 93 +++ .../plugin/javadoc/MojoAggregatorTypeTaglet.java | 118 +++ .../plugin/javadoc/MojoComponentFieldTaglet.java | 120 +++ .../plugin/javadoc/MojoConfiguratorTypeTaglet.java | 117 +++ .../plugin/javadoc/MojoExecuteTypeTaglet.java | 123 +++ .../javadoc/MojoExecutionStrategyTypeTaglet.java | 117 +++ .../tools/plugin/javadoc/MojoGoalTypeTaglet.java | 117 +++ .../javadoc/MojoInheritByDefaultTypeTaglet.java | 118 +++ .../MojoInstantiationStrategyTypeTaglet.java | 117 +++ .../plugin/javadoc/MojoParameterFieldTaglet.java | 125 ++++ .../tools/plugin/javadoc/MojoPhaseTypeTaglet.java | 117 +++ .../plugin/javadoc/MojoReadOnlyFieldTaglet.java | 121 +++ .../plugin/javadoc/MojoRequiredFieldTaglet.java | 121 +++ ...MojoRequiresDependencyCollectionTypeTaglet.java | 117 +++ ...MojoRequiresDependencyResolutionTypeTaglet.java | 118 +++ .../MojoRequiresDirectInvocationTypeTaglet.java | 118 +++ .../javadoc/MojoRequiresOnLineTypeTaglet.java | 118 +++ .../javadoc/MojoRequiresProjectTypeTaglet.java | 118 +++ .../javadoc/MojoRequiresReportsTypeTaglet.java | 118 +++ .../plugin/javadoc/MojoThreadSafeTypeTaglet.java | 116 +++ .../apache/maven/tools/plugin/javadoc/package.html | 328 ++++++++ maven-plugin-tools-javadoc/src/site/apt/index.apt | 39 + .../src/site/apt/screenshots.apt | 33 + .../src/site/apt/usage.apt.vm | 112 +++ .../src/site/resources/images/javadoc.png | Bin 0 -> 23817 bytes maven-plugin-tools-javadoc/src/site/site.xml | 33 + maven-plugin-tools-model/pom.xml | 97 +++ .../tools/model/PluginMetadataParseException.java | 79 ++ .../plugin/tools/model/PluginMetadataParser.java | 202 +++++ .../src/main/mdo/plugin-metadata.mdo | 357 +++++++++ maven-plugin-tools-model/src/site/apt/index.apt | 41 + maven-plugin-tools-model/src/site/site.xml | 31 + .../tools/model/PluginMetadataParserTest.java | 72 ++ .../src/test/resources/test.mojos.xml | 37 + .../src/test/resources/test2.mojos.xml | 38 + maven-script/maven-script-ant/pom.xml | 80 ++ .../maven/script/ant/AntMojoComponentFactory.java | 39 + .../apache/maven/script/ant/AntMojoWrapper.java | 375 ++++++++++ .../apache/maven/script/ant/AntPropertyHelper.java | 204 +++++ .../main/resources/META-INF/plexus/components.xml | 28 + maven-script/maven-script-ant/src/site/site.xml | 36 + .../maven/script/ant/AntMojoWrapperTest.java | 301 ++++++++ .../test/resources/META-INF/maven/plugin-2.0.xml | 63 ++ .../test/resources/META-INF/maven/plugin-2.1.xml | 89 +++ .../src/test/resources/test.build.xml | 35 + maven-script/maven-script-beanshell/pom.xml | 45 ++ .../script/beanshell/BeanshellMojoAdapter.java | 73 ++ .../maven-script-beanshell/src/site/site.xml | 36 + maven-script/pom.xml | 41 + maven-script/src/site/site.xml | 30 + pom.xml | 373 ++++++++++ src/site/resources/images/plugin-tools-deps.png | Bin 0 -> 66386 bytes src/site/site.xml | 60 ++ src/site/xdoc/index.xml | 132 ++++ src/site/xdoc/plugin-tools-deps.odg | Bin 0 -> 17218 bytes 333 files changed, 31501 insertions(+) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-plugin-tools.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
