You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2020/04/17 14:56:32 UTC
[cxf] 01/04: Update to Javadoc plugin 3.2.0
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit d0ab91453608304dd9284aea3e7a9a829d755fdc
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Fri Apr 17 11:35:37 2020 +0100
Update to Javadoc plugin 3.2.0
---
maven-plugins/java2swagger-plugin/pom.xml | 1 -
maven-plugins/java2wadl-plugin/pom.xml | 1 -
.../org/apache/cxf/maven_plugin/javatowadl/ParseJavaDocMojo.java | 4 ++--
parent/pom.xml | 5 +++++
pom.xml | 2 +-
5 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/maven-plugins/java2swagger-plugin/pom.xml b/maven-plugins/java2swagger-plugin/pom.xml
index 90a40a4..7a0d557 100644
--- a/maven-plugins/java2swagger-plugin/pom.xml
+++ b/maven-plugins/java2swagger-plugin/pom.xml
@@ -118,7 +118,6 @@
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>3.0.1</version>
<exclusions>
<exclusion>
<groupId>org.apache.maven</groupId>
diff --git a/maven-plugins/java2wadl-plugin/pom.xml b/maven-plugins/java2wadl-plugin/pom.xml
index 0a653cb..c2f2277 100644
--- a/maven-plugins/java2wadl-plugin/pom.xml
+++ b/maven-plugins/java2wadl-plugin/pom.xml
@@ -103,7 +103,6 @@
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>3.0.1</version>
<exclusions>
<exclusion>
<groupId>org.apache.maven</groupId>
diff --git a/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ParseJavaDocMojo.java b/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ParseJavaDocMojo.java
index f5ce752..7830be8 100644
--- a/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ParseJavaDocMojo.java
+++ b/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ParseJavaDocMojo.java
@@ -34,8 +34,8 @@ import org.apache.maven.plugins.javadoc.JavadocReport;
import org.apache.maven.plugins.javadoc.options.DocletArtifact;
import org.apache.maven.plugins.javadoc.resolver.ResourceResolver;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.shared.artifact.resolve.ArtifactResolver;
-import org.apache.maven.shared.dependencies.resolve.DependencyResolver;
+import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolver;
+import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolver;
import org.apache.maven.toolchain.ToolchainManager;
import org.codehaus.plexus.archiver.manager.ArchiverManager;
diff --git a/parent/pom.xml b/parent/pom.xml
index 73ad505..d7c4c06 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -2516,6 +2516,11 @@
<artifactId>wss4j-ws-security-policy-stax</artifactId>
<version>${cxf.wss4j.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>3.2.0</version>
+ </dependency>
</dependencies>
</dependencyManagement>
<profiles>
diff --git a/pom.xml b/pom.xml
index be98bdc..bb3f23d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -463,7 +463,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>3.1.1</version>
+ <version>3.2.0</version>
<configuration>
<attach>true</attach>
<source>${cxf.jdk.version}</source>