[maven-javadoc-plugin] Remove dependency on maven2
Mikolaj Izdebski
mizdebsk at fedoraproject.org
Mon Jan 27 09:25:45 UTC 2014
commit f3b00758e025e927af22f9093cc3c9d138f0988b
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Mon Jan 27 10:20:53 2014 +0100
Remove dependency on maven2
maven-javadoc-plugin.spec | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/maven-javadoc-plugin.spec b/maven-javadoc-plugin.spec
index 5882bc5..84a0d28 100644
--- a/maven-javadoc-plugin.spec
+++ b/maven-javadoc-plugin.spec
@@ -1,6 +1,6 @@
Name: maven-javadoc-plugin
Version: 2.9.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Maven Javadoc Plugin
License: ASL 2.0
URL: http://maven.apache.org/plugins/maven-javadoc-plugin
@@ -17,7 +17,6 @@ BuildRequires: httpcomponents-client
BuildRequires: log4j
BuildRequires: maven
BuildRequires: maven-archiver
-BuildRequires: maven-artifact-manager
BuildRequires: maven-common-artifact-filters
BuildRequires: maven-doxia-sink-api
BuildRequires: maven-doxia-sitetools
@@ -25,10 +24,8 @@ BuildRequires: maven-invoker
BuildRequires: maven-plugin-annotations
BuildRequires: maven-plugin-plugin
BuildRequires: maven-plugins-pom
-BuildRequires: maven-project
BuildRequires: maven-reporting-api
BuildRequires: maven-shade-plugin
-BuildRequires: maven-toolchain
BuildRequires: maven-wagon
BuildRequires: modello
BuildRequires: plexus-archiver
@@ -66,6 +63,11 @@ API documentation for %{name}.
</exclusion>
</exclusions>"
+# Don't use maven2 modules
+%pom_remove_dep :maven-project
+%pom_remove_dep :maven-artifact-manager
+%pom_remove_dep :maven-toolchain
+
sed -i -e "s|org.apache.maven.doxia.module.xhtml.decoration.render|org.apache.maven.doxia.sink.render|g" src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
%build
@@ -81,6 +83,9 @@ sed -i -e "s|org.apache.maven.doxia.module.xhtml.decoration.render|org.apache.ma
%doc LICENSE NOTICE
%changelog
+* Mon Jan 27 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 2.9.1-4
+- Remove dependency on maven2
+
* Fri Jan 17 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 2.9.1-3
- Update to current packaging guidelines
- Update to Maven 3.x
More information about the scm-commits
mailing list