diff --git a/.gitignore b/.gitignore
index 278c3f9..7dd2c84 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1 @@
-maven-scm-1.2.tar.xz
-/maven-scm-1.4.tar.xz
-maven-scm-1.5-source-release.zip
-/maven-scm-1.6-source-release.zip
 /maven-scm-1.7-source-release.zip
diff --git a/maven-scm-jpp-depmap.xml b/maven-scm-jpp-depmap.xml
deleted file mode 100644
index f7f135c..0000000
--- a/maven-scm-jpp-depmap.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<dependencies>
-   <dependency>
-    <maven>
-        <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-container-default</artifactId>
-        <version>1.5.4</version>
-    </maven>
-    <jpp>
-        <groupId>JPP/plexus</groupId>
-        <artifactId>container-default</artifactId>
-        <version>1.0-alpha-9</version>
-    </jpp>
-  </dependency>
-
-</dependencies>
diff --git a/maven-scm.spec b/maven-scm.spec
index aac5638..41eaa11 100644
--- a/maven-scm.spec
+++ b/maven-scm.spec
@@ -30,15 +30,13 @@
 
 Name:           maven-scm
 Version:        1.7
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Common API for doing SCM operations
 License:        ASL 2.0
 Group:          Development/Libraries
 URL:            http://maven.apache.org/scm
 
 Source0:        http://repo1.maven.org/maven2/org/apache/maven/scm/%{name}/%{version}/%{name}-%{version}-source-release.zip
-Source1:        %{name}-jpp-depmap.xml
-Source2:        http://www.apache.org/licenses/LICENSE-2.0.txt
 
 # fix modello configuration in vss provider pom and the cast as above
 Patch0:         005_maven-scm_fix-vss-provider-pom.patch
@@ -68,9 +66,7 @@ Requires:       junit >= 3.8.2
 Requires:       apache-commons-collections >= 3.1
 Requires:       modello >= 1.0-0.a8
 Requires:       jakarta-oro >= 2.0.8
-Requires:       plexus-utils >= 1.2
 Requires:       velocity >= 1.4
-Requires:       maven
 
 %description
 Maven SCM supports Maven plugins (e.g. maven-release-plugin) and other
@@ -87,7 +83,6 @@ Tests for %{name}.
 %package javadoc
 Summary:        Javadoc for %{name}
 Group:          Documentation
-Requires:       jpackage-utils
 
 %description javadoc
 Javadoc for %{name}.
@@ -99,8 +94,6 @@ Javadoc for %{name}.
 %patch5 -p1
 %patch6 -p0 -b.orig
 
-cp -p %{SOURCE2} LICENSE
-
 %pom_remove_plugin org.codehaus.mojo:animal-sniffer-maven-plugin
 %pom_remove_plugin org.codehaus.mojo:animal-sniffer-maven-plugin maven-scm-plugin
 
@@ -114,68 +107,34 @@ cp -p %{SOURCE2} LICENSE
 %pom_remove_dep org.apache.maven.scm:maven-scm-provider-cvsjava maven-scm-providers/maven-scm-providers-standard
 %pom_disable_module maven-scm-provider-cvsjava maven-scm-providers/maven-scm-providers-cvs
 
+%mvn_package :%{name}-provider-cvstest test
+%mvn_package :%{name}-provider-gittest test
+%mvn_package :%{name}-provider-svntest test
+%mvn_package :%{name}-test test
 
 %build
 # we don't have all test dependencies to run full testsuite anyway
-%mvn_build -f -- -Dproject.build.sourceEncoding=ISO-8859-1 -Dmaven.local.depmap.file=%{SOURCE1}
+%mvn_build -f -- -Dproject.build.sourceEncoding=ISO-8859-1
 
 %install
-# jars/poms
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
-install -d -m 755 $RPM_BUILD_ROOT/%{_mavenpomdir}
-
-for jar in `find . -type f -name "*.jar" | grep -E "target/.*.jar$"`; do
-        newname=`basename $jar`
-        newname=${newname/maven-scm-/}
-        versionless_jar=${newname/-%{version}/}
-        install -pm 644 $jar $RPM_BUILD_ROOT%{_javadir}/%{name}/$versionless_jar
-done
-
-#remove maven-scm CLI jar-with-dependencies created by maven-assembly-plugin
-rm $RPM_BUILD_ROOT%{_javadir}/%{name}/client-jar-with-dependencies.jar
-
-#poms (exclude the svn/cvs test poms. They are unnecessary)
-# ignore
-#  1) poms in target/ (they are either copies, or temps)
-#  2) poms in src/test/ (they are poms needed for tests only)
-for i in `find . -name pom.xml | grep -v \\\./pom.xml | \
-   grep -v target | grep -v src/test`; do
-        artifactname=`basename \`dirname $i\``
-        jarname=`echo $artifactname | sed -e s:^maven-scm-::g`
-        cp -p $i $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.$artifactname.pom
-        %add_to_maven_depmap org.apache.maven.scm $artifactname %{version} JPP/%{name} $jarname
-done
-cp -p pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-scm-scm.pom
-%add_to_maven_depmap org.apache.maven.scm maven-scm %{version} JPP/maven-scm scm
-
-%add_to_maven_depmap org.apache.maven.plugins maven-scm-plugin %{version} JPP/maven-scm plugin
-
-# javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-%files
-%doc LICENSE
+%mvn_install
+
+%files -f .mfiles
+%doc LICENSE NOTICE
 %dir %{_javadir}/%{name}
-%{_javadir}/%{name}/api*
-%{_javadir}/%{name}/client*
-%{_javadir}/%{name}/manager-plexus*
-%{_javadir}/%{name}/plugin*
-%{_javadir}/%{name}/provider-*
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
-
-%files test
-%doc LICENSE
-%{_javadir}/%{name}/provider-cvstest*
-%{_javadir}/%{name}/provider-svntest*
-%{_javadir}/%{name}/test*
-
-%files javadoc
-%doc LICENSE
-%{_javadocdir}/*
+
+%files test -f .mfiles-test
+%doc LICENSE NOTICE
+
+%files javadoc -f .mfiles-javadoc
+%doc LICENSE NOTICE
 
 %changelog
+* Sat Aug 24 2013 Mat Booth <fedora@matbooth.co.uk> - 1.7-10
+- Remove use of deprecated macros, rhbz #992204
+- Don't ship test jars in main package
+- Install NOTICE file
+
 * Sat Aug 24 2013 Mat Booth <fedora@matbooth.co.uk> - 1.7-9
 - Add patch to build against newer plexus default container, rhbz #996199
 - Drop unneeded BRs
diff --git a/sources b/sources
index 2aaddb2..f484cb2 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
 7c1b497bc8cebe99b8d238d4067c6183  maven-scm-1.7-source-release.zip
-3b83ef96387f14655fc854ddc3c6bd57  LICENSE-2.0.txt