[java-sig-commits] [maven-changes-plugin] Update to latest upstream (2.6)

commit 4018d44b70d033083d42dcc867972ed19441cc1c Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com&gt; Date: Mon Jun 27 14:47:09 2011 +0200 Update to latest upstream (2.6) - Properly complete BR/R - Fix maven3 compatibility .gitignore | 1 + 0001-Fix-Maven-3-compatibility.patch | 37 +++++++++++++++++++ maven-changes-plugin.spec | 67 ++++++++++++++++++++++++++-------- sources | 2 +- 4 files changed, 90 insertions(+), 17 deletions(-) --- diff --git a/.gitignore b/.gitignore index a6ec6c5..de5b366 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ maven-changes-plugin-2.3.tar.xz /maven-changes-plugin-2.4.tar.xz /maven-changes-plugin-2.5-source-release.zip +/maven-changes-plugin-2.6-source-release.zip diff --git a/0001-Fix-Maven-3-compatibility.patch b/0001-Fix-Maven-3-compatibility.patch new file mode 100644 index 0000000..53d35f1 --- /dev/null +++ b/0001-Fix-Maven-3-compatibility.patch @@ -0,0 +1,37 @@ +From c122cd58ce9f50c3cb99d8399a0cde6493f5fdb6 Mon Sep 17 00:00:00 2001 +From: Stanislav Ochotnicky <sochotnicky(a)redhat.com&gt; +Date: Mon, 27 Jun 2011 14:44:36 +0200 +Subject: [PATCH] Fix Maven 3 compatibility + +--- + pom.xml | 7 ++++++- + 1 files changed, 6 insertions(+), 1 deletions(-) + +diff --git a/pom.xml b/pom.xml +index 271045c..6a1812a 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -76,7 +76,7 @@ under the License. + <properties> + <doxiaVersion>1.2</doxiaVersion> + <doxiaSitetoolsVersion>1.2</doxiaSitetoolsVersion> +- <mavenVersion>2.2.1</mavenVersion> ++ <mavenVersion>3.0.3</mavenVersion> + <sitePluginVersion>2.3-SNAPSHOT</sitePluginVersion> + </properties> + +@@ -84,6 +84,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> +-- +1.7.5.4 + diff --git a/maven-changes-plugin.spec b/maven-changes-plugin.spec index 82a9c99..2bd9d4b 100644 --- a/maven-changes-plugin.spec +++ b/maven-changes-plugin.spec @@ -1,6 +1,6 @@ Name: maven-changes-plugin -Version: 2.5 -Release: 2%{?dist} +Version: 2.6 +Release: 1%{?dist} Summary: Plugin to support reporting of changes between releases Group: Development/Libraries @@ -9,11 +9,19 @@ URL: http://maven.apache.org/plugins/%{name} Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}... Source1: %{name}.depmap +Patch0: 0001-Fix-Maven-3-compatibility.patch + BuildArch: noarch BuildRequires: java-devel >= 1:1.6.0 -BuildRequires: plexus-utils +BuildRequires: apache-commons-collections +BuildRequires: jakarta-commons-httpclient +BuildRequires: apache-commons-io +BuildRequires: apache-commons-lang +BuildRequires: apache-commons-logging BuildRequires: maven +BuildRequires: maven-project +BuildRequires: maven-doxia-sitetools BuildRequires: maven-install-plugin BuildRequires: maven-compiler-plugin BuildRequires: maven-plugin-plugin @@ -23,16 +31,46 @@ BuildRequires: maven-surefire-provider-junit BuildRequires: maven-jar-plugin BuildRequires: maven-javadoc-plugin BuildRequires: maven-shared-filtering +BuildRequires: maven-shared-reporting-api +BuildRequires: maven-shared-reporting-impl +BuildRequires: modello +BuildRequires: plexus-containers-container-default BuildRequires: plexus-maven-plugin BuildRequires: plexus-mail-sender +BuildRequires: plexus-i18n +BuildRequires: plexus-interpolation +BuildRequires: plexus-utils +BuildRequires: plexus-velocity BuildRequires: xmlrpc3-client BuildRequires: xmlrpc3-common BuildRequires: xerces-j2 BuildRequires: xml-commons-apis +BuildRequires: velocity -Requires: maven -Requires: jpackage-utils Requires: java +Requires: jpackage-utils +Requires: apache-commons-collections +Requires: jakarta-commons-httpclient +Requires: apache-commons-io +Requires: apache-commons-lang +Requires: apache-commons-logging +Requires: maven +Requires: maven-project +Requires: maven-doxia-sitetools +Requires: maven-shared-filtering +Requires: maven-shared-reporting-api +Requires: maven-shared-reporting-impl +Requires: plexus-containers-container-default +Requires: plexus-i18n +Requires: plexus-interpolation +Requires: plexus-mail-sender +Requires: plexus-utils +Requires: plexus-velocity +Requires: xmlrpc3-client +Requires: xmlrpc3-common +Requires: xerces-j2 +Requires: xml-commons-apis +Requires: velocity Requires(post): jpackage-utils Requires(postun): jpackage-utils @@ -58,11 +96,12 @@ API documentation for %{name}. %prep -%setup -q +%setup -q +%patch0 -p1 %build mvn-rpmbuild -e \ - -Dmaven.local.depmap.file="%{SOURCE1}" \ + -Dmaven.local.depmap.file=%{SOURCE1} \ -Dmaven.test.failure.ignore=true \ install javadoc:javadoc @@ -85,24 +124,20 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name} [ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || : - -%post -%update_maven_depmap - -%postun -%update_maven_depmap - %files -%defattr(-,root,root,-) %{_javadir}/* %{_mavenpomdir}/* %config(noreplace) %{_mavendepmapfragdir}/* %files javadoc -%defattr(-,root,root,-) %{_javadocdir}/%{name} %changelog +* Mon Jun 27 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com&gt; - 2.6-1 +- Update to latest upstream (2.6) +- Properly complete BR/R +- Fix maven3 compatibility + * Tue May 24 2011 Alexander Kurtakov <akurtako(a)redhat.com&gt; 2.5-2 - Do not require maven2, require maven. diff --git a/sources b/sources index 389515f..359d2a0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -184807a98b7c6c5c59f1f3375f18795b maven-changes-plugin-2.5-source-release.zip +d826ac51e57d152f4886ff5fce8c5ca6 maven-changes-plugin-2.6-source-release.zip