[maven-scm/f20] Fix removal of cvs java provider, rhbz #962273

[mbooth]

commit 9601da337f8c86becb307b3a117daa459118943e
Author: Mat Booth <fedora at matbooth.co.uk>
Date:   Mon Aug 26 15:11:21 2013 +0100

    Fix removal of cvs java provider, rhbz #962273
    
    - Update to latest upstream
    - Drop upstreamed patches

 maven-scm.spec |   48 ++++++++++++++++++++++++------------------------
 1 files changed, 24 insertions(+), 24 deletions(-)
---
diff --git a/maven-scm.spec b/maven-scm.spec
index 41eaa11..2f431d7 100644
--- a/maven-scm.spec
+++ b/maven-scm.spec
@@ -29,8 +29,8 @@
 #
 
 Name:           maven-scm
-Version:        1.7
-Release:        10%{?dist}
+Version:        1.8.1
+Release:        1%{?dist}
 Summary:        Common API for doing SCM operations
 License:        ASL 2.0
 Group:          Development/Libraries
@@ -38,34 +38,27 @@ URL:            http://maven.apache.org/scm
 
 Source0:        http://repo1.maven.org/maven2/org/apache/maven/scm/%{name}/%{version}/%{name}-%{version}-source-release.zip
 
-# fix modello configuration in vss provider pom and the cast as above
-Patch0:         005_maven-scm_fix-vss-provider-pom.patch
-# replace plexus-maven-plugin for plexus-component-metadata
-Patch1:         007_maven-scm_migration-to-component-metadata.patch
-# plexus-maven-plugin -> plexus-component-metadata
-Patch5:         012-plexus-component-metadata.patch
 # Patch to migrate to new plexus default container
-Patch6:         plexus-container-migration.patch
+# This has been sent upstream: http://jira.codehaus.org/browse/SCM-731
+Patch6:         0001-port-maven-scm-to-latest-version-of-plexus-default-c.patch
+# Workaround upstream's workaround for a modello bug, see: http://jira.codehaus.org/browse/SCM-518
+Patch7:         vss-modello-config.patch
 
 BuildArch:      noarch
 
 BuildRequires:  jpackage-utils >= 0:1.6
 BuildRequires:  maven-local
-BuildRequires:  modello >= 1.1
+BuildRequires:  modello
 BuildRequires:  plexus-utils >= 1.5.6
 BuildRequires:  maven-plugin-testing-harness
-BuildRequires:  maven-doxia-sitetools
-BuildRequires:  plexus-interpolation
 BuildRequires:  bzr
 BuildRequires:  subversion
 BuildRequires:  plexus-containers-component-metadata
 BuildRequires:  plexus-containers-container-default
 BuildRequires:  plexus-classworlds
+BuildRequires:  mockito
 
-Requires:       junit >= 3.8.2
-Requires:       apache-commons-collections >= 3.1
-Requires:       modello >= 1.0-0.a8
-Requires:       jakarta-oro >= 2.0.8
+Requires:       modello
 Requires:       velocity >= 1.4
 
 %description
@@ -89,15 +82,13 @@ Javadoc for %{name}.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch5 -p1
-%patch6 -p0 -b.orig
+%patch6 -p1 -b.orig
+%patch7 -p0 -b.orig
 
+# Remove unnecessary animal sniffer
 %pom_remove_plugin org.codehaus.mojo:animal-sniffer-maven-plugin
-%pom_remove_plugin org.codehaus.mojo:animal-sniffer-maven-plugin maven-scm-plugin
 
-# remove providers-integrity from build (we don't have mks-api)
+# Remove providers-integrity from build (we don't have mks-api)
 %pom_remove_dep org.apache.maven.scm:maven-scm-provider-integrity maven-scm-providers/maven-scm-providers-standard
 %pom_disable_module maven-scm-provider-integrity maven-scm-providers
 
@@ -106,15 +97,19 @@ Javadoc for %{name}.
 %pom_remove_dep org.apache.maven.scm:maven-scm-provider-cvsjava maven-scm-client
 %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
+sed -i s/cvsjava.CvsJava/cvsexe.CvsExe/ maven-scm-client/src/main/resources/META-INF/plexus/components.xml
 
+# Put TCK tests into a separate sub-package
 %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
+# Don't build and unit run tests because
+# * accurev tests need porting to a newer hamcrest
+# * vss tests fail with the version of junit in fedora
+%mvn_build -f
 
 %install
 %mvn_install
@@ -130,6 +125,11 @@ Javadoc for %{name}.
 %doc LICENSE NOTICE
 
 %changelog
+* Sun Aug 25 2013 Mat Booth <fedora at matbooth.co.uk> - 1.8.1-1
+- Fix removal of cvs java provider, rhbz #962273
+- Update to latest upstream
+- Drop upstreamed patches
+
 * Sat Aug 24 2013 Mat Booth <fedora at matbooth.co.uk> - 1.7-10
 - Remove use of deprecated macros, rhbz #992204
 - Don't ship test jars in main package