[java-sig-commits] [maven-project-info-reports-plugin] Remove cvsjava support (still can use cvsexe)

[Stanislav Ochotnicky]

commit 0fe661caf5d3ef9593011cc8e790698a8bf005ac
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date:   Tue May 22 13:07:33 2012 +0200

    Remove cvsjava support (still can use cvsexe)

 maven-project-info-reports-plugin-pom.patch |   23 ++++++++++++-----------
 maven-project-info-reports-plugin.spec      |   16 ++++++++--------
 2 files changed, 20 insertions(+), 19 deletions(-)
---
diff --git a/maven-project-info-reports-plugin-pom.patch b/maven-project-info-reports-plugin-pom.patch
index e83e9ac..32588fe 100644
--- a/maven-project-info-reports-plugin-pom.patch
+++ b/maven-project-info-reports-plugin-pom.patch
@@ -1,15 +1,16 @@
---- maven-project-info-reports-plugin-2.4/pom.xml.orig	2010-12-18 07:44:12.000000000 +0200
-+++ maven-project-info-reports-plugin-2.4/pom.xml	2011-05-23 19:59:18.425419293 +0300
-@@ -341,12 +341,6 @@ under the License.
-       <scope>test</scope>
+diff --git a/maven-project-info-reports-plugin-2.4/pom.xml b/maven-project-info-reports-plugin-2.4/pom.xml
+index 4eb59b9..04cef14 100644
+--- a/maven-project-info-reports-plugin-2.4/pom.xml
++++ b/maven-project-info-reports-plugin-2.4/pom.xml
+@@ -225,11 +225,6 @@ under the License.
      </dependency>
      <dependency>
--      <groupId>junit-addons</groupId>
--      <artifactId>junit-addons</artifactId>
--      <version>1.4</version>
--      <scope>test</scope>
+       <groupId>org.apache.maven.scm</groupId>
+-      <artifactId>maven-scm-provider-cvsjava</artifactId>
+-      <version>${scmVersion}</version>
 -    </dependency>
 -    <dependency>
-       <groupId>org.mortbay.jetty</groupId>
-       <artifactId>jetty</artifactId>
-       <version>6.1.5</version>
+-      <groupId>org.apache.maven.scm</groupId>
+       <artifactId>maven-scm-provider-gitexe</artifactId>
+       <version>${scmVersion}</version>
+     </dependency>
diff --git a/maven-project-info-reports-plugin.spec b/maven-project-info-reports-plugin.spec
index 977c133..84c30a9 100644
--- a/maven-project-info-reports-plugin.spec
+++ b/maven-project-info-reports-plugin.spec
@@ -1,13 +1,13 @@
 Name:           maven-project-info-reports-plugin
 Version:        2.4
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Maven Project Info Reports Plugin
 
 Group:          Development/Libraries
 License:        ASL 2.0
 URL:            http://maven.apache.org/plugins/maven-project-info-reports-plugin/
 Source0:        http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip
-#- Removed junit-addons dependency as there is no junit-addons available in koji, meanwhile set test skip as true.
+# removed cvsjava provider since we don't support it anymore
 Patch0:        %{name}-pom.patch
 BuildArch: noarch
 
@@ -30,7 +30,7 @@ BuildRequires: plexus-utils
 BuildRequires: apache-commons-validator
 BuildRequires: httpunit
 BuildRequires: maven-plugin-testing-harness
-BuildRequires: servlet25
+BuildRequires: servlet3
 BuildRequires: netbeans-cvsclient
 BuildRequires: maven-jarsigner-plugin
 BuildRequires: keytool-maven-plugin
@@ -45,14 +45,11 @@ Requires:       plexus-i18n
 Requires:       plexus-utils
 Requires:       apache-commons-validator
 Requires:       httpunit
-Requires:       servlet25
+Requires:       servlet3
 Requires:       maven-shared-jar
 Requires:       maven-scm
 Requires:       joda-time
 
-Requires(post):       jpackage-utils
-Requires(postun):     jpackage-utils
-
 Obsoletes: maven2-plugin-project-info-reports <= 0:2.0.8
 Provides: maven2-plugin-project-info-reports = 0:%{version}-%{release}
 
@@ -72,7 +69,7 @@ API documentation for %{name}.
 
 %prep
 %setup -q -c
-%patch0 -p0 -b .sav
+%patch0 -p1 -b .sav
 
 %build
 pushd %{name}-%{version}
@@ -104,6 +101,9 @@ popd
 %{_javadocdir}/%{name}
 
 %changelog
+* Tue May 22 2012 Stanislav Ochotnicky <sochotnicky at redhat.com> - 2.4-6
+- Remove cvsjava support (still can use cvsexe)
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild