diff --git a/.gitignore b/.gitignore
index f69ad6e..550a912 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 maven-scm-1.2.tar.xz
+/maven-scm-1.4.tar.xz
diff --git a/001_maven-scm_remove-mockito-test-dep.patch b/001_maven-scm_remove-mockito-test-dep.patch
new file mode 100644
index 0000000..b31177a
--- /dev/null
+++ b/001_maven-scm_remove-mockito-test-dep.patch
@@ -0,0 +1,15 @@
+--- A/maven-scm-providers/maven-scm-provider-accurev/pom.xml	2010-09-07 22:51:34.738026001 +0200
++++ B/maven-scm-providers/maven-scm-provider-accurev/pom.xml	2010-09-07 22:51:46.525026001 +0200
+@@ -45,12 +45,6 @@
+       <scope>test</scope>
+     </dependency>
+     <dependency>
+-      <groupId>org.mockito</groupId>
+-      <artifactId>mockito-all</artifactId>
+-      <version>1.8.5</version>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+       <groupId>org.hamcrest</groupId>
+       <artifactId>hamcrest-library</artifactId>
+       <version>1.1</version>
diff --git a/002_maven-scm_fix-svn-provider-build.patch b/002_maven-scm_fix-svn-provider-build.patch
new file mode 100644
index 0000000..c14df94
--- /dev/null
+++ b/002_maven-scm_fix-svn-provider-build.patch
@@ -0,0 +1,11 @@
+--- A/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/mkdir/SvnMkdirCommand.java	2010-09-08 00:11:51.461026001 +0200
++++ B/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/mkdir/SvnMkdirCommand.java	2010-09-08 00:12:20.093026002 +0200
+@@ -19,7 +19,7 @@
+  * under the License.
+  */
+ 
+-import hidden.org.codehaus.plexus.interpolation.os.Os;
++import org.codehaus.plexus.util.Os;
+ 
+ import java.io.File;
+ import java.io.IOException;
diff --git a/004_maven-scm_fix-svn-provider-java.patch b/004_maven-scm_fix-svn-provider-java.patch
new file mode 100644
index 0000000..068e9c9
--- /dev/null
+++ b/004_maven-scm_fix-svn-provider-java.patch
@@ -0,0 +1,19 @@
+--- A/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogConsumerTest.java	2010-09-08 14:28:29.459743001 +0200
++++ B/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogConsumerTest.java	2010-09-08 14:30:03.766743001 +0200
+@@ -34,6 +34,7 @@
+ import org.apache.maven.scm.ChangeSet;
+ import org.apache.maven.scm.log.DefaultLog;
+ import org.codehaus.plexus.PlexusTestCase;
++import org.codehaus.plexus.DefaultPlexusContainer;
+ import org.codehaus.plexus.logging.Logger;
+ 
+ /**
+@@ -52,7 +53,7 @@
+     {
+         super.setUp();
+ 
+-        logger = getContainer().getLogger();
++        logger = ((DefaultPlexusContainer) getContainer()).getLogger();
+         consumer = new SvnChangeLogConsumer( new DefaultLog(), null );
+     }
+     
diff --git a/005_maven-scm_fix-vss-provider-pom.patch b/005_maven-scm_fix-vss-provider-pom.patch
new file mode 100644
index 0000000..d2f318b
--- /dev/null
+++ b/005_maven-scm_fix-vss-provider-pom.patch
@@ -0,0 +1,15 @@
+--- A/maven-scm-providers/maven-scm-provider-vss/pom.xml	2010-08-05 15:27:52.977078000 +0200
++++ B/maven-scm-providers/maven-scm-provider-vss/pom.xml	2010-09-08 15:04:08.468743003 +0200
+@@ -54,6 +54,12 @@
+         <version>1.0-alpha-21</version><!-- Workaround for SCM-518 -->
+         <executions>
+           <execution>
++            <configuration>
++              <models>
++                <model>src/main/mdo/vss-settings.mdo</model>
++              </models>
++              <version>1.0.0</version>
++            </configuration>
+             <goals>
+               <goal>java</goal>
+               <goal>xpp3-reader</goal>
diff --git a/006_maven-scm_fix-vss-provider-java.patch b/006_maven-scm_fix-vss-provider-java.patch
new file mode 100644
index 0000000..a5d2db2
--- /dev/null
+++ b/006_maven-scm_fix-vss-provider-java.patch
@@ -0,0 +1,19 @@
+--- A/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/status/VssStatusConsumerTest.java	2010-09-08 15:09:28.447743001 +0200
++++ B/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/status/VssStatusConsumerTest.java	2010-09-08 15:11:02.098743001 +0200
+@@ -31,6 +31,7 @@
+ import org.apache.maven.scm.provider.vss.repository.VssScmProviderRepository;
+ import org.apache.maven.scm.repository.ScmRepository;
+ import org.apache.maven.scm.repository.ScmRepositoryException;
++import org.codehaus.plexus.DefaultPlexusContainer;
+ import org.codehaus.plexus.util.IOUtil;
+ 
+ /**
+@@ -50,7 +51,7 @@
+     {
+         super.setUp();
+         scmManager = getScmManager();
+-        logger = getContainer().getLogger();
++        logger = ((DefaultPlexusContainer) getContainer()).getLogger();
+     }
+ 
+     public void testConsumeLine()
diff --git a/maven-scm.spec b/maven-scm.spec
index ff690c7..a3eb228 100644
--- a/maven-scm.spec
+++ b/maven-scm.spec
@@ -33,7 +33,7 @@
 
 Name:           maven-scm
 Version:        1.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          0
 Summary:        Common API for doing SCM operations
 License:        ASL 2.0
@@ -228,8 +228,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_javadocdir}/*
 
 %changelog
+* Wed Sep 08 2010 Guido Grazioli <guido.grazioli@gmail.com> 0:1.4-2
+- Fix BR
+- Remove unused patch
+
 * Tue Sep 07 2010 Guido Grazioli <guido.grazioli@gmail.com> 0:1.4-1
-- Update to upstram 1.4 (#626455)
+- Update to upstream 1.4 (#626455)
 - Require netbeans-cvsclient instead of netbeans-ide (#572165)
 
 * Mon May 10 2010 Guido Grazioli <guido.grazioli@gmail.com> 0:1.2-6
diff --git a/sources b/sources
index ca30b30..07d89d6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-10bbaebae8909507ae612c2535ba28e0  maven-scm-1.2.tar.xz
+02b1f6861676b5f89c38073ac33f90ba  maven-scm-1.4.tar.xz