[java-sig-commits] [maven-changelog-plugin] fixed for jdk7

[jiri vanek]

commit 6e6eb01ffdfd8c679ffed9ec9d91fbb3345c2517
Author: Jiri Vanek <jvanek at jvanek.redhat>
Date:   Thu Feb 23 15:27:22 2012 +0100

    fixed for jdk7

 ChangeLog.java.patch        |   12 ++++++++++++
 maven-changelog-plugin.spec |   13 ++++++++++++-
 pom.patch                   |   18 ++++++++++++++++++
 3 files changed, 42 insertions(+), 1 deletions(-)
---
diff --git a/ChangeLog.java.patch b/ChangeLog.java.patch
new file mode 100644
index 0000000..f064590
--- /dev/null
+++ b/ChangeLog.java.patch
@@ -0,0 +1,12 @@
+diff -r 702e2ba1693d maven-changelog-plugin-2.2/src/main/java/org/apache/maven/plugin/changelog/ChangeLog.java
+--- a/maven-changelog-plugin-2.2/src/main/java/org/apache/maven/plugin/changelog/ChangeLog.java	Tue Feb 21 14:37:24 2012 +0100
++++ b/maven-changelog-plugin-2.2/src/main/java/org/apache/maven/plugin/changelog/ChangeLog.java	Tue Feb 21 14:43:27 2012 +0100
+@@ -43,7 +43,7 @@
+  * @author <a href="mailto:dion at multitask.com.au">dIon Gillard</a>
+  * @author <a href="mailto:bodewig at apache.org">Stefan Bodewig</a>
+  * @author <a href="mailto:peter at apache.org">Peter Donald</a>
+- * @version $Id:ChangeLog.java 437762 2006-08-28 19:29:49 +0200 (må, 28 aug 2006) dennisl $
++ * @version $Id:ChangeLog.java 437762 2006-08-28 19:29:49 +0200 (m\u00E0, 28 aug 2006) dennisl $
+  */
+ public class ChangeLog
+ {
diff --git a/maven-changelog-plugin.spec b/maven-changelog-plugin.spec
index fc5eb99..b29cb1e 100644
--- a/maven-changelog-plugin.spec
+++ b/maven-changelog-plugin.spec
@@ -1,6 +1,6 @@
 Name:           maven-changelog-plugin
 Version:        2.2
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Produce SCM changelog reports
 
 Group:          Development/Libraries
@@ -9,6 +9,8 @@ URL:            http://maven.apache.org/plugins/maven-changelog-plugin/
 #svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-changelog-plugin-2.2/
 #tar jcf maven-changelog-plugin-2.2.tar.bz2 maven-changelog-plugin-2.2/
 Source0:        %{name}-%{version}.tar.bz2
+Patch0:		pom.patch
+Patch1:		ChangeLog.java.patch
 
 BuildArch: noarch
 
@@ -22,6 +24,7 @@ BuildRequires: maven-jar-plugin
 BuildRequires: maven-javadoc-plugin
 BuildRequires: maven-resources-plugin
 BuildRequires: maven-surefire-plugin
+BuildRequires: maven-site-plugin
 BuildRequires: maven-shared
 BuildRequires: maven-doxia
 BuildRequires: maven-scm
@@ -59,6 +62,8 @@ API documentation for %{name}.
 
 %prep
 %setup -q 
+%patch0 -p0
+%patch1 -p2
 
 %build
 mvn-rpmbuild \
@@ -96,6 +101,12 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
 %{_javadocdir}/%{name}
 
 %changelog
+
+* Tue Feb 21 2012 Jiri Vanek <jvanek at redhat.com> 2.2-9
+- Added patch0 pom.patch to remove unused and from-fedora-removed maven cvsjava plugin
+  and patch1 ChangeLog.java.patch which is fixing invalid character uncompileable by JDK7
+- Added build requires maven-site-plugin to fix one maven warning
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/pom.patch b/pom.patch
new file mode 100644
index 0000000..547bc89
--- /dev/null
+++ b/pom.patch
@@ -0,0 +1,18 @@
+--- pom.xml	2010-05-25 21:21:07.000000000 +0200
++++ pom.xml	2012-02-21 14:28:35.364369751 +0100
+@@ -222,15 +222,10 @@
+       <artifactId>maven-scm-provider-cvsexe</artifactId>
+       <version>${maven-scm.version}</version>
+     </dependency>
+     <dependency>
+       <groupId>org.apache.maven.scm</groupId>
+-      <artifactId>maven-scm-provider-cvsjava</artifactId>
+-      <version>${maven-scm.version}</version>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.maven.scm</groupId>
+       <artifactId>maven-scm-provider-local</artifactId>
+       <version>${maven-scm.version}</version>
+     </dependency>
+     <dependency>
+       <groupId>org.apache.maven.scm</groupId>