[java-sig-commits] [maven-javadoc-plugin] Added dep for maven-compat

Stanislav Ochotnicky sochotni at fedoraproject.org
Wed Dec 14 14:38:52 UTC 2011


commit c8f3e5302d7235c31f477adc5a76f7fe656d95e0
Author: Tomas Radej <tradej at redhat.com>
Date:   Wed Dec 14 15:02:52 2011 +0100

    Added dep for maven-compat

 maven-javadoc-plugin-compat.patch |   16 ++++++++++++++++
 maven-javadoc-plugin.spec         |    7 ++++++-
 2 files changed, 22 insertions(+), 1 deletions(-)
---
diff --git a/maven-javadoc-plugin-compat.patch b/maven-javadoc-plugin-compat.patch
new file mode 100644
index 0000000..f4da1e6
--- /dev/null
+++ b/maven-javadoc-plugin-compat.patch
@@ -0,0 +1,16 @@
+diff --git a/pom.xml b/pom.xml
+index b0620ba..7e065aa 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -67,6 +67,11 @@ under the License.
+     <!-- maven -->
+     <dependency>
+       <groupId>org.apache.maven</groupId>
++      <artifactId>maven-compat</artifactId>
++      <version>${mavenVersion}</version>
++    </dependency>
++    <dependency>
++      <groupId>org.apache.maven</groupId>
+       <artifactId>maven-core</artifactId>
+       <version>${mavenVersion}</version>
+     </dependency>
diff --git a/maven-javadoc-plugin.spec b/maven-javadoc-plugin.spec
index ee16120..cca2e57 100644
--- a/maven-javadoc-plugin.spec
+++ b/maven-javadoc-plugin.spec
@@ -2,7 +2,7 @@
 
 Name:           maven-javadoc-plugin
 Version:        2.8
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Maven Javadoc Plugin
 
 Group:          Development/Libraries
@@ -12,6 +12,7 @@ Source0:        http://repo1.maven.org/maven2/org/apache/maven/plugins/%{name}/%
 Patch0:         remove-test-deps.patch
 Patch1:         pom.patch
 Patch2:         reduce-exceptions.patch
+Patch3:         %{name}-compat.patch
 
 BuildRequires:  maven
 BuildRequires:  maven-clean-plugin
@@ -62,6 +63,7 @@ API documentation for %{name}.
 # Update source for use with newer doxia
 %patch1
 %patch2
+%patch3 -p1
 
 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
 
@@ -107,6 +109,9 @@ rm -rf target/site/api*
 %endif
 
 %changelog
+* Wed Dec 14 2011 Tomas Radej <tradej at redhat.com> - 2.8-4
+- Added maven-compat dep to pom.xml
+
 * Mon Dec 12 2011 Alexander Kurtakov <akurtako at redhat.com> 2.8-3
 - Add BR on modello.
 


More information about the java-sig-commits mailing list