You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2022/07/30 17:31:10 UTC
[maven-plugin-tools] branch doxia-2.0.0 updated (bafe3504 -> 0dcb740d)
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 bafe3504 Doxia 2.0.0 ready
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
new 0dcb740d Doxia 2.0.0 ready
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 (bafe3504)
\
N -- N -- N refs/heads/doxia-2.0.0 (0dcb740d)
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:
.github/workflows/maven-verify.yml | 2 +-
.../maven/plugins/annotations/Parameter.java | 7 ++
maven-plugin-plugin/pom.xml | 16 +--
.../annotation-with-inheritance-from-deps/pom.xml | 45 +++-----
.../org/apache/maven/plugin/coreit/FirstMojo.java | 5 -
.../verify.groovy | 30 ++++--
.../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 +-
.../src/it/annotation-with-inheritance/pom.xml | 25 +----
.../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 | 6 +-
maven-plugin-plugin/src/it/asm-failure/pom.xml | 5 +-
.../antsample-maven-plugin/pom.xml | 3 +-
.../javasample-maven-plugin/pom.xml | 3 +-
.../src/it/help-basic-jdk11/pom.xml | 6 +-
maven-plugin-plugin/src/it/help-basic/pom.xml | 6 +-
maven-plugin-plugin/src/it/help-package/pom.xml | 6 +-
.../src/it/java-basic-annotations-jdk8/pom.xml | 9 +-
.../it/java-basic-annotations-jdkcurrent/pom.xml | 9 +-
.../src/it/java-basic-annotations/pom.xml | 4 +-
maven-plugin-plugin/src/it/java-basic/pom.xml | 2 +
maven-plugin-plugin/src/it/mplugin-191/pom.xml | 4 +-
maven-plugin-plugin/src/it/mplugin-223/pom.xml | 1 +
.../src/it/mplugin-272_java8/pom.xml | 116 +++++++++++----------
.../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 | 6 +-
.../src/it/mplugin-363_help-reproducible/pom.xml | 6 +-
.../pom.xml | 43 ++------
.../org/apache/maven/plugin/coreit/FirstMojo.java | 5 -
.../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 +-
.../src/it/plugin-report-annotations/pom.xml | 15 ++-
maven-plugin-plugin/src/it/plugin-report/pom.xml | 13 +++
.../src/it/source-encoding/latin-1/pom.xml | 3 +-
.../src/it/source-encoding/utf-8/pom.xml | 3 +-
.../plugin/plugin/AbstractGeneratorMojoTest.java | 5 +-
maven-plugin-tools-annotations/pom.xml | 32 +++---
.../JavaAnnotationsMojoDescriptorExtractor.java | 15 ++-
.../datamodel/ParameterAnnotationContent.java | 64 +++++++++---
.../scanner/DefaultMojoAnnotationsScanner.java | 6 +-
.../src/site/apt/index.apt | 1 +
.../plugin/extractor/annotations/FooInterface.java | 4 +-
.../extractor/annotations/FooInterfaceImpl.java | 4 +-
.../plugin/extractor/annotations/FooMojo.java | 13 ++-
.../annotations/TestAnnotationsReader.java | 53 +++++++---
.../scanner/DefaultMojoAnnotationsScannerTest.java | 19 ++--
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 | 9 +-
.../generator/AbstractGeneratorTestCase.java | 14 +--
.../tools/plugin/generator/GeneratorUtilsTest.java | 23 ++--
.../generator/PluginDescriptorGeneratorTest.java | 6 ++
.../plugin/generator/PluginHelpGeneratorTest.java | 12 ++-
maven-plugin-tools-java/pom.xml | 18 +---
.../JavaJavadocMojoDescriptorExtractor.java | 7 +-
.../javadoc/JavaMojoDescriptorExtractorTest.java | 38 ++++---
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 | 9 +-
.../maven/script/ant/AntMojoWrapperTest.java | 29 ++----
pom.xml | 38 +++----
80 files changed, 533 insertions(+), 647 deletions(-)
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
[maven-plugin-tools] 01/01: Doxia 2.0.0 ready
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch doxia-2.0.0
in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git
commit 0dcb740d24715a2eb632ee99557c85cccd1cca48
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Thu Jul 21 18:03:20 2022 +0200
Doxia 2.0.0 ready
---
maven-plugin-plugin/pom.xml | 8 ++++----
maven-plugin-plugin/src/it/plugin-report-annotations/pom.xml | 4 ++--
maven-plugin-plugin/src/it/plugin-report/pom.xml | 4 ++--
maven-plugin-tools-generators/pom.xml | 6 +++---
pom.xml | 10 +++-------
5 files changed, 14 insertions(+), 18 deletions(-)
diff --git a/maven-plugin-plugin/pom.xml b/maven-plugin-plugin/pom.xml
index 448f6bd9..03bed178 100644
--- a/maven-plugin-plugin/pom.xml
+++ b/maven-plugin-plugin/pom.xml
@@ -42,8 +42,8 @@
</prerequisites>
<properties>
- <doxiaVersion>1.11.1</doxiaVersion>
- <doxia-sitetoolsVersion>1.11.1</doxia-sitetoolsVersion>
+ <doxiaVersion>2.0.0-M3</doxiaVersion>
+ <doxia-sitetoolsVersion>2.0.0-M3</doxia-sitetoolsVersion>
<it.debug>true</it.debug>
</properties>
@@ -151,7 +151,7 @@
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-impl</artifactId>
- <version>3.1.0</version>
+ <version>4.0.0-M2</version>
</dependency>
<!-- plexus -->
@@ -328,7 +328,7 @@
<settingsFile>src/it/settings.xml</settingsFile>
<streamLogsOnFailures>true</streamLogsOnFailures>
<filterProperties>
- <sitePluginVersion>3.11.0</sitePluginVersion>
+ <sitePluginVersion>4.0.0-M3-SNAPSHOT</sitePluginVersion>
<projectInfoReportsPlugin>3.4.0</projectInfoReportsPlugin>
<antVersion>${antVersion}</antVersion>
</filterProperties>
diff --git a/maven-plugin-plugin/src/it/plugin-report-annotations/pom.xml b/maven-plugin-plugin/src/it/plugin-report-annotations/pom.xml
index be4a57f9..6361c5aa 100644
--- a/maven-plugin-plugin/src/it/plugin-report-annotations/pom.xml
+++ b/maven-plugin-plugin/src/it/plugin-report-annotations/pom.xml
@@ -64,12 +64,12 @@ under the License.
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-impl</artifactId>
- <version>3.1.0</version>
+ <version>4.0.0-M2</version>
</dependency>
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
- <version>3.1.0</version>
+ <version>4.0.0-M2</version>
</dependency>
</dependencies>
diff --git a/maven-plugin-plugin/src/it/plugin-report/pom.xml b/maven-plugin-plugin/src/it/plugin-report/pom.xml
index 6cdcefda..9f4ac9c1 100644
--- a/maven-plugin-plugin/src/it/plugin-report/pom.xml
+++ b/maven-plugin-plugin/src/it/plugin-report/pom.xml
@@ -64,12 +64,12 @@ under the License.
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-impl</artifactId>
- <version>3.1.0</version>
+ <version>4.0.0-M2</version>
</dependency>
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
- <version>3.1.0</version>
+ <version>4.0.0-M2</version>
</dependency>
</dependencies>
diff --git a/maven-plugin-tools-generators/pom.xml b/maven-plugin-tools-generators/pom.xml
index 88ef51eb..ef80b32c 100644
--- a/maven-plugin-tools-generators/pom.xml
+++ b/maven-plugin-tools-generators/pom.xml
@@ -51,7 +51,7 @@
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
- <version>3.1.0</version>
+ <version>4.0.0-M2</version>
</dependency>
<!-- plexus -->
@@ -67,7 +67,7 @@
<!-- other -->
<dependency>
<groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
+ <artifactId>velocity-engine-core</artifactId>
</dependency>
<dependency>
@@ -100,7 +100,7 @@
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-impl</artifactId>
- <version>3.1.0</version>
+ <version>4.0.0-M2</version>
<scope>test</scope>
<exclusions>
<exclusion>
diff --git a/pom.xml b/pom.xml
index c1ea31da..dbfb57b5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -184,24 +184,20 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-velocity</artifactId>
- <version>1.2</version>
+ <version>2.0</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
- <exclusion>
- <groupId>velocity</groupId>
- <artifactId>velocity</artifactId>
- </exclusion>
</exclusions>
</dependency>
<!-- other -->
<dependency>
<groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
- <version>1.7</version>
+ <artifactId>velocity-engine-core</artifactId>
+ <version>2.3</version>
</dependency>
<dependency>