You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by gi...@apache.org on 2022/10/11 13:29:40 UTC
[maven-plugin-tools] branch dependabot/maven/org.codehaus.plexus-plexus-bsh-factory-1.0-alpha-9 updated (62501890 -> 585c6c7a)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch dependabot/maven/org.codehaus.plexus-plexus-bsh-factory-1.0-alpha-9
in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git
discard 62501890 Bump plexus-bsh-factory from 1.0-alpha-7 to 1.0-alpha-9
add 0e2b37f7 Cleanup IT tests - remove skipTests
add f534eaae [MPLUGIN-399] Upgrade project dependencies after JDK 1.8
add 78032652 [MPLUGIN-396] Allow @Deprecated annotation without javadoc tag
add 292116ee Bump assertj-core from 3.22.0 to 3.23.1
add e4b56651 Bump mockito-core from 2.28.2 to 3.12.4
add 6981538f [MPLUGIN-297] don't duplicate version from pluginManagement
add c6b1542b link to "Guide to Configuring Plug-Ins" should use HTTPS
add affaa0e5 [MPLUGIN-402] optionally render <extensions>true</extensions> in usage section
add 7580f40a [MPLUGIN-404] Set JDK prerequisite preferably from release parameter or maven.compiler.release property
add b0ab1499 [MPLUGIN-405] Don't print empty Memory, Disk Space in System Requirements
add b6c0ac26 Bump plexus-utils
add 4955a6a0 Bump plexus-utils to 3.4.2
add e896387c [MPLUGIN-407] Remove duplicate code from PluginReport
add b5d28ae4 [MPLUGIN-406] Deprecate requirements parameter in report Mojo
add b8fd4c92 Use plexusUtilsVersion property in IT test
add 755304bf [MPLUGIN-409] Prepare for Doxia (Sitetools) 2.0.0
add 8905fcf2 Use shared GH actions v3
add bbaec8cb [MPLUGIN-411] Get rid of plexus-compiler-manager from tests
add f2859283 [MPLUGIN-393] Upgrade to JUnit 5 and @Inject annotations
add 3760daec [MPLUGIN-412] Use Maven core artifacts in provided scope
add c32725ee Bump maven-parent from 36 to 37
add 50d5679d [MPLUGIN-410] Create implementation attribute for @Parameter
add 319a3416 [MPLUGIN-400] Add system requirements history section
add 007f7378 [MPLUGIN-415] Upgrade Maven Reporting API to 3.1.1/Maven Reporting Impl to 3.2.0
add 706b1d0b [MPLUGIN-408] helpmojo improvement
add b1bc1c6e [MPLUGIN-390] Do not overwrite generate files with no content change (#67)
add 10b615e9 Bump junit-bom from 5.8.2 to 5.9.1 (#143)
add 8f9ee789 Bump qdox from 2.0.1 to 2.0.2 (#141)
add 585c6c7a Bump plexus-bsh-factory from 1.0-alpha-7 to 1.0-alpha-9
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 (62501890)
\
N -- N -- N refs/heads/dependabot/maven/org.codehaus.plexus-plexus-bsh-factory-1.0-alpha-9 (585c6c7a)
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.
No new revisions were added by this update.
Summary of changes:
.github/workflows/maven-verify.yml | 2 +-
.../maven/plugins/annotations/Parameter.java | 7 +
maven-plugin-plugin/pom.xml | 39 +--
.../annotation-with-inheritance-from-deps/pom.xml | 45 +--
.../org/apache/maven/plugin/coreit/FirstMojo.java | 5 -
.../verify.groovy | 37 ++-
.../invoker.properties | 2 +-
.../apache/maven/plugins/AbstractFirstMojo.java | 11 -
.../org/apache/maven/plugin/coreit/FirstMojo.java | 4 -
.../it/annotation-with-inheritance-reactor/pom.xml | 41 +--
.../verify.groovy | 8 +-
.../annotation-with-inheritance/invoker.properties | 4 +-
.../src/it/annotation-with-inheritance/pom.xml | 27 +-
.../maven/plugin/coreit/AbstractFirstMojo.java | 11 -
.../maven/plugin/coreit/AbstractFooMojo.java | 12 -
.../org/apache/maven/plugin/coreit/FirstMojo.java | 4 -
.../org/apache/maven/plugin/coreit/ThirdMojo.java | 5 -
.../it/annotation-with-inheritance/verify.groovy | 13 +-
.../src/it/ant-basic/invoker.properties | 2 +-
.../it/ant-reference-parameter/invoker.properties | 2 +-
.../src/it/ant-simple-usage/invoker.properties | 2 +-
maven-plugin-plugin/src/it/asm-failure/pom.xml | 5 +-
.../src/it/beanshell-simple/invoker.properties | 2 +-
.../antsample-maven-plugin/pom.xml | 3 +-
.../antsample-maven-plugin/src/site/site.xml | 7 +-
.../javasample-maven-plugin/pom.xml | 3 +-
.../javasample-maven-plugin/src/site/site.xml | 7 +-
.../src/it/fix-maven-since-3.x/pom.xml | 2 +-
.../expected-help.txt | 6 +-
.../invoker.properties | 39 ++-
.../pom.xml | 12 +-
.../src/main/java/test/MyMojo.java | 7 +-
.../test.properties | 0
.../verify.groovy | 12 +-
.../src/it/help-basic-jdk11/invoker.properties | 7 +-
.../src/it/help-basic-jdk11/pom.xml | 6 +-
.../src/it/help-basic/invoker.properties | 8 +-
maven-plugin-plugin/src/it/help-basic/pom.xml | 6 +-
maven-plugin-plugin/src/it/help-package/pom.xml | 6 +-
.../ignore-plugin-class-realm/invoker.properties | 2 +-
.../java-basic-annotations-jdk8/invoker.properties | 7 +-
.../src/it/java-basic-annotations-jdk8/pom.xml | 11 +-
.../it/java-basic-annotations-jdk8/verify.groovy | 5 +-
.../invoker.properties | 4 +-
.../it/java-basic-annotations-jdkcurrent/pom.xml | 9 +-
.../verify.groovy | 5 +-
.../it/java-basic-annotations/invoker.properties | 4 +-
.../src/it/java-basic-annotations/pom.xml | 6 +-
.../org/apache/maven/plugin/coreit/FirstMojo.java | 2 +
.../maven/plugin/coreit/MPlugin396Mojo.java} | 8 +-
.../src/it/java-basic-annotations/verify.groovy | 17 +-
.../src/it/java-basic/invoker.properties | 2 +-
maven-plugin-plugin/src/it/java-basic/pom.xml | 2 +
.../src/it/mplugin-187/invoker.properties | 2 +-
maven-plugin-plugin/src/it/mplugin-191/pom.xml | 4 +-
.../src/it/mplugin-223/invoker.properties | 2 +-
maven-plugin-plugin/src/it/mplugin-223/pom.xml | 1 +
.../src/it/mplugin-272_java8/pom.xml | 116 +++----
.../invoker.properties | 39 ++-
.../src/it/mplugin-299_no-configuration/pom.xml | 6 +-
.../it/mplugin-305_defaultMojoDependencies/pom.xml | 1 +
.../it/mplugin-305_emptyMojoDependencies/pom.xml | 1 +
.../it/mplugin-305_singleMojoDependencies/pom.xml | 1 +
.../src/it/mplugin-319_report-since/pom.xml | 1 +
.../src/it/mplugin-324_javadoc/pom.xml | 8 +-
.../src/it/mplugin-363_help-reproducible/pom.xml | 6 +-
.../it/mplugin-363_help-reproducible/verify.groovy | 4 +-
.../pom.xml | 43 +--
.../org/apache/maven/plugin/coreit/FirstMojo.java | 5 -
.../invoker.properties | 2 +-
.../pom.xml | 26 +-
.../org/apache/maven/plugin/coreit/FirstMojo.java | 0
.../it/{ant-basic => mplugin-390}/verify.groovy | 9 +-
.../src/it/mplugin-394_report-encoding/pom.xml | 6 +-
maven-plugin-plugin/src/it/packaging-jar/pom.xml | 13 +-
.../src/it/plugin-info-jdk-default-version/pom.xml | 7 +-
maven-plugin-plugin/src/it/plugin-info-jdk/pom.xml | 1 +
.../{property => propertyRelease}/pom.xml | 5 +-
.../src/main/resources/META-INF/maven/plugin.xml | 4 +-
.../src/it/plugin-info-jdk/verify.groovy | 1 +
.../plugin-report-annotations/invoker.properties | 2 +-
.../src/it/plugin-report-annotations/pom.xml | 23 +-
.../invoker.properties | 2 +-
.../pom.xml | 57 ++--
.../src/main/java/org/MyMojo.java | 0
.../verify.groovy | 57 ++--
.../src/it/plugin-report/invoker.properties | 2 +-
maven-plugin-plugin/src/it/plugin-report/pom.xml | 24 +-
.../src/it/plugin-report/verify.bsh | 56 ----
.../verify.groovy | 55 ++--
maven-plugin-plugin/src/it/skip/invoker.properties | 4 +-
.../src/it/source-encoding/latin-1/pom.xml | 3 +-
.../src/it/source-encoding/utf-8/pom.xml | 3 +-
.../maven/plugin/plugin/AbstractGeneratorMojo.java | 302 +-----------------
.../plugin/plugin/DescriptorGeneratorMojo.java | 288 +++++++++++++++--
.../maven/plugin/plugin/HelpGeneratorMojo.java | 85 +++--
.../plugin/plugin/{ => report}/PluginReport.java | 270 ++++++++--------
.../maven/plugin/plugin/report/Requirements.java | 94 ++++++
.../plugin/plugin/report/RequirementsHistory.java | 51 +--
.../src/main/mdo/pluginRequirements.mdo | 78 -----
.../src/main/resources/plugin-report.properties | 8 +-
.../src/main/resources/plugin-report_de.properties | 20 +-
.../src/main/resources/plugin-report_fr.properties | 22 +-
.../src/main/resources/plugin-report_sv.properties | 30 +-
.../plugin/plugin/AbstractGeneratorMojoTest.java | 5 +-
.../maven/plugin/plugin/HelpGeneratorMojoTest.java | 63 ++++
maven-plugin-tools-annotations/pom.xml | 34 +-
.../JavaAnnotationsMojoDescriptorExtractor.java | 15 +-
.../datamodel/ParameterAnnotationContent.java | 64 +++-
.../scanner/DefaultMojoAnnotationsScanner.java | 30 +-
.../scanner/MojoAnnotationsScanner.java | 8 +-
.../scanner/visitors/MojoClassVisitor.java | 9 +-
.../scanner/visitors/MojoFieldVisitor.java | 12 +-
.../src/site/apt/index.apt | 1 +
.../extractor/annotations/DeprecatedMojo.java | 24 +-
.../plugin/extractor/annotations/FooInterface.java | 4 +-
.../extractor/annotations/FooInterfaceImpl.java | 4 +-
.../plugin/extractor/annotations/FooMojo.java | 13 +-
.../annotations/TestAnnotationsReader.java | 53 +++-
.../scanner/DefaultMojoAnnotationsScannerTest.java | 51 ++-
maven-plugin-tools-api/pom.xml | 19 +-
.../tools/plugin/scanner/DefaultMojoScanner.java | 5 +
.../main/resources/META-INF/plexus/components.xml | 42 ---
.../plugin/scanner/DefaultMojoScannerTest.java | 39 ++-
.../maven/tools/plugin/util/PluginUtilsTest.java | 12 +-
.../apache/maven/tools/plugin/util/TestUtils.java | 6 +-
maven-plugin-tools-generators/pom.xml | 13 +-
.../generator/PluginDescriptorGenerator.java | 38 +--
.../plugin/generator/PluginHelpGenerator.java | 350 +++------------------
.../plugin/generator/PluginXdocGenerator.java | 4 +-
.../generator/AbstractGeneratorTestCase.java | 14 +-
.../tools/plugin/generator/GeneratorUtilsTest.java | 23 +-
.../generator/PluginDescriptorGeneratorTest.java | 6 +
.../plugin/generator/PluginHelpGeneratorTest.java | 40 ---
maven-plugin-tools-java/pom.xml | 18 +-
.../JavaJavadocMojoDescriptorExtractor.java | 7 +-
.../javadoc/JavaMojoDescriptorExtractorTest.java | 40 ++-
maven-script/maven-plugin-tools-ant/pom.xml | 19 +-
.../extractor/ant/AntMojoDescriptorExtractor.java | 9 +-
.../ant/AntMojoDescriptorExtractorTest.java | 27 +-
maven-script/maven-plugin-tools-beanshell/pom.xml | 14 +-
.../BeanshellMojoDescriptorExtractor.java | 11 +-
maven-script/maven-plugin-tools-model/pom.xml | 4 +-
.../extractor/model/PluginMetadataParserTest.java | 18 +-
maven-script/maven-script-ant/pom.xml | 10 +-
.../maven/script/ant/AntMojoWrapperTest.java | 29 +-
pom.xml | 61 ++--
147 files changed, 1646 insertions(+), 1977 deletions(-)
copy maven-plugin-plugin/src/it/{help-basic => help-basic-deprecated-annotation-only}/expected-help.txt (76%)
copy maven-plugin-plugin/src/it/{mplugin-299_no-configuration => help-basic-deprecated-annotation-only}/invoker.properties (90%)
copy maven-plugin-plugin/src/it/{help-basic => help-basic-deprecated-annotation-only}/pom.xml (88%)
copy maven-plugin-plugin/src/it/{help-basic => help-basic-deprecated-annotation-only}/src/main/java/test/MyMojo.java (91%)
copy maven-plugin-plugin/src/it/{help-basic-jdk11 => help-basic-deprecated-annotation-only}/test.properties (100%)
copy maven-plugin-plugin/src/it/{help-basic => help-basic-deprecated-annotation-only}/verify.groovy (83%)
copy maven-plugin-plugin/src/it/{java-basic-annotations-jdkcurrent/src/main/java/org/apache/maven/plugin/coreit/Minimal.java => java-basic-annotations/src/main/java/org/apache/maven/plugin/coreit/MPlugin396Mojo.java} (93%)
copy maven-plugin-plugin/src/it/{mplugin-363_help-reproducible => mplugin-390}/invoker.properties (96%)
copy maven-plugin-plugin/src/it/{mplugin-382-exclude-provided-dependency => mplugin-390}/pom.xml (78%)
copy maven-plugin-plugin/src/it/{mplugin-370-maven-deps-scope-bad => mplugin-390}/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java (100%)
copy maven-plugin-plugin/src/it/{ant-basic => mplugin-390}/verify.groovy (84%)
copy maven-plugin-plugin/src/it/plugin-info-jdk/{property => propertyRelease}/pom.xml (85%)
copy maven-plugin-plugin/src/it/plugin-info-jdk/{property => propertyRelease}/src/main/resources/META-INF/maven/plugin.xml (95%)
copy maven-plugin-plugin/src/it/{asm-failure => plugin-report-requirements-history}/invoker.properties (97%)
copy maven-plugin-plugin/src/it/{plugin-info-jdk-default-version => plugin-report-requirements-history}/pom.xml (71%)
copy maven-plugin-plugin/src/it/{plugin-report-annotations => plugin-report-requirements-history}/src/main/java/org/MyMojo.java (100%)
copy maven-plugin-plugin/src/it/{mplugin-319_report-since => plugin-report-requirements-history}/verify.groovy (66%)
delete mode 100644 maven-plugin-plugin/src/it/plugin-report/verify.bsh
copy maven-plugin-plugin/src/it/{mplugin-319_report-since => plugin-report}/verify.groovy (68%)
rename maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/{ => report}/PluginReport.java (81%)
create mode 100644 maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/report/Requirements.java
copy maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/extractor/annotations/datamodel/AnnotatedField.java => maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/report/RequirementsHistory.java (53%)
delete mode 100644 maven-plugin-plugin/src/main/mdo/pluginRequirements.mdo
create mode 100644 maven-plugin-plugin/src/test/java/org/apache/maven/plugin/plugin/HelpGeneratorMojoTest.java
copy maven-plugin-plugin/src/it/mplugin-272_java8/src/main/java/fr/ca/MyMojo.java => maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/DeprecatedMojo.java (71%)
copy maven-plugin-tools-java/src/test/resources/source2/Bla.java => maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/FooInterface.java (89%)
copy maven-plugin-tools-java/src/test/resources/source2/Bla.java => maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/FooInterfaceImpl.java (87%)
delete mode 100644 maven-plugin-tools-api/src/main/resources/META-INF/plexus/components.xml
delete mode 100644 maven-plugin-tools-generators/src/test/java/org/apache/maven/tools/plugin/generator/PluginHelpGeneratorTest.java