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 7a26415c2931ed004f6f59a3cd22861f14838953 Merge: 51d7c00 96195e9 Author: Emmanuel Bourg <[email protected]> Date: Mon Jun 26 09:21:44 2017 +0200 Updated version 3.4 from 'upstream/3.4' with Debian dir 00c6f74de0cf2e3cc069fd2232a88274e773b52f maven-plugin-annotations/pom.xml | 2 +- .../org/apache/maven/plugins/annotations/Mojo.java | 18 +- .../maven/plugins/annotations/Parameter.java | 3 +- maven-plugin-annotations/src/site/apt/index.apt.vm | 17 +- maven-plugin-plugin/pom.xml | 137 +++++++---- .../annotation-with-inheritance-from-deps/pom.xml | 7 + .../org/apache/maven/plugin/coreit/FirstMojo.java | 2 +- .../it/annotation-with-inheritance-reactor/pom.xml | 7 + .../src/it/help-basic/invoker.properties | 3 + maven-plugin-plugin/src/it/help-basic/pom.xml | 10 + .../it/help-basic/src/main/java/test/MyMojo.java | 17 +- .../src/it/help-basic/verify.groovy | 4 +- .../src/it/java-basic/verify.groovy | 86 ++----- .../invoker.properties | 37 +-- .../src/it/mplugin-272_java8/pom.xml | 83 +++++++ .../src/main/java/fr/ca/MyMojo.java} | 65 ++--- .../src/main/java/fr/ca/TestInterface.java} | 55 ++--- .../invoker.properties | 2 +- .../src/it/plugin-info-jdk-default-version/pom.xml | 7 + .../invoker.properties | 2 +- .../{help-basic => plugin-info-jdk/plugin}/pom.xml | 57 ++--- .../apache/maven/plugins/issues/plugin/MyMojo.java | 84 +++++++ .../it/plugin-info-jdk/pluginManagement/pom.xml | 53 ++++ .../apache/maven/plugins/issues/plugin/MyMojo.java | 84 +++++++ .../pom.xml | 26 +- .../src/it/plugin-info-jdk/property}/pom.xml | 34 ++- .../apache/maven/plugins/issues/plugin/MyMojo.java | 84 +++++++ .../requirement}/pom.xml | 65 +++-- .../apache/maven/plugins/issues/plugin/MyMojo.java | 84 +++++++ .../{help-basic => plugin-info-jdk}/verify.groovy | 11 +- .../maven/plugin/plugin/AbstractGeneratorMojo.java | 8 +- .../maven/plugin/plugin/HelpGeneratorMojo.java | 8 +- .../apache/maven/plugin/plugin/PluginReport.java | 156 ++++++------ .../maven/plugin/plugin/XdocGeneratorMojo.java | 57 ----- .../metadata/AddPluginArtifactMetadataMojo.java | 8 +- .../src/site/apt/examples/using-annotations.apt.vm | 56 ++++- maven-plugin-plugin/src/site/apt/index.apt | 6 +- maven-plugin-plugin/src/site/apt/usage.apt | 11 +- maven-plugin-plugin/src/site/site.xml | 3 + maven-plugin-tools-annotations/pom.xml | 6 +- .../JavaAnnotationsMojoDescriptorExtractor.java | 120 +++++---- .../annotations/datamodel/AnnotatedContent.java | 2 +- .../annotations/datamodel/AnnotatedField.java | 2 +- .../datamodel/ComponentAnnotationContent.java | 2 +- .../datamodel/ExecuteAnnotationContent.java | 2 +- .../datamodel/MojoAnnotationContent.java | 2 +- .../datamodel/ParameterAnnotationContent.java | 3 +- .../scanner/DefaultMojoAnnotationsScanner.java | 28 ++- .../annotations/scanner/MojoAnnotatedClass.java | 10 +- .../scanner/MojoAnnotationsScanner.java | 6 +- .../scanner/MojoAnnotationsScannerRequest.java | 2 +- .../scanner/visitors/MojoAnnotationVisitor.java | 2 +- .../scanner/visitors/MojoClassVisitor.java | 6 +- .../scanner/visitors/MojoFieldVisitor.java | 4 +- .../src/site/apt/index.apt | 3 +- .../{ => extractor}/annotations/FooMojo.java | 2 +- .../annotations/TestAnnotationsReader.java | 12 +- maven-plugin-tools-api/pom.xml | 10 +- .../tools/plugin/DefaultPluginToolsRequest.java | 4 +- .../maven/tools/plugin/PluginToolsRequest.java | 18 +- .../AbstractScriptedMojoDescriptorExtractor.java | 17 +- .../tools/plugin/scanner/DefaultMojoScanner.java | 10 +- maven-plugin-tools-generators/pom.xml | 6 +- .../tools/plugin/generator/GeneratorUtils.java | 4 +- .../generator/PluginDescriptorGenerator.java | 5 +- .../plugin/generator/PluginHelpGenerator.java | 29 ++- .../plugin/generator/PluginXdocGenerator.java | 3 +- .../src/main/resources/help-class-source.vm | 13 +- maven-plugin-tools-java/pom.xml | 17 +- .../JavaJavadocMojoDescriptorExtractor.java} | 272 +++++++-------------- .../JavadocMojoAnnotation.java} | 7 +- maven-plugin-tools-java/src/site/apt/index.apt | 3 +- .../JavaMojoDescriptorExtractorTest.java | 9 +- maven-plugin-tools-javadoc/pom.xml | 6 +- .../plugin/javadoc/MojoAggregatorTypeTaglet.java | 6 +- .../plugin/javadoc/MojoComponentFieldTaglet.java | 10 +- .../plugin/javadoc/MojoConfiguratorTypeTaglet.java | 6 +- .../plugin/javadoc/MojoExecuteTypeTaglet.java | 12 +- .../javadoc/MojoExecutionStrategyTypeTaglet.java | 6 +- .../tools/plugin/javadoc/MojoGoalTypeTaglet.java | 6 +- .../javadoc/MojoInheritByDefaultTypeTaglet.java | 6 +- .../MojoInstantiationStrategyTypeTaglet.java | 6 +- .../plugin/javadoc/MojoParameterFieldTaglet.java | 20 +- .../tools/plugin/javadoc/MojoPhaseTypeTaglet.java | 6 +- .../plugin/javadoc/MojoReadOnlyFieldTaglet.java | 6 +- .../plugin/javadoc/MojoRequiredFieldTaglet.java | 6 +- ...MojoRequiresDependencyCollectionTypeTaglet.java | 7 +- ...MojoRequiresDependencyResolutionTypeTaglet.java | 6 +- .../MojoRequiresDirectInvocationTypeTaglet.java | 6 +- .../javadoc/MojoRequiresOnLineTypeTaglet.java | 6 +- .../javadoc/MojoRequiresProjectTypeTaglet.java | 6 +- .../javadoc/MojoRequiresReportsTypeTaglet.java | 6 +- .../plugin/javadoc/MojoThreadSafeTypeTaglet.java | 5 +- .../maven-plugin-tools-ant}/pom.xml | 8 +- .../extractor/ant/AntMojoDescriptorExtractor.java | 19 +- .../maven-plugin-tools-ant}/src/site/apt/index.apt | 3 +- .../maven-plugin-tools-ant}/src/site/site.xml | 0 .../ant/AntMojoDescriptorExtractorTest.java | 0 .../src/test/resources/basic/test.build.xml | 0 .../src/test/resources/basic/test.mojos.xml | 0 .../maven-plugin-tools-beanshell}/pom.xml | 4 +- .../BeanshellMojoDescriptorExtractor.java | 6 +- .../src/main/resources/extractor.bsh | 0 .../src/site/apt/index.apt | 3 +- .../src/site/site.xml | 0 .../maven-plugin-tools-model}/pom.xml | 8 +- .../tools/model/PluginMetadataParseException.java | 0 .../plugin/tools/model/PluginMetadataParser.java | 0 .../src/main/mdo/plugin-metadata.mdo | 0 .../src/site/apt/index.apt | 0 .../maven-plugin-tools-model}/src/site/site.xml | 0 .../tools/model/PluginMetadataParserTest.java | 0 .../src/test/resources/test.mojos.xml | 0 .../src/test/resources/test2.mojos.xml | 0 maven-script/maven-script-ant/pom.xml | 6 +- .../maven/script/ant/AntMojoComponentFactory.java | 3 + .../apache/maven/script/ant/AntMojoWrapper.java | 26 +- .../apache/maven/script/ant/AntPropertyHelper.java | 3 +- maven-script/maven-script-beanshell/pom.xml | 2 +- .../script/beanshell/BeanshellMojoAdapter.java | 4 +- maven-script/pom.xml | 5 +- pom.xml | 68 +++--- .../site/resources/download.cgi | 14 +- src/site/resources/images/plugin-tools-deps.png | Bin 66386 -> 47339 bytes src/site/site.xml | 3 + src/site/xdoc/download.xml.vm | 126 ++++++++++ src/site/xdoc/index.xml | 78 +++--- src/site/xdoc/plugin-tools-deps.odg | Bin 17218 -> 26872 bytes 128 files changed, 1584 insertions(+), 1049 deletions(-) -- 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
