Remove javadoc taglet config

It used to refer to old maven-plugin-tools-javadoc which is no
longer available in maven-plugin-tools 3.6
f38
Severin Gehwolf 5 years ago
parent 7e97fddd04
commit 3d5d01cff7

@ -1,6 +1,6 @@
Name: maven-parent
Version: 34
Release: 2%{?dist}
Release: 3%{?dist}
Summary: Apache Maven parent POM
License: ASL 2.0
@ -23,6 +23,8 @@ Obsoletes: maven-shared < 22-9
Provides: maven-plugins-pom = %{version}-%{release}
Obsoletes: maven-plugins-pom < 28-9
Patch1: remove_javadoc_plugin_taglet.patch
%description
Apache Maven parent POM file used by other Maven projects.
@ -35,6 +37,8 @@ Apache Maven parent POM file used by other Maven projects.
%pom_remove_plugin :maven-scm-publish-plugin
%pom_remove_plugin :maven-site-plugin
%patch1 -p2
%build
%mvn_build
@ -45,6 +49,9 @@ Apache Maven parent POM file used by other Maven projects.
%doc LICENSE NOTICE
%changelog
* Fri Mar 27 2020 Severin Gehwolf <sgehwolf@redhat.com> - 34-3
- Remove javadoc taglet configuration which is not longer available
* Wed Mar 25 2020 Severin Gehwolf <sgehwolf@redhat.com> - 34-2
- Remove explicit requirement on maven-plugin-tools-javadoc

@ -0,0 +1,24 @@
diff --git a/maven-parent-34/maven-plugins/pom.xml b/maven-parent-34/maven-plugins/pom.xml
index ef0aebe..df9fbc7 100644
--- a/maven-parent-34/maven-plugins/pom.xml
+++ b/maven-parent-34/maven-plugins/pom.xml
@@ -94,19 +94,6 @@ under the License.
</dependency>
</dependencies>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <tagletArtifacts>
- <tagletArtifact combine.id="org.apache.maven.plugin-tools:maven-plugin-tools-javadoc">
- <groupId>org.apache.maven.plugin-tools</groupId>
- <artifactId>maven-plugin-tools-javadoc</artifactId>
- <version>${mavenPluginToolsVersion}</version>
- </tagletArtifact>
- </tagletArtifacts>
- </configuration>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
Loading…
Cancel
Save