commit cfecedf27dbd7d9660c645b68f579ccab5354e7d
Author: Alexander Kurtakov <akurtako@xxxxxxxxxx>
Date: Tue Nov 9 20:30:00 2010 +0200
- Removed obsolete patch
- tomcat5 -> tomcat6 BRs/Rs
.gitignore | 1 +
maven-project-info-reports-plugin.spec | 26 +++++++++-----------------
sources | 2 +-
3 files changed, 11 insertions(+), 18 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 049ea7f..b59be1a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
maven-project-info-reports-plugin-2.2.tar.bz2
+maven-project-info-reports-plugin-2.2-source-release.zip
diff --git a/maven-project-info-reports-plugin.spec b/maven-project-info-reports-plugin.spec
index d8e8b39..e398b36 100644
--- a/maven-project-info-reports-plugin.spec
+++ b/maven-project-info-reports-plugin.spec
@@ -1,35 +1,24 @@
Name: maven-project-info-reports-plugin
Version: 2.2
-Release: 4%{?dist}
+Release: 5%{?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/
-#svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-project-info-reports-plugin-2.2/
-#tar jcf maven-project-info-reports-plugin-2.2.tar.bz2 maven-project-info-reports-plugin-2.2/
-Source0: %{name}-%{version}.tar.bz2
+Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip
#- Modified maven version from 2.1.0 to 2.0.8 which is available now in koji,
# will remove this from patch once maven is upgraded to version 2.2.1.
#- Removed junit-addons dependency as there is no junit-addons available in koji, meanwhile set test skip as true.
Patch0: %{name}-pom.patch
-#Method getMirrorRepository is new method of org.apache.maven.artifact.manager.WagonManager, it is not available in maven 2.0.8
-#will remove this patch once maven is upgraded to version 2.2.1
-Patch1: RepositoryUtils.java.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: jpackage-utils
-BuildRequires: maven2
+BuildRequires: apache-commons-parent
BuildRequires: maven-plugin-plugin
-BuildRequires: maven-compiler-plugin
-BuildRequires: maven-install-plugin
-BuildRequires: maven-jar-plugin
-BuildRequires: maven-javadoc-plugin
-BuildRequires: maven-resources-plugin
-BuildRequires: maven-surefire-plugin
BuildRequires: maven-shared-reporting-api
BuildRequires: maven-shared-reporting-impl
BuildRequires: maven-shared-dependency-tree
@@ -45,7 +34,7 @@ BuildRequires: plexus-utils
BuildRequires: apache-commons-validator
BuildRequires: httpunit
BuildRequires: maven-plugin-testing-harness
-BuildRequires: tomcat5
+BuildRequires: servlet25
BuildRequires: netbeans-cvsclient
Requires: maven2
@@ -57,7 +46,7 @@ Requires: plexus-i18n
Requires: plexus-utils
Requires: apache-commons-validator
Requires: httpunit
-Requires: tomcat5
+Requires: servlet25
Requires(post): jpackage-utils
Requires(postun): jpackage-utils
@@ -82,7 +71,6 @@ API documentation for %{name}.
%prep
%setup -q
%patch0 -p0
-%patch1 -p0
%build
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
@@ -134,6 +122,10 @@ rm -rf %{buildroot}
%{_javadocdir}/%{name}
%changelog
+* Tue Nov 9 2010 Chris Spike <chris.spike@xxxxxxxx> 2.2-5
+- Removed obsolete patch
+- tomcat5 -> tomcat6 BRs/Rs
+
* Tue Oct 26 2010 akurtakov <akurtakov@xxxxxxxxxx> 2.2-4
- Fix apache-commons-validator BR/R.
diff --git a/sources b/sources
index e2251df..0535480 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2c9099e54860fd135f4bc7b5121dba9e maven-project-info-reports-plugin-2.2.tar.bz2
+c26b5bd5ecfe9aa279aa26749796407b maven-project-info-reports-plugin-2.2-source-release.zip
--
java-devel mailing list
java-devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/java-devel
