diff --git a/maven-scm.spec b/maven-scm.spec index 2f431d7..2001e7f 100644 --- a/maven-scm.spec +++ b/maven-scm.spec @@ -30,7 +30,7 @@ Name: maven-scm Version: 1.8.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Common API for doing SCM operations License: ASL 2.0 Group: Development/Libraries @@ -56,7 +56,6 @@ BuildRequires: subversion BuildRequires: plexus-containers-component-metadata BuildRequires: plexus-containers-container-default BuildRequires: plexus-classworlds -BuildRequires: mockito Requires: modello Requires: velocity >= 1.4 @@ -99,6 +98,10 @@ Javadoc for %{name}. %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 +# Tests are skipped anyways, so remove dependency on mockito. +%pom_remove_dep org.mockito: maven-scm-providers/maven-scm-provider-jazz +%pom_remove_dep org.mockito: maven-scm-providers/maven-scm-provider-accurev + # Put TCK tests into a separate sub-package %mvn_package :%{name}-provider-cvstest test %mvn_package :%{name}-provider-gittest test @@ -125,6 +128,9 @@ sed -i s/cvsjava.CvsJava/cvsexe.CvsExe/ maven-scm-client/src/main/resources/META %doc LICENSE NOTICE %changelog +* Tue Aug 27 2013 Mikolaj Izdebski - 1.8.1-2 +- Remove BR: mockito + * Sun Aug 25 2013 Mat Booth - 1.8.1-1 - Fix removal of cvs java provider, rhbz #962273 - Update to latest upstream