This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a change to branch dependabot/maven/maven3Version-3.9.7
in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git
from 9e771ff5 Fix ITs
add 9813e5b4 [MPLUGIN-523] Switch to version 4.0.0-SNAPSHOT (#284)
add 705ae217 [MPLUGIN-525] Remove ant and beanshell support (#285)
add 8be17051 [MPLUGIN-527] Remove javadoc annotation support (#288)
add 010c9b2e [MPLUGIN-508] Upgrade to 4.0.0-beta-3 (#286)
add c0a9056d Bump resolverVersion from 1.9.18 to 1.9.20 (#290)
add f88732bc Merge remote-tracking branch 'origin/master' into
dependabot/maven/maven3Version-3.9.7
No new revisions were added by this update.
Summary of changes:
.github/workflows/maven-verify.yml | 5 +
maven-plugin-annotations/pom.xml | 2 +-
maven-plugin-plugin/pom.xml | 38 +-
.../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 | 29 --
.../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 | 52 --
.../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 -
.../src/it/help-package/invoker.properties | 18 -
maven-plugin-plugin/src/it/help-package/pom.xml | 77 ---
.../it/help-package/src/main/java/test/MyMojo.java | 31 --
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 | 21 -
.../src/it/ignore-plugin-class-realm/dep-b/pom.xml | 48 --
.../dep-b/src/main/java/test/ClassB.java | 28 -
.../ignore-plugin-class-realm/invoker.properties | 22 -
.../src/it/ignore-plugin-class-realm/pom.xml | 67 ---
.../src/it/ignore-plugin-class-realm/test/pom.xml | 76 ---
.../test/src/main/java/test/SomeMojo.java | 29 --
.../src/it/java-basic/invoker.properties | 20 -
maven-plugin-plugin/src/it/java-basic/pom.xml | 68 ---
.../apache/maven/plugin/coreit/CoreIt0013Mojo.java | 57 --
.../org/apache/maven/plugin/coreit/FirstMojo.java | 94 ----
.../org/apache/maven/plugin/coreit/Maximal.java | 64 ---
.../org/apache/maven/plugin/coreit/Minimal.java | 40 --
.../src/it/java-basic/verify.groovy | 184 -------
maven-plugin-plugin/src/it/skip/pom.xml | 6 +
.../apache/maven/plugin/coreit/CoreIt0013Mojo.java | 57 --
.../org/apache/maven/plugin/coreit/FirstMojo.java | 36 +-
.../org/apache/maven/plugin/coreit/SecondMojo.java | 33 --
.../src/it/source-encoding/latin-1/pom.xml | 6 +
.../latin-1/src/main/java/test/MyMojo.java | 4 +-
.../src/it/source-encoding/utf-8/pom.xml | 6 +
.../utf-8/src/main/java/test/MyMojo.java | 4 +-
.../src/it/v4api/invoker.properties | 1 +
.../java/org/apache/maven/its/v4api/FirstMojo.java | 29 +-
maven-plugin-plugin/src/it/v4api/verify.groovy | 53 +-
.../plugin/plugin/DescriptorGeneratorMojo.java | 157 +++++-
maven-plugin-report-plugin/pom.xml | 3 +-
.../antsample-maven-plugin/pom.xml | 78 ---
.../src/main/scripts/sample.build.xml | 35 --
.../src/main/scripts/sample.mojos.xml | 46 --
.../antsample-maven-plugin/src/site/site.xml | 41 --
.../javasample-maven-plugin/pom.xml | 6 +
.../src/main/java/test/MyMojo.java | 6 +-
.../src/it/fix-maven-since-3.x/pom.xml | 8 -
.../src/it/fix-maven-since-3.x/verify.groovy | 2 +-
.../src/it/mplugin-319_report-since/pom.xml | 6 +
.../src/main/java/org/MyMojo.java | 19 +-
.../invoker.properties | 18 -
.../src/it/plugin-info-jdk-default-version/pom.xml | 94 ----
.../apache/maven/plugins/issues/plugin/MyMojo.java | 74 ---
.../plugin-info-jdk-default-version/verify.groovy | 26 -
.../src/it/plugin-report-annotations/pom.xml | 12 +-
.../src/it/plugin-report/invoker.properties | 18 -
.../src/it/plugin-report/pom.xml | 124 -----
.../src/main/java/org/DummyReport.java | 182 -------
.../it/plugin-report/src/main/java/org/MyMojo.java | 62 ---
.../src/it/plugin-report/verify.groovy | 47 --
.../maven/plugin/plugin/report/PluginReport.java | 2 +-
.../EnhancedPluginDescriptorBuilder.java | 3 +-
.../plugin/descriptor/PluginDescriptorBuilder.java | 325 ++++++++++++
maven-plugin-tools-annotations/pom.xml | 6 +-
.../datamodel/ExecuteAnnotationContent.java | 15 +
.../datamodel/MojoAnnotationContent.java | 21 +-
.../scanner/DefaultMojoAnnotationsScanner.java | 17 +-
.../annotations/ParametersWithGenericsMojo.java | 3 +
.../scanner/DefaultMojoAnnotationsScannerTest.java | 6 +
maven-plugin-tools-api/pom.xml | 2 +-
.../tools/plugin/ExtendedPluginDescriptor.java | 14 +-
maven-plugin-tools-generators/pom.xml | 18 +-
.../generator/PluginDescriptorFilesGenerator.java | 87 +++-
.../plugin/generator/PluginHelpGenerator.java | 3 -
.../src/main/resources/help-class-source-v4.vm | 33 +-
.../src/main/resources/help-class-source.vm | 29 --
.../generator/AbstractGeneratorTestCase.java | 72 ++-
.../PluginDescriptorFilesGeneratorTest.java | 47 +-
maven-plugin-tools-java/pom.xml | 101 ----
.../JavaJavadocMojoDescriptorExtractor.java | 574 ---------------------
.../extractor/javadoc/JavadocMojoAnnotation.java | 503 ------------------
maven-plugin-tools-java/src/site/apt/index.apt | 149 ------
maven-plugin-tools-java/src/site/site.xml | 30 --
.../javadoc/JavaMojoDescriptorExtractorTest.java | 230 ---------
.../src/test/resources/MPLUGIN-290/Test.java | 27 -
.../test/resources/MPLUGIN-290/plugin-expected.xml | 33 --
.../src/test/resources/MPLUGIN-314/MyMojo.java | 36 --
.../test/resources/MPLUGIN-314/plugin-expected.xml | 56 --
.../src/test/resources/MPLUGIN-320/Exceptions.java | 32 --
.../test/resources/MPLUGIN-320/plugin-expected.xml | 33 --
.../src/test/resources/dir-flag.txt | 27 -
.../src/test/resources/java-1.5/MyEnum.java | 31 --
.../src/test/resources/java-1.5/MyMojo.java | 36 --
.../test/resources/java-1.5/plugin-expected.xml | 50 --
.../src/test/resources/source/Default.java | 52 --
.../src/test/resources/source/Full.java | 80 ---
.../src/test/resources/source/package-info.java | 23 -
.../src/test/resources/source/plugin-expected.xml | 124 -----
.../src/test/resources/source2/Bla.java | 21 -
.../resources/source2/JavaExtractorTestThree.java | 46 --
.../src/test/resources/source2/plugin-expected.xml | 61 ---
.../src/test/resources/source2/sub/MyBla.java | 23 -
.../src/test/resources/source3/TestAnnotation.java | 23 -
.../src/test/resources/source3/plugin-expected.xml | 33 --
maven-script/maven-plugin-tools-ant/pom.xml | 71 ---
.../extractor/ant/AntMojoDescriptorExtractor.java | 236 ---------
.../maven-plugin-tools-ant/src/site/apt/index.apt | 39 --
.../maven-plugin-tools-ant/src/site/site.xml | 30 --
.../ant/AntMojoDescriptorExtractorTest.java | 142 -----
.../src/test/resources/basic/test.build.xml | 29 --
.../src/test/resources/basic/test.mojos.xml | 74 ---
maven-script/maven-plugin-tools-beanshell/pom.xml | 62 ---
.../BeanshellMojoDescriptorExtractor.java | 140 -----
.../src/main/resources/extractor.bsh | 242 ---------
.../src/site/apt/index.apt | 35 --
.../maven-plugin-tools-beanshell/src/site/site.xml | 30 --
maven-script/maven-plugin-tools-model/pom.xml | 99 ----
.../model/PluginMetadataParseException.java | 73 ---
.../extractor/model/PluginMetadataParser.java | 168 ------
.../src/main/mdo/plugin-metadata.mdo | 357 -------------
.../src/site/apt/index.apt | 41 --
.../maven-plugin-tools-model/src/site/site.xml | 30 --
.../extractor/model/PluginMetadataParserTest.java | 71 ---
.../src/test/resources/test.mojos.xml | 37 --
.../src/test/resources/test2.mojos.xml | 38 --
maven-script/maven-script-ant/pom.xml | 101 ----
.../maven/script/ant/AntMojoComponentFactory.java | 39 --
.../apache/maven/script/ant/AntMojoWrapper.java | 324 ------------
.../apache/maven/script/ant/AntPropertyHelper.java | 167 ------
.../main/resources/META-INF/plexus/components.xml | 28 -
maven-script/maven-script-ant/src/site/site.xml | 35 --
.../maven/script/ant/AntMojoWrapperTest.java | 224 --------
.../test/resources/META-INF/maven/plugin-2.1.xml | 89 ----
.../src/test/resources/test.build.xml | 35 --
maven-script/maven-script-beanshell/pom.xml | 56 --
.../script/beanshell/BeanshellMojoAdapter.java | 61 ---
.../maven-script-beanshell/src/site/site.xml | 35 --
maven-script/pom.xml | 43 --
maven-script/src/site/site.xml | 30 --
pom.xml | 40 +-
159 files changed, 843 insertions(+), 8977 deletions(-)
delete mode 100644 maven-plugin-plugin/src/it/ant-basic/invoker.properties
delete mode 100644 maven-plugin-plugin/src/it/ant-basic/pom.xml
delete mode 100644
maven-plugin-plugin/src/it/ant-basic/src/main/scripts/touch.build.xml
delete mode 100644
maven-plugin-plugin/src/it/ant-basic/src/main/scripts/touch.mojos.xml
delete mode 100644 maven-plugin-plugin/src/it/ant-basic/verify.groovy
delete mode 100644
maven-plugin-plugin/src/it/ant-reference-parameter/invoker.properties
delete mode 100644 maven-plugin-plugin/src/it/ant-reference-parameter/pom.xml
delete mode 100644
maven-plugin-plugin/src/it/ant-reference-parameter/src/main/java/org/apache/maven/plugins/antWithRefs/ArtifactsTask.java
delete mode 100644
maven-plugin-plugin/src/it/ant-reference-parameter/src/main/resources/org/apache/maven/plugins/antWithRefs/antlib.xml
delete mode 100644
maven-plugin-plugin/src/it/ant-reference-parameter/src/main/scripts/test.build.xml
delete mode 100644
maven-plugin-plugin/src/it/ant-reference-parameter/src/main/scripts/test.mojos.xml
delete mode 100644
maven-plugin-plugin/src/it/ant-simple-usage/invoker.properties
delete mode 100644 maven-plugin-plugin/src/it/ant-simple-usage/plugin/pom.xml
delete mode 100644
maven-plugin-plugin/src/it/ant-simple-usage/plugin/src/main/scripts/test.build.xml
delete mode 100644
maven-plugin-plugin/src/it/ant-simple-usage/plugin/src/main/scripts/test.mojos.xml
delete mode 100644 maven-plugin-plugin/src/it/ant-simple-usage/pom.xml
delete mode 100644 maven-plugin-plugin/src/it/ant-simple-usage/usage/pom.xml
delete mode 100644 maven-plugin-plugin/src/it/ant-since-maven-plugin/pom.xml
delete mode 100644
maven-plugin-plugin/src/it/ant-since-maven-plugin/src/main/scripts/sample.build.xml
delete mode 100644
maven-plugin-plugin/src/it/ant-since-maven-plugin/src/main/scripts/sample.mojos.xml
delete mode 100644
maven-plugin-plugin/src/it/beanshell-simple/invoker.properties
delete mode 100644 maven-plugin-plugin/src/it/beanshell-simple/pom.xml
delete mode 100644
maven-plugin-plugin/src/it/beanshell-simple/src/main/scripts/touch.bsh
delete mode 100644 maven-plugin-plugin/src/it/beanshell-simple/verify.groovy
delete mode 100644 maven-plugin-plugin/src/it/help-package/invoker.properties
delete mode 100644 maven-plugin-plugin/src/it/help-package/pom.xml
delete mode 100644
maven-plugin-plugin/src/it/help-package/src/main/java/test/MyMojo.java
delete mode 100644 maven-plugin-plugin/src/it/help-package/verify.bsh
delete mode 100644
maven-plugin-plugin/src/it/ignore-plugin-class-realm/dep-a/pom.xml
delete mode 100644
maven-plugin-plugin/src/it/ignore-plugin-class-realm/dep-a/src/main/java/test/ClassA.java
delete mode 100644
maven-plugin-plugin/src/it/ignore-plugin-class-realm/dep-b/pom.xml
delete mode 100644
maven-plugin-plugin/src/it/ignore-plugin-class-realm/dep-b/src/main/java/test/ClassB.java
delete mode 100644
maven-plugin-plugin/src/it/ignore-plugin-class-realm/invoker.properties
delete mode 100644 maven-plugin-plugin/src/it/ignore-plugin-class-realm/pom.xml
delete mode 100644
maven-plugin-plugin/src/it/ignore-plugin-class-realm/test/pom.xml
delete mode 100644
maven-plugin-plugin/src/it/ignore-plugin-class-realm/test/src/main/java/test/SomeMojo.java
delete mode 100644 maven-plugin-plugin/src/it/java-basic/invoker.properties
delete mode 100644 maven-plugin-plugin/src/it/java-basic/pom.xml
delete mode 100644
maven-plugin-plugin/src/it/java-basic/src/main/java/org/apache/maven/plugin/coreit/CoreIt0013Mojo.java
delete mode 100644
maven-plugin-plugin/src/it/java-basic/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java
delete mode 100644
maven-plugin-plugin/src/it/java-basic/src/main/java/org/apache/maven/plugin/coreit/Maximal.java
delete mode 100644
maven-plugin-plugin/src/it/java-basic/src/main/java/org/apache/maven/plugin/coreit/Minimal.java
delete mode 100644 maven-plugin-plugin/src/it/java-basic/verify.groovy
delete mode 100644
maven-plugin-plugin/src/it/skip/src/main/java/org/apache/maven/plugin/coreit/CoreIt0013Mojo.java
delete mode 100644
maven-plugin-plugin/src/it/skip/src/main/java/org/apache/maven/plugin/coreit/SecondMojo.java
delete mode 100644
maven-plugin-report-plugin/src/it/fix-maven-since-3.x/antsample-maven-plugin/pom.xml
delete mode 100644
maven-plugin-report-plugin/src/it/fix-maven-since-3.x/antsample-maven-plugin/src/main/scripts/sample.build.xml
delete mode 100644
maven-plugin-report-plugin/src/it/fix-maven-since-3.x/antsample-maven-plugin/src/main/scripts/sample.mojos.xml
delete mode 100644
maven-plugin-report-plugin/src/it/fix-maven-since-3.x/antsample-maven-plugin/src/site/site.xml
delete mode 100644
maven-plugin-report-plugin/src/it/plugin-info-jdk-default-version/invoker.properties
delete mode 100644
maven-plugin-report-plugin/src/it/plugin-info-jdk-default-version/pom.xml
delete mode 100644
maven-plugin-report-plugin/src/it/plugin-info-jdk-default-version/src/main/java/org/apache/maven/plugins/issues/plugin/MyMojo.java
delete mode 100644
maven-plugin-report-plugin/src/it/plugin-info-jdk-default-version/verify.groovy
delete mode 100644
maven-plugin-report-plugin/src/it/plugin-report/invoker.properties
delete mode 100644 maven-plugin-report-plugin/src/it/plugin-report/pom.xml
delete mode 100644
maven-plugin-report-plugin/src/it/plugin-report/src/main/java/org/DummyReport.java
delete mode 100644
maven-plugin-report-plugin/src/it/plugin-report/src/main/java/org/MyMojo.java
delete mode 100644
maven-plugin-report-plugin/src/it/plugin-report/verify.groovy
create mode 100644
maven-plugin-report-plugin/src/main/java/org/apache/maven/plugins/plugin/descriptor/PluginDescriptorBuilder.java
delete mode 100644 maven-plugin-tools-java/pom.xml
delete mode 100644
maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/javadoc/JavaJavadocMojoDescriptorExtractor.java
delete mode 100644
maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/javadoc/JavadocMojoAnnotation.java
delete mode 100644 maven-plugin-tools-java/src/site/apt/index.apt
delete mode 100644 maven-plugin-tools-java/src/site/site.xml
delete mode 100644
maven-plugin-tools-java/src/test/java/org/apache/maven/tools/plugin/extractor/javadoc/JavaMojoDescriptorExtractorTest.java
delete mode 100644
maven-plugin-tools-java/src/test/resources/MPLUGIN-290/Test.java
delete mode 100644
maven-plugin-tools-java/src/test/resources/MPLUGIN-290/plugin-expected.xml
delete mode 100644
maven-plugin-tools-java/src/test/resources/MPLUGIN-314/MyMojo.java
delete mode 100644
maven-plugin-tools-java/src/test/resources/MPLUGIN-314/plugin-expected.xml
delete mode 100644
maven-plugin-tools-java/src/test/resources/MPLUGIN-320/Exceptions.java
delete mode 100644
maven-plugin-tools-java/src/test/resources/MPLUGIN-320/plugin-expected.xml
delete mode 100644 maven-plugin-tools-java/src/test/resources/dir-flag.txt
delete mode 100644
maven-plugin-tools-java/src/test/resources/java-1.5/MyEnum.java
delete mode 100644
maven-plugin-tools-java/src/test/resources/java-1.5/MyMojo.java
delete mode 100644
maven-plugin-tools-java/src/test/resources/java-1.5/plugin-expected.xml
delete mode 100644
maven-plugin-tools-java/src/test/resources/source/Default.java
delete mode 100644 maven-plugin-tools-java/src/test/resources/source/Full.java
delete mode 100644
maven-plugin-tools-java/src/test/resources/source/package-info.java
delete mode 100644
maven-plugin-tools-java/src/test/resources/source/plugin-expected.xml
delete mode 100644 maven-plugin-tools-java/src/test/resources/source2/Bla.java
delete mode 100644
maven-plugin-tools-java/src/test/resources/source2/JavaExtractorTestThree.java
delete mode 100644
maven-plugin-tools-java/src/test/resources/source2/plugin-expected.xml
delete mode 100644
maven-plugin-tools-java/src/test/resources/source2/sub/MyBla.java
delete mode 100644
maven-plugin-tools-java/src/test/resources/source3/TestAnnotation.java
delete mode 100644
maven-plugin-tools-java/src/test/resources/source3/plugin-expected.xml
delete mode 100644 maven-script/maven-plugin-tools-ant/pom.xml
delete mode 100644
maven-script/maven-plugin-tools-ant/src/main/java/org/apache/maven/tools/plugin/extractor/ant/AntMojoDescriptorExtractor.java
delete mode 100644 maven-script/maven-plugin-tools-ant/src/site/apt/index.apt
delete mode 100644 maven-script/maven-plugin-tools-ant/src/site/site.xml
delete mode 100644
maven-script/maven-plugin-tools-ant/src/test/java/org/apache/maven/tools/plugin/extractor/ant/AntMojoDescriptorExtractorTest.java
delete mode 100644
maven-script/maven-plugin-tools-ant/src/test/resources/basic/test.build.xml
delete mode 100644
maven-script/maven-plugin-tools-ant/src/test/resources/basic/test.mojos.xml
delete mode 100644 maven-script/maven-plugin-tools-beanshell/pom.xml
delete mode 100644
maven-script/maven-plugin-tools-beanshell/src/main/java/org/apache/maven/tools/plugin/extractor/beanshell/BeanshellMojoDescriptorExtractor.java
delete mode 100644
maven-script/maven-plugin-tools-beanshell/src/main/resources/extractor.bsh
delete mode 100644
maven-script/maven-plugin-tools-beanshell/src/site/apt/index.apt
delete mode 100644 maven-script/maven-plugin-tools-beanshell/src/site/site.xml
delete mode 100644 maven-script/maven-plugin-tools-model/pom.xml
delete mode 100644
maven-script/maven-plugin-tools-model/src/main/java/org/apache/maven/tools/plugin/extractor/model/PluginMetadataParseException.java
delete mode 100644
maven-script/maven-plugin-tools-model/src/main/java/org/apache/maven/tools/plugin/extractor/model/PluginMetadataParser.java
delete mode 100644
maven-script/maven-plugin-tools-model/src/main/mdo/plugin-metadata.mdo
delete mode 100644 maven-script/maven-plugin-tools-model/src/site/apt/index.apt
delete mode 100644 maven-script/maven-plugin-tools-model/src/site/site.xml
delete mode 100644
maven-script/maven-plugin-tools-model/src/test/java/org/apache/maven/tools/plugin/extractor/model/PluginMetadataParserTest.java
delete mode 100644
maven-script/maven-plugin-tools-model/src/test/resources/test.mojos.xml
delete mode 100644
maven-script/maven-plugin-tools-model/src/test/resources/test2.mojos.xml
delete mode 100644 maven-script/maven-script-ant/pom.xml
delete mode 100644
maven-script/maven-script-ant/src/main/java/org/apache/maven/script/ant/AntMojoComponentFactory.java
delete mode 100644
maven-script/maven-script-ant/src/main/java/org/apache/maven/script/ant/AntMojoWrapper.java
delete mode 100644
maven-script/maven-script-ant/src/main/java/org/apache/maven/script/ant/AntPropertyHelper.java
delete mode 100644
maven-script/maven-script-ant/src/main/resources/META-INF/plexus/components.xml
delete mode 100644 maven-script/maven-script-ant/src/site/site.xml
delete mode 100644
maven-script/maven-script-ant/src/test/java/org/apache/maven/script/ant/AntMojoWrapperTest.java
delete mode 100644
maven-script/maven-script-ant/src/test/resources/META-INF/maven/plugin-2.1.xml
delete mode 100644
maven-script/maven-script-ant/src/test/resources/test.build.xml
delete mode 100644 maven-script/maven-script-beanshell/pom.xml
delete mode 100644
maven-script/maven-script-beanshell/src/main/java/org/apache/maven/script/beanshell/BeanshellMojoAdapter.java
delete mode 100644 maven-script/maven-script-beanshell/src/site/site.xml
delete mode 100644 maven-script/pom.xml
delete mode 100644 maven-script/src/site/site.xml
