diff --git a/maven-jar-plugin-depmap.xml b/maven-jar-plugin-depmap.xml
deleted file mode 100644
index ef5c89f..0000000
--- a/maven-jar-plugin-depmap.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
- org.apache.maven
- maven-archiver
- 2.4
-
-
- JPP
- maven-archiver
- 2.4
-
-
-
-
diff --git a/maven-jar-plugin.spec b/maven-jar-plugin.spec
index e48a7af..57d884f 100644
--- a/maven-jar-plugin.spec
+++ b/maven-jar-plugin.spec
@@ -1,28 +1,25 @@
Name: maven-jar-plugin
-Version: 2.3
-Release: 3%{?dist}
+Version: 2.3.1
+Release: 1%{?dist}
Summary: Maven JAR Plugin
Group: Development/Libraries
License: ASL 2.0
URL: http://maven.apache.org/plugins/maven-jar-plugin/
-#svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-jar-plugin-2.3 maven-jar-plugin-2.3
-#tar caf maven-jar-plugin-2.3.tar.xz maven-jar-plugin-2.3/
-Source0: %{name}-%{version}.tar.xz
-Source1: %{name}-depmap.xml
+Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/maven-jar-plugin/2.3.1/maven-jar-plugin-2.3.1-source-release.zip
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: maven2
-BuildRequires: maven2-plugin-plugin
-BuildRequires: maven2-plugin-jar
-BuildRequires: maven2-plugin-install
-BuildRequires: maven2-plugin-resources
+BuildRequires: maven-plugin-plugin
+BuildRequires: maven-jar-plugin
+BuildRequires: maven-install-plugin
+BuildRequires: maven-resources-plugin
BuildRequires: maven-compiler-plugin
BuildRequires: maven-javadoc-plugin
-BuildRequires: maven-surefire-maven-plugin
+BuildRequires: maven-surefire-plugin
BuildRequires: maven-surefire-provider-junit
BuildRequires: maven-doxia-sitetools
BuildRequires: maven-plugin-testing-harness
@@ -34,7 +31,7 @@ BuildRequires: junit
Requires: maven2
Requires: maven-archiver
Requires: plexus-archiver
-Requires: maven-shared-archiver
+Requires: maven-archiver
Requires: apache-commons-lang
Requires: plexus-utils
Requires: maven-plugin-testing-harness
@@ -61,7 +58,9 @@ API documentation for %{name}.
%prep
-%setup -q #You may need to update this according to your Source0
+%setup -q
+#let plexus-container-default be retrieved as a dependency
+sed -i -e "s|plexus-container-default|plexus-container|g" pom.xml
%build
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
@@ -69,7 +68,6 @@ mvn-jpp \
-e \
-Dmaven2.jpp.mode=true \
-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
- -Dmaven2.jpp.depmap.file=%{SOURCE1} \
-Dmaven.test.skip=true \
install javadoc:javadoc
@@ -117,6 +115,11 @@ rm -rf %{buildroot}
%{_javadocdir}/%{name}
%changelog
+* Fri Sep 10 2010 Alexander Kurtakov 2.3.1-1
+- Update to 2.3.1.
+- Keep plexus-container-default on the dependency tree.
+- Drop depmap - not needed now.
+
* Wed May 19 2010 Alexander Kurtakov 2.3-3
- Add depmap.