[maven-changes-plugin] Update to latest upstream (2.7.1)
Stanislav Ochotnicky
sochotni at fedoraproject.org
Thu May 24 14:59:55 UTC 2012
commit 7158fd2b552b55bffef1497ff368718bf8534a54
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date: Thu May 24 16:50:30 2012 +0200
Update to latest upstream (2.7.1)
- Remove upstreamed patch for component-metadata migration
.gitignore | 1 +
0001-Fix-Maven-3-compatibility.patch | 25 ++++++++-----
...emove-geronimo-dependency-supplied-by-JVM.patch | 39 ++++++++++++++++++++
...es-plugin-migration-to-component-metadata.patch | 29 ---------------
maven-changes-plugin.spec | 24 +++++++------
sources | 2 +-
6 files changed, 69 insertions(+), 51 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index de5b366..61b2acc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,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
+/maven-changes-plugin-2.7.1-source-release.zip
diff --git a/0001-Fix-Maven-3-compatibility.patch b/0001-Fix-Maven-3-compatibility.patch
index 53d35f1..f46702d 100644
--- a/0001-Fix-Maven-3-compatibility.patch
+++ b/0001-Fix-Maven-3-compatibility.patch
@@ -1,14 +1,14 @@
-From c122cd58ce9f50c3cb99d8399a0cde6493f5fdb6 Mon Sep 17 00:00:00 2001
+From 61a103ba9c4c5426fb3650ea9480b1f579ef8c2a Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky at redhat.com>
-Date: Mon, 27 Jun 2011 14:44:36 +0200
-Subject: [PATCH] Fix Maven 3 compatibility
+Date: Thu, 24 May 2012 16:49:05 +0200
+Subject: [PATCH 1/2] Fix Maven 3 compatibility
---
- pom.xml | 7 ++++++-
- 1 files changed, 6 insertions(+), 1 deletions(-)
+ pom.xml | 12 +++++++++++-
+ 1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/pom.xml b/pom.xml
-index 271045c..6a1812a 100644
+index bdbd20b..568cf61 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,7 +76,7 @@ under the License.
@@ -16,11 +16,11 @@ index 271045c..6a1812a 100644
<doxiaVersion>1.2</doxiaVersion>
<doxiaSitetoolsVersion>1.2</doxiaSitetoolsVersion>
- <mavenVersion>2.2.1</mavenVersion>
-+ <mavenVersion>3.0.3</mavenVersion>
- <sitePluginVersion>2.3-SNAPSHOT</sitePluginVersion>
++ <mavenVersion>3.0.4</mavenVersion>
+ <sitePluginVersion>2.3</sitePluginVersion>
</properties>
-@@ -84,6 +84,11 @@ under the License.
+@@ -84,6 +84,16 @@ under the License.
<!-- maven -->
<dependency>
<groupId>org.apache.maven</groupId>
@@ -29,9 +29,14 @@ index 271045c..6a1812a 100644
+ </dependency>
+ <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
+1.7.7.6
diff --git a/0002-Remove-geronimo-dependency-supplied-by-JVM.patch b/0002-Remove-geronimo-dependency-supplied-by-JVM.patch
new file mode 100644
index 0000000..e2a27d3
--- /dev/null
+++ b/0002-Remove-geronimo-dependency-supplied-by-JVM.patch
@@ -0,0 +1,39 @@
+From 080b4ee583cb98134b0b62053708fe155b761b40 Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky at redhat.com>
+Date: Thu, 24 May 2012 16:49:09 +0200
+Subject: [PATCH 2/2] Remove geronimo dependency supplied by JVM
+
+---
+ pom.xml | 16 ----------------
+ 1 files changed, 0 insertions(+), 16 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index 568cf61..71fe7ab 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -163,22 +163,6 @@ under the License.
+ </exclusion>
+ </exclusions>
+ </dependency>
+- <!-- javamail to parse an email address -->
+- <dependency>
+- <groupId>org.apache.geronimo.javamail</groupId>
+- <artifactId>geronimo-javamail_1.4_provider</artifactId>
+- <version>1.7</version>
+- </dependency>
+- <dependency>
+- <groupId>org.apache.geronimo.specs</groupId>
+- <artifactId>geronimo-javamail_1.4_spec</artifactId>
+- <version>1.7</version>
+- </dependency>
+- <dependency>
+- <groupId>org.apache.geronimo.javamail</groupId>
+- <artifactId>geronimo-javamail_1.4_mail</artifactId>
+- <version>1.7</version>
+- </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-mail-sender-javamail</artifactId>
+--
+1.7.7.6
+
diff --git a/maven-changes-plugin.spec b/maven-changes-plugin.spec
index f279dbd..d239f3b 100644
--- a/maven-changes-plugin.spec
+++ b/maven-changes-plugin.spec
@@ -1,6 +1,6 @@
Name: maven-changes-plugin
-Version: 2.6
-Release: 3%{?dist}
+Version: 2.7.1
+Release: 1%{?dist}
Summary: Plugin to support reporting of changes between releases
Group: Development/Libraries
@@ -10,7 +10,7 @@ Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%
Source1: %{name}.depmap
Patch0: 0001-Fix-Maven-3-compatibility.patch
-Patch1: %{name}-migration-to-component-metadata.patch
+Patch1: 0002-Remove-geronimo-dependency-supplied-by-JVM.patch
BuildArch: noarch
@@ -72,8 +72,6 @@ Requires: xmlrpc3-common
Requires: xerces-j2
Requires: xml-commons-apis
Requires: velocity
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
Obsoletes: maven2-plugin-changes <= 0:2.0.8
Provides: maven2-plugin-changes = 1:%{version}-%{release}
@@ -104,7 +102,7 @@ API documentation for %{name}.
%build
mvn-rpmbuild -e \
-Dmaven.local.depmap.file=%{SOURCE1} \
- -Dmaven.test.failure.ignore=true \
+ -Dmaven.test.skip=true \
install javadoc:aggregate
%install
@@ -112,11 +110,11 @@ mvn-rpmbuild -e \
# jars
install -Dpm 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
-%add_to_maven_depmap org.apache.maven.plugins %{name} %{version} JPP %{name}
-
# poms
install -Dpm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+%add_maven_depmap
+
# javadoc
install -dm 755 %{buildroot}%{_javadocdir}/%{name}
cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
@@ -127,14 +125,18 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%files
-%{_javadir}/*
-%{_mavenpomdir}/*
-%config(noreplace) %{_mavendepmapfragdir}/*
+%{_javadir}/%{name}.jar
+%{_mavenpomdir}/JPP-%{name}.pom
+%{_mavendepmapfragdir}/%{name}
%files javadoc
%{_javadocdir}/%{name}
%changelog
+* Thu May 24 2012 Stanislav Ochotnicky <sochotnicky at redhat.com> - 2.7.1-1
+- Update to latest upstream (2.7.1)
+- Remove upstreamed patch for component-metadata migration
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/sources b/sources
index 359d2a0..7094bf5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d826ac51e57d152f4886ff5fce8c5ca6 maven-changes-plugin-2.6-source-release.zip
+9f58cf5e22f0302e950ce6d93ee14688 maven-changes-plugin-2.7.1-source-release.zip
More information about the scm-commits
mailing list