You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by cs...@apache.org on 2022/04/17 13:14:34 UTC
[maven-docck-plugin] branch maven-3.2.5 created (now af2382c)
This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a change to branch maven-3.2.5
in repository https://gitbox.apache.org/repos/asf/maven-docck-plugin.git
at af2382c Update to Maven 3.2.5
This branch includes the following new commits:
new af2382c Update to Maven 3.2.5
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.
[maven-docck-plugin] 01/01: Update to Maven 3.2.5
Posted by cs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a commit to branch maven-3.2.5
in repository https://gitbox.apache.org/repos/asf/maven-docck-plugin.git
commit af2382ce520d2874d8beeb2236f9874f60827ccc
Author: Tamas Cservenak <ta...@cservenak.net>
AuthorDate: Sun Apr 17 15:14:09 2022 +0200
Update to Maven 3.2.5
---
pom.xml | 15 +++++----------
.../maven/plugin/docck/CheckPluginDocumentationMojo.java | 5 ++++-
2 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/pom.xml b/pom.xml
index 26852f1..bd83f10 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,7 +62,7 @@ under the License.
</distributionManagement>
<properties>
- <mavenVersion>2.2.1</mavenVersion>
+ <mavenVersion>3.2.5</mavenVersion>
<javaVersion>8</javaVersion>
<project.build.outputTimestamp>2020-04-07T21:04:00Z</project.build.outputTimestamp>
</properties>
@@ -70,7 +70,7 @@ under the License.
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
+ <artifactId>maven-core</artifactId>
<version>${mavenVersion}</version>
</dependency>
<dependency>
@@ -88,11 +88,6 @@ under the License.
<artifactId>maven-plugin-api</artifactId>
<version>${mavenVersion}</version>
</dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-descriptor</artifactId>
- <version>${mavenVersion}</version>
- </dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
@@ -117,18 +112,18 @@ under the License.
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-tools-api</artifactId>
- <version>3.2</version>
+ <version>3.6.4</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-tools-java</artifactId>
- <version>3.2</version>
+ <version>3.6.4</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-tools-beanshell</artifactId>
- <version>3.2</version>
+ <version>3.6.4</version>
<scope>runtime</scope>
</dependency>
<dependency>
diff --git a/src/main/java/org/apache/maven/plugin/docck/CheckPluginDocumentationMojo.java b/src/main/java/org/apache/maven/plugin/docck/CheckPluginDocumentationMojo.java
index e92a6f4..a826008 100644
--- a/src/main/java/org/apache/maven/plugin/docck/CheckPluginDocumentationMojo.java
+++ b/src/main/java/org/apache/maven/plugin/docck/CheckPluginDocumentationMojo.java
@@ -29,6 +29,8 @@ import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.project.MavenProject;
+import org.apache.maven.tools.plugin.DefaultPluginToolsRequest;
+import org.apache.maven.tools.plugin.PluginToolsRequest;
import org.apache.maven.tools.plugin.extractor.ExtractionException;
import org.apache.maven.tools.plugin.scanner.MojoScanner;
import org.codehaus.plexus.util.IOUtil;
@@ -66,7 +68,8 @@ public class CheckPluginDocumentationMojo
try
{
- mojoScanner.populatePluginDescriptor( project, descriptor );
+ DefaultPluginToolsRequest request = new DefaultPluginToolsRequest( project, descriptor );
+ mojoScanner.populatePluginDescriptor( request );
}
catch ( InvalidPluginDescriptorException e )
{