diff --git a/.gitignore b/.gitignore
index b2ae519..7c9c6df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 plexus-resources-1.0-alpha-4-src.tar.gz
+plexus-resources-1.0-alpha-7-src.tar.xz
diff --git a/0001-Add-default-role-hint-to-DefaultResourceManager.patch b/0001-Add-default-role-hint-to-DefaultResourceManager.patch
new file mode 100644
index 0000000..ec7708c
--- /dev/null
+++ b/0001-Add-default-role-hint-to-DefaultResourceManager.patch
@@ -0,0 +1,25 @@
+From af71610068c086c03272c63716745fae519af96a Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky@redhat.com>
+Date: Fri, 6 Aug 2010 15:25:23 +0200
+Subject: [PATCH] Add default role-hint to DefaultResourceManager
+
+---
+ .../plexus/resource/DefaultResourceManager.java    |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/main/java/org/codehaus/plexus/resource/DefaultResourceManager.java b/src/main/java/org/codehaus/plexus/resource/DefaultResourceManager.java
+index 8d840f9..5a464f3 100644
+--- a/src/main/java/org/codehaus/plexus/resource/DefaultResourceManager.java
++++ b/src/main/java/org/codehaus/plexus/resource/DefaultResourceManager.java
+@@ -44,7 +44,7 @@ import java.util.Map;
+  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
+  * @author Jason van Zyl
+  * @version $Id: DefaultResourceManager.java 8647 2010-02-15 00:08:07Z olamy $
+- * @plexus.component instantiation-strategy="per-lookup"
++ * @plexus.component instantiation-strategy="per-lookup" role-hint="default"
+  */
+ public class DefaultResourceManager
+     extends AbstractLogEnabled
+-- 
+1.7.2.1
+
diff --git a/plexus-resources-1.0-build.xml b/plexus-resources-1.0-build.xml
deleted file mode 100644
index 8ea7d20..0000000
--- a/plexus-resources-1.0-build.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<project name="plexus-resources" default="jar" basedir=".">
-  <property file="${user.home}/.m2/maven.properties"/>
-  <property name="maven.build.output" value="target/classes"/>
-  <property name="maven.build.directory" value="target"/>
-  <property name="maven.build.final.name" value="plexus-resources-1.0-alpha-4"/>
-  <property name="maven.test.reports" value="${maven.build.directory}/test-reports"/>
-  <property name="maven.test.output" value="target/test-classes"/>
-  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
-  <property name="javadocdir" value="target/site/apidocs"></property>
-
-  <path id="build.classpath">
-    <fileset dir="target/lib">
-      <include name="plexus_utils.jar"/>
-      <include name="plexus_container-default.jar"/>
-      <include name="classworlds.jar"/>
-    </fileset>
-  </path>
-  <target name="clean" description="Clean the output directory">
-    <delete dir="${maven.build.directory}"/>
-  </target>
-  <target name="compile" depends="get-deps" description="Compile the code">
-    <mkdir dir="${maven.build.output}"/>
-    <javac destdir="${maven.build.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
-      <src>
-        <pathelement location="src/main/java"/>
-      </src>
-      <classpath refid="build.classpath"/>
-    </javac>
-    <copy todir="${maven.build.output}">
-      <fileset dir="src/main/resources"/>
-    </copy>
-  </target>
-  <target name="jar" depends="compile,test" description="Clean the JAR">
-    <jar jarfile="${maven.build.directory}/${maven.build.final.name}.jar" basedir="${maven.build.output}" excludes="**/package.html"/>
-  </target>
-  <target name="compile-tests" depends="junit-present, compile" description="Compile the test code" if="junit.present">
-    <mkdir dir="${maven.test.output}"/>
-    <javac destdir="${maven.test.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
-      <src>
-        <pathelement location="src/test/java"/>
-      </src>
-      <classpath>
-        <path refid="build.classpath"/>
-        <pathelement location="${maven.build.output}"/>
-      </classpath>
-    </javac>
-    <copy todir="${maven.test.output}">
-      <fileset dir="src/test/resources"/>
-    </copy>
-  </target>
-  <target name="test" depends="junit-present, compile-tests" if="junit.present" description="Run the test cases">
-    <mkdir dir="${maven.test.reports}"/>
-    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
-      <sysproperty key="basedir" value="."/>
-      <formatter type="xml"/>
-      <formatter type="plain" usefile="false"/>
-      <classpath>
-        <path refid="build.classpath"/>
-        <pathelement location="${maven.build.output}"/>
-        <pathelement location="${maven.test.output}"/>
-      </classpath>
-      <batchtest todir="${maven.test.reports}">
-        <fileset dir="src/test/java">
-          <include name="**/*Test.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-  <target name="test-junit-present">
-    <available classname="junit.framework.Test" property="junit.present"/>
-  </target>
-  <target name="junit-present" depends="test-junit-present" unless="junit.present">
-    <echo>================================= WARNING ================================</echo>
-    <echo> Junit isn&apos;t present in your $ANT_HOME/lib directory. Tests not executed. </echo>
-    <echo>==========================================================================</echo>
-  </target>
-  <target name="test-offline">
-    <condition property="maven.mode.offline">
-      <equals arg1="${build.sysclasspath}" arg2="only"/>
-    </condition>
-  </target>
-  <target name="get-deps" depends="test-offline" description="Download all dependencies" unless="maven.mode.offline">
-    <mkdir dir="${maven.repo.local}"/>
-    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/plexus-resources-1.0-alpha-4/org/codehaus/plexus/plexus-utils/1.2"/>
-    <get src="file:///var/home/jpp/rebuild/free/BUILD/plexus-resources-1.0-alpha-4/.m2/repository/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" usetimestamp="true" ignoreerrors="true"/>
-    <get src="file:///var/home/jpp/rebuild/free/BUILD/plexus-resources-1.0-alpha-4/external_repo/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" usetimestamp="true" ignoreerrors="true"/>
-    <get src="file:///var/home/jpp/rebuild/free/BUILD/plexus-resources-1.0-alpha-4/.m2/repository/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" usetimestamp="true" ignoreerrors="true"/>
-    <get src="http://snapshots.maven.codehaus.org/maven2/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" usetimestamp="true" ignoreerrors="true"/>
-    <get src="file:///usr/share/maven2/repository/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" usetimestamp="true" ignoreerrors="true"/>
-    <get src="http://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar" usetimestamp="true" ignoreerrors="true"/>
-    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/plexus-resources-1.0-alpha-4/org/codehaus/plexus/plexus-container-default/1.0"/>
-    <get src="file:///var/home/jpp/rebuild/free/BUILD/plexus-resources-1.0-alpha-4/.m2/repository/org/codehaus/plexus/plexus-container-default/1.0/plexus-container-default-1.0.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0/plexus-container-default-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
-    <get src="file:///var/home/jpp/rebuild/free/BUILD/plexus-resources-1.0-alpha-4/external_repo/org/codehaus/plexus/plexus-container-default/1.0/plexus-container-default-1.0.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0/plexus-container-default-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
-    <get src="file:///var/home/jpp/rebuild/free/BUILD/plexus-resources-1.0-alpha-4/.m2/repository/org/codehaus/plexus/plexus-container-default/1.0/plexus-container-default-1.0.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0/plexus-container-default-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
-    <get src="http://snapshots.maven.codehaus.org/maven2/org/codehaus/plexus/plexus-container-default/1.0/plexus-container-default-1.0.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0/plexus-container-default-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
-    <get src="file:///usr/share/maven2/repository/org/codehaus/plexus/plexus-container-default/1.0/plexus-container-default-1.0.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0/plexus-container-default-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
-    <get src="http://repo1.maven.org/maven2/org/codehaus/plexus/plexus-container-default/1.0/plexus-container-default-1.0.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0/plexus-container-default-1.0.jar" usetimestamp="true" ignoreerrors="true"/>
-    <mkdir dir="/var/home/jpp/rebuild/free/BUILD/plexus-resources-1.0-alpha-4/classworlds/classworlds/1.4"/>
-    <get src="file:///var/home/jpp/rebuild/free/BUILD/plexus-resources-1.0-alpha-4/.m2/repository/classworlds/classworlds/1.4/classworlds-1.4.jar" dest="${maven.repo.local}/classworlds/classworlds/1.4/classworlds-1.4.jar" usetimestamp="true" ignoreerrors="true"/>
-    <get src="file:///var/home/jpp/rebuild/free/BUILD/plexus-resources-1.0-alpha-4/external_repo/classworlds/classworlds/1.4/classworlds-1.4.jar" dest="${maven.repo.local}/classworlds/classworlds/1.4/classworlds-1.4.jar" usetimestamp="true" ignoreerrors="true"/>
-    <get src="file:///var/home/jpp/rebuild/free/BUILD/plexus-resources-1.0-alpha-4/.m2/repository/classworlds/classworlds/1.4/classworlds-1.4.jar" dest="${maven.repo.local}/classworlds/classworlds/1.4/classworlds-1.4.jar" usetimestamp="true" ignoreerrors="true"/>
-    <get src="http://snapshots.maven.codehaus.org/maven2/classworlds/classworlds/1.4/classworlds-1.4.jar" dest="${maven.repo.local}/classworlds/classworlds/1.4/classworlds-1.4.jar" usetimestamp="true" ignoreerrors="true"/>
-    <get src="file:///usr/share/maven2/repository/classworlds/classworlds/1.4/classworlds-1.4.jar" dest="${maven.repo.local}/classworlds/classworlds/1.4/classworlds-1.4.jar" usetimestamp="true" ignoreerrors="true"/>
-    <get src="http://repo1.maven.org/maven2/classworlds/classworlds/1.4/classworlds-1.4.jar" dest="${maven.repo.local}/classworlds/classworlds/1.4/classworlds-1.4.jar" usetimestamp="true" ignoreerrors="true"/>
-  </target>
-
-  <target name="javadoc" description="o Generate javadoc" depends="get-deps">
-    <mkdir dir="${javadocdir}"></mkdir>
-    <tstamp>
-      <format pattern="-yyyy" property="year"></format>
-    </tstamp>
-    <property name="copyright" value="Copyright &amp;copy;  . All Rights Reserved."></property>
-    <property name="title" value="Plexus Resources Component 1.0-alpha-4 API"></property>
-    <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/main/java" packagenames="org.codehaus.plexus.resource.*">
-      <classpath>
-        <path refid="build.classpath"></path>
-      </classpath>
-    </javadoc>
-  </target>
-
-</project>
diff --git a/plexus-resources-1.0-components.xml b/plexus-resources-1.0-components.xml
deleted file mode 100644
index a3e7486..0000000
--- a/plexus-resources-1.0-components.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<component-set>
-  <components>
-    <component>
-      <role>org.codehaus.plexus.resource.ResourceManager</role>
-      <implementation>org.codehaus.plexus.resource.DefaultResourceManager</implementation>
-      <description></description>
-      <requirements>
-        <requirement>
-          <role>org.codehaus.plexus.resource.loader.ResourceLoader</role>
-          <field-name>resourceLoaders</field-name>
-        </requirement>
-      </requirements>
-    </component>
-    <component>
-      <role>org.codehaus.plexus.resource.loader.ResourceLoader</role>
-      <role-hint>file</role-hint>
-      <implementation>org.codehaus.plexus.resource.loader.FileResourceLoader</implementation>
-      <description></description>
-    </component>
-    <component>
-      <role>org.codehaus.plexus.resource.loader.ResourceLoader</role>
-      <role-hint>jar</role-hint>
-      <implementation>org.codehaus.plexus.resource.loader.JarResourceLoader</implementation>
-      <description></description>
-    </component>
-    <component>
-      <role>org.codehaus.plexus.resource.loader.ResourceLoader</role>
-      <role-hint>classloader</role-hint>
-      <implementation>org.codehaus.plexus.resource.loader.ThreadContextClasspathResourceLoader</implementation>
-      <description></description>
-    </component>
-    <component>
-      <role>org.codehaus.plexus.resource.loader.ResourceLoader</role>
-      <role-hint>url</role-hint>
-      <implementation>org.codehaus.plexus.resource.loader.URLResourceLoader</implementation>
-      <description></description>
-    </component>
-  </components>
-</component-set>
diff --git a/plexus-resources-1.0-jpp-depmap.xml b/plexus-resources-1.0-jpp-depmap.xml
index 2f73d92..7a8e1ca 100644
--- a/plexus-resources-1.0-jpp-depmap.xml
+++ b/plexus-resources-1.0-jpp-depmap.xml
@@ -1,16 +1,4 @@
 <dependencies>
-  <dependency>
-    <maven>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-utils</artifactId>
-      <version>1.0.4</version>
-    </maven>
-    <jpp>
-      <groupId>JPP/plexus</groupId>
-      <artifactId>utils</artifactId>
-      <version>1.2</version>
-    </jpp>
-  </dependency>
   <dependency>
     <maven>
       <groupId>org.codehaus.plexus</groupId>
@@ -23,41 +11,4 @@
       <version>1.0-alpha-8</version>
     </jpp>
   </dependency>
-    <dependency>
-        <maven>
-            <groupId>com.thoughtworks.qdox</groupId>
-            <artifactId>qdox</artifactId>
-            <version>1.6.3</version>
-        </maven>
-        <jpp>
-            <groupId>JPP</groupId>
-            <artifactId>qdox</artifactId>
-            <version>1.6.3</version>
-        </jpp>
-    </dependency>
-    <dependency>
-        <maven>
-            <groupId>org.apache.maven.doxia</groupId>
-            <artifactId>doxia-site-renderer</artifactId>
-            <version>1.0-alpha-7</version>
-        </maven>
-        <jpp>
-            <groupId>JPP/maven-doxia</groupId>
-            <artifactId>site-renderer</artifactId>
-            <version>1.0-alpha-7</version>
-        </jpp>
-    </dependency>
-    <dependency>
-        <maven>
-            <groupId>org.apache.maven.doxia</groupId>
-            <artifactId>doxia-decoration-model</artifactId>
-            <version>1.0-alpha-7</version>
-        </maven>
-        <jpp>
-            <groupId>JPP/maven-doxia</groupId>
-            <artifactId>decoration-model</artifactId>
-            <version>1.0-alpha-7</version>
-        </jpp>
-    </dependency>
-
 </dependencies>
diff --git a/plexus-resources.spec b/plexus-resources.spec
index 90ac2f5..c9db463 100644
--- a/plexus-resources.spec
+++ b/plexus-resources.spec
@@ -28,26 +28,23 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define with_maven 0
-
-%define parent plexus
-%define subname resources
-%define namedversion 1.0-alpha-4
+%global parent plexus
+%global subname resources
+%global namedversion 1.0-alpha-7
 
 Name:           %{parent}-%{subname}
 Version:        1.0
-Release:        0.2.a4%{?dist}
+Release:        0.3.a7%{?dist}
 Summary:        Plexus Resource Manager
 License:        MIT
 Group:          Development/Tools
 URL:            http://plexus.codehaus.org/
-# svn export http://svn.codehaus.org/plexus/tags/plexus-resources-1.0-alpha-4/
-# tar czf plexus-resources-1.0-alpha-4-src.tar.gz plexus-resources-1.0-alpha-4
-Source0:        %{name}-%{version}-alpha-4-src.tar.gz
-Source1:        plexus-resources-1.0-build.xml
-Source2:        plexus-resources-1.0-components.xml
+# svn export http://svn.codehaus.org/plexus/plexus-components/tags/plexus-resources-1.0-alpha-7/
+# tar caf plexus-resources-1.0-alpha-7-src.tar.xz plexus-resources-1.0-alpha-7
+Source0:        %{name}-%{version}-alpha-7-src.tar.xz
 Source3:        plexus-resources-settings.xml
 Source4:        plexus-resources-1.0-jpp-depmap.xml
+Patch0:         0001-Add-default-role-hint-to-DefaultResourceManager.patch
 Requires:       classworlds >= 0:1.1
 Requires:       plexus-container-default
 Requires:       plexus-utils
@@ -57,27 +54,18 @@ Requires(postun): jpackage-utils >= 0:1.7.3
 BuildRequires:  jpackage-utils >= 0:1.7.3
 BuildRequires:  java-devel >= 0:1.5.0
 BuildRequires:  ant >= 0:1.6
-%if %{with_maven}
 BuildRequires:  maven2
-BuildRequires:  maven2-plugin-compiler
-BuildRequires:  maven2-plugin-install
-BuildRequires:  maven2-plugin-jar
-BuildRequires:  maven2-plugin-javadoc
-BuildRequires:  maven2-plugin-release
-BuildRequires:  maven2-plugin-resources
-BuildRequires:  maven2-plugin-surefire = 2.3
-BuildRequires:  maven-surefire-provider-junit = 2.3
+BuildRequires:  maven-compiler-plugin
+BuildRequires:  maven-install-plugin
+BuildRequires:  maven-jar-plugin
+BuildRequires:  maven-javadoc-plugin
+BuildRequires:  maven-release-plugin
+BuildRequires:  maven-resources-plugin
+BuildRequires:  maven-surefire-maven-plugin
+BuildRequires:  maven-surefire-provider-junit
 BuildRequires:  maven-doxia
 BuildRequires:  maven-doxia-sitetools
 BuildRequires:  plexus-maven-plugin >= 1.3.5
-BuildRequires:  qdox >= 1.5
-BuildRequires:  tomcat5
-BuildRequires:  tomcat5-servlet-2.4-api
-BuildRequires:  avalon-logkit
-BuildRequires:  avalon-framework
-%endif
-
-BuildRequires:  classworlds >= 0:1.1
 BuildRequires:  plexus-container-default
 BuildRequires:  plexus-utils
 
@@ -100,14 +88,11 @@ Group:          Documentation
 API documentation for %{name}.
 
 %prep
-%setup -q -n %{name}-%{version}-alpha-4
-cp -p %{SOURCE1} build.xml
-mkdir -p target/classes/META-INF/plexus
-cp -p %{SOURCE2} target/classes/./META-INF/plexus/components.xml
+%setup -q -n %{name}-%{namedversion}
 cp -p %{SOURCE3} settings.xml
+%patch0 -p1
 
 %build
-%if %{with_maven}
 sed -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
 sed -i -e "s|<url>__JAVADIR_PLACEHOLDER__</url>|<url>file://`pwd`/external_repo</url>|g" settings.xml
 sed -i -e "s|<url>__MAVENREPO_DIR_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
@@ -128,18 +113,6 @@ mvn-jpp \
         -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
         install javadoc:javadoc
 
-%else
-export CLASSPATH=
-export OPT_JAR_LIST=:
-mkdir -p target/lib
-build-jar-repository -s -p target/lib \
-classworlds \
-plexus/container-default \
-plexus/utils \
-
-ant -Dmaven.mode.offline=true jar javadoc
-%endif
-
 %install
 rm -rf $RPM_BUILD_ROOT
 # jars
@@ -172,7 +145,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %{_javadir}/%{parent}/*
-%{_datadir}/maven2/poms/*
+%{_mavenpomdir}/*
 %{_mavendepmapfragdir}/*
 
 %files javadoc
@@ -181,6 +154,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_javadocdir}/%{name}
 
 %changelog
+* Wed Aug 25 2010 Alexander Kurtakov <akurtako@redhat.com> 1.0-0.3.a7
+- Update to alpha 7.
+- Apply patch to fix rhbz#621714.
+- Use global instead of define.
+- Drop ant build - broken after update.
+
 * Wed Aug 26 2009 Andrew Overholt <overholt@redhat.com> 1.0-0.2.a4
 - Fix release and defattr
 - Make -javadoc description better
diff --git a/sources b/sources
index 81fae5f..1a6b1c1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-be22d0c00541a8333f80e7ec512929d4  plexus-resources-1.0-alpha-4-src.tar.gz
+f6ac346f9856c1517590c78cc98b737e  plexus-resources-1.0-alpha-7-src.tar.xz