diff --git a/plexus-utils-remove-release-plugin.patch b/plexus-utils-remove-release-plugin.patch
new file mode 100644
index 0000000..ebc3e41
--- /dev/null
+++ b/plexus-utils-remove-release-plugin.patch
@@ -0,0 +1,16 @@
+--- plexus-utils-2.0.5/pom.xml.orig 2010-05-05 10:35:10.289442289 +0100
++++ plexus-utils-2.0.5/pom.xml 2010-05-05 10:35:37.167378010 +0100
+@@ -76,13 +76,6 @@
+ </systemProperties>
+ </configuration>
+ </plugin>
+- <plugin>
+- <groupId>org.apache.maven.plugins</groupId>
+- <artifactId>maven-release-plugin</artifactId>
+- <configuration>
+- <tagBase>https://svn.codehaus.org/plexus/plexus-utils/tags/</tagBase>
+- </configuration>
+- </plugin>
+ </plugins>
+ </build>
+ </project>
diff --git a/plexus-utils.spec b/plexus-utils.spec
index d3b5768..bd4d1bc 100644
--- a/plexus-utils.spec
+++ b/plexus-utils.spec
@@ -28,33 +28,36 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-%define with_maven 0
-
%define parent plexus
%define subname utils
Name: plexus-utils
-Version: 1.4.5
-Release: 1.2%{?dist}
+Version: 2.0.5
+Release: 1%{?dist}
Summary: Plexus Common Utilities
License: ASL 1.1 and ASL 2.0 and MIT
Group: Development/Libraries
URL: http://plexus.codehaus.org/
Source0: plexus-utils-%{version}.tar.gz
-# svn export http://svn.codehaus.org/plexus/plexus-utils/tags/plexus-utils-1.4.5/
-Source1: plexus-utils-1.4.5-build.xml
+# svn export http://svn.codehaus.org/plexus/plexus-utils/tags/plexus-utils-2.0.1/
+Patch0: plexus-utils-remove-release-plugin.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-BuildRequires: ant
BuildRequires: jpackage-utils >= 0:1.6
Requires: jpackage-utils
Requires(postun): jpackage-utils
-%if %{with_maven}
-BuildRequires: maven2 >= 0:2.0.4
+
+BuildRequires: maven2
+BuildRequires: maven2-plugin-compiler
+BuildRequires: maven2-plugin-install
+BuildRequires: maven2-plugin-jar
+BuildRequires: maven2-plugin-javadoc
+BuildRequires: maven2-plugin-resources
BuildRequires: maven2-plugin-surefire
-%endif
+BuildRequires: maven-doxia-sitetools
+BuildRequires: maven-surefire-provider-junit
Requires(post): jpackage-utils >= 0:1.7.2
Requires(postun): jpackage-utils >= 0:1.7.2
@@ -77,29 +80,17 @@ Requires(postun): jpackage-utils
Javadoc for %{name}.
%prep
-%setup -q -n %{name}-%{version}
-cp %{SOURCE1} build.xml
-
-# Disable file utils test cases. See:
-# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=228419
-rm -f src/test/java/org/codehaus/plexus/util/FileUtilsTest.java
-
-# TODO: Find out why this test keeps freezing
-rm -f src/test/java/org/codehaus/plexus/util/interpolation/RegexBasedInterpolatorTest.java
+%setup -q
+%patch0 -p1
%build
-%if %{with_maven}
-export MAVEN_REPO_LOCAL=`pwd`/.m2/repository
+export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
+mkdir -p $MAVEN_REPO_LOCAL
-mvn-jpp -e \
+mvn-jpp \
-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
install javadoc:javadoc
-%else
-export CLASSPATH=target/classes:target/test-classes
-ant -Dbuild.sysclasspath=only jar javadoc
-%endif
-
%install
rm -rf $RPM_BUILD_ROOT
# jars
@@ -130,8 +121,8 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%{_javadir}/*
-%{_datadir}/maven2
-%{_mavendepmapfragdir}
+%{_mavenpomdir}/*
+%{_mavendepmapfragdir}/*
%files javadoc
%defattr(-,root,root,-)
@@ -139,6 +130,13 @@ rm -rf $RPM_BUILD_ROOT
%doc %{_javadocdir}/%{name}
%changelog
+* Wed May 5 2010 Mary Ellen Foster <mefoster at gmail.com> 2.0.5-1
+- Update to 2.0.5
+
+* Fri Feb 12 2010 Mary Ellen Foster <mefoster at gmail.com> 2.0.1-1
+- Update to 2.0.1
+- Build with maven
+
* Wed Aug 19 2009 Andrew Overholt <overholt@redhat.com> 1.4.5-1.2
- Update to 1.4.5 from JPackage and Deepak Bhole
- Remove gcj bits
diff --git a/sources b/sources
index a5f2fa3..ebc9282 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-89ed0f643168016776809507f94a16b3 plexus-utils-1.4.5.tar.gz
+58d8df8781da14817dde8dd548a15e2e plexus-utils-2.0.5.tar.gz