diff --git a/.gitignore b/.gitignore
index 91d8947..fe9925c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
maven-release-2.0.tar.xz
/maven-release-2.0.tar.xz
+/maven-release-2.2.tar.xz
diff --git a/001-mavenrelease-skiptests.patch b/001-mavenrelease-skiptests.patch
new file mode 100644
index 0000000..54f80f1
--- /dev/null
+++ b/001-mavenrelease-skiptests.patch
@@ -0,0 +1,42 @@
+diff -u -r maven-release-2.2/maven-release-manager/pom.xml maven-release-2.2-patched/maven-release-manager/pom.xml
+--- maven-release-2.2/maven-release-manager/pom.xml 2011-06-27 10:45:56.000000000 +0200
++++ maven-release-2.2-patched/maven-release-manager/pom.xml 2011-07-18 18:01:32.961894470 +0200
+@@ -197,23 +197,6 @@
+ ${scmVersion}
+ test
+
+-
+- jmock
+- jmock
+- test
+-
+-
+- jmock
+- jmock-cglib
+- 1.0.1
+- test
+-
+-
+- org.mockito
+- mockito-all
+- 1.8.5
+- test
+-
+
+
+
+diff -u -r maven-release-2.2/maven-release-plugin/pom.xml maven-release-2.2-patched/maven-release-plugin/pom.xml
+--- maven-release-2.2/maven-release-plugin/pom.xml 2011-06-27 10:45:56.000000000 +0200
++++ maven-release-2.2-patched/maven-release-plugin/pom.xml 2011-07-18 18:01:53.953909509 +0200
+@@ -95,11 +95,6 @@
+ jdom
+
+
+- jmock
+- jmock
+- test
+-
+-
+ org.apache.maven.shared
+ maven-plugin-testing-harness
+ test
diff --git a/001_mavenreleasemanager_fixbuild.patch b/001_mavenreleasemanager_fixbuild.patch
deleted file mode 100644
index f645d46..0000000
--- a/001_mavenreleasemanager_fixbuild.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- A/maven-release-manager/pom.xml 2010-09-11 01:26:43.000000000 +0200
-+++ B/maven-release-manager/pom.xml 2010-09-13 15:28:21.472805005 +0200
-@@ -186,17 +186,6 @@
- ${scmVersion}
- test
-
--
-- jmock
-- jmock
-- test
--
--
-- jmock
-- jmock-cglib
-- 1.0.1
-- test
--
-
-
-
-@@ -210,6 +199,14 @@
-
-
-
-+ org.apache.maven.plugins
-+ maven-compiler-plugin
-+
-+ 1.4
-+ 1.4
-+
-+
-+
- maven-surefire-plugin
-
- -Xmx256m
diff --git a/002-mavenrelease-fixbuild.patch b/002-mavenrelease-fixbuild.patch
new file mode 100644
index 0000000..5011340
--- /dev/null
+++ b/002-mavenrelease-fixbuild.patch
@@ -0,0 +1,54 @@
+--- maven-release-2.2/maven-release-manager/pom.xml 2011-06-27 10:45:56.000000000 +0200
++++ maven-release-2.2-patched/maven-release-manager/pom.xml 2011-07-26 16:06:54.854973698 +0200
+@@ -80,6 +80,12 @@
+
+
+ org.apache.maven
++ maven-compat
++ ${mavenVersion}
++
++
++
++ org.apache.maven
+ maven-model
+ ${mavenVersion}
+
+@@ -254,13 +243,13 @@
+
+
+ org.codehaus.plexus
+- plexus-maven-plugin
++ plexus-component-metadata
+
+
+ create-component-descriptor
+ generate-resources
+
+- descriptor
++ generate-metadata
+
+
+
+@@ -274,7 +263,7 @@
+
+ process-resources
+
+- merge-descriptors
++ merge-metadata
+
+
+
+--- maven-release-2.2/maven-release-plugin/pom.xml 2011-06-27 10:45:56.000000000 +0200
++++ maven-release-2.2-patched/maven-release-plugin/pom.xml 2011-07-26 16:03:02.203751549 +0200
+@@ -53,6 +53,11 @@
+
+
+ org.apache.maven
++ maven-compat
++ ${mavenVersion}
++
++
++ org.apache.maven
+ maven-plugin-api
+ ${mavenVersion}
+
diff --git a/002_mavenreleaseplugin_skiptests.patch b/002_mavenreleaseplugin_skiptests.patch
deleted file mode 100644
index 2ac15f5..0000000
--- a/002_mavenreleaseplugin_skiptests.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- A/maven-release-plugin/pom.xml 2010-02-06 23:18:25.000000000 +0100
-+++ B/maven-release-plugin/pom.xml 2010-09-13 15:25:28.894805003 +0200
-@@ -95,11 +95,6 @@
- jdom
-
-
-- jmock
-- jmock
-- test
--
--
- org.apache.maven.shared
- maven-plugin-testing-harness
- test
diff --git a/maven-release-jpp-depmap.xml b/maven-release-jpp-depmap.xml
deleted file mode 100644
index a5421ce..0000000
--- a/maven-release-jpp-depmap.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
- org.codehaus.plexus
- plexus-container-default
- 1.5.4
-
-
- JPP/plexus
- container-default
- 1.0-alpha-9
-
-
-
diff --git a/maven-release.spec b/maven-release.spec
index f07dd39..1d83532 100644
--- a/maven-release.spec
+++ b/maven-release.spec
@@ -1,35 +1,25 @@
-# maven-release parent pom version
-%global pversion 16
-# maven-release-manager jar version
-%global mjarver 2.0
-# maven-release-plugin jar version
-%global pjarver 2.0
-
Name: maven-release
-Version: 2.0
-Release: 3%{?dist}
+Version: 2.2
+Release: 2%{?dist}
Summary: Release a project updating the POM and tagging in the SCM
Group: Development/Libraries
License: ASL 2.0
URL: http://maven.apache.org/plugins/maven-release-plugin/
# tar creation instructions
-# svn export http://svn.apache.org/repos/asf//maven/release/tags/maven-release-2.0 maven-release-2.0
-# tar cfJ maven-release-2.0.tar.xz maven-release-2.0
-Source0: maven-release-2.0.tar.xz
-Source1: maven-release-jpp-depmap.xml
+# svn export http://svn.apache.org/repos/asf/maven/release/tags/maven-release-2.2 maven-release-2.2
+# tar cfJ maven-release-2.2.tar.xz maven-release-2.2
+Source0: maven-release-2.2.tar.xz
# Remove jmock needed for tests and set source to 1.4 to support assert stmt
-Patch0: 001_mavenreleasemanager_fixbuild.patch
+Patch0: 001-mavenrelease-skiptests.patch
# Remove deps needed for tests, till jmock gets packaged
-Patch1: 002_mavenreleaseplugin_skiptests.patch
+Patch1: 002-mavenrelease-fixbuild.patch
BuildArch: noarch
BuildRequires: java-devel
BuildRequires: jpackage-utils
+BuildRequires: maven
BuildRequires: maven-scm >= 1.4-1
-BuildRequires: maven-scm-test >= 1.4-1
-BuildRequires: maven2
-BuildRequires: maven2-common-poms >= 0:1.0-13
BuildRequires: maven-antrun-plugin
BuildRequires: maven-jar-plugin
BuildRequires: maven-javadoc-plugin
@@ -40,7 +30,7 @@ BuildRequires: maven-plugin-plugin
BuildRequires: maven-resources-plugin
BuildRequires: maven-site-plugin
BuildRequires: maven-plugin-testing-harness
-BuildRequires: plexus-maven-plugin
+BuildRequires: plexus-containers-component-metadata
BuildRequires: plexus-utils
BuildRequires: maven-surefire-maven-plugin
BuildRequires: jaxen
@@ -109,46 +99,32 @@ EOT
%build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mkdir -p $MAVEN_REPO_LOCAL
-
-mvn-jpp \
- -e \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
- -Dmaven2.jpp.depmap.file=%{SOURCE1} \
- -Dmaven.test.skip=true \
- install javadoc:aggregate
+mvn-rpmbuild -e -Dmaven.test.skip=true install javadoc:aggregate
%install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_javadir}
-
# jars
-install -Dp -m 644 %{name}-manager/target/%{name}-manager-%{mjarver}.jar \
- $RPM_BUILD_ROOT%{_javadir}//%{name}-manager.jar
-
-install -Dp -m 644 %{name}-plugin/target/%{name}-plugin-%{pjarver}.jar \
+install -Dp -m 644 %{name}-manager/target/%{name}-manager-%{version}.jar \
+ $RPM_BUILD_ROOT%{_javadir}/%{name}-manager.jar
+install -Dp -m 644 %{name}-plugin/target/%{name}-plugin-%{version}.jar \
$RPM_BUILD_ROOT%{_javadir}/%{name}-plugin.jar
# javadocs
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -rp target/site/apidocs/ \
- $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-(cd $RPM_BUILD_ROOT%{_javadocdir} && ln -sf %{name}-%{version} %{name})
+mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/
+cp -rp target/site/apidocs $RPM_BUILD_ROOT%{_javadocdir}/%{name}
# poms
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
+install -d -m 755 $RPM_BUILD_ROOT/%{_mavenpomdir}
install -pm 644 pom.xml \
- $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
+ $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
install -pm 644 %{name}-manager/pom.xml \
- $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}-manager.pom
+ $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-manager.pom
install -pm 644 %{name}-plugin/pom.xml \
- $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}-plugin.pom
+ $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-plugin.pom
-%add_to_maven_depmap org.apache.maven.release %{name} %{pversion} JPP %{name}
-%add_to_maven_depmap org.apache.maven.release %{name}-manager %{mjarver} JPP %{name}-manager
-%add_to_maven_depmap org.apache.maven.plugins %{name}-plugin %{pjarver} JPP %{name}-plugin
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
+%add_maven_depmap JPP-%{name}-manager.pom %{name}-manager.jar
+%add_maven_depmap JPP-%{name}-plugin.pom %{name}-plugin.jar
%files
%defattr(-,root,root,-)
@@ -172,18 +148,17 @@ install -pm 644 %{name}-plugin/pom.xml \
%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}
-%{_javadocdir}/%{name}-%{version}
-%post
-%update_maven_depmap
-
-
-%postun
-%update_maven_depmap
+%changelog
+* Tue Jul 26 2011 Guido Grazioli - 2.2-2
+- Import patch provided by Jaromír Cápík (#725088)
+* Mon Jul 18 2011 Guido Grazioli - 2.2-1
+- Update to 2.2
+- Update to current guidelines
+- Build with maven 3
-%changelog
* Tue Feb 08 2011 Fedora Release Engineering - 2.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/sources b/sources
index d5af442..0bc1a45 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-75eece9079322e0c07fdc83324e335c4 maven-release-2.0.tar.xz
+1d135afb48bf3841f4ec4c9db5b57234 maven-release-2.2.tar.xz