diff --git a/maven-scm.spec b/maven-scm.spec
index a3eb228..38fe1ac 100644
--- a/maven-scm.spec
+++ b/maven-scm.spec
@@ -33,7 +33,7 @@
 
 Name:           maven-scm
 Version:        1.4
-Release:        2%{?dist}
+Release:        4%{?dist}
 Epoch:          0
 Summary:        Common API for doing SCM operations
 License:        ASL 2.0
@@ -63,13 +63,13 @@ BuildArch:      noarch
 
 BuildRequires:  jpackage-utils >= 0:1.6
 BuildRequires:  maven2 >= 2.0.6
-BuildRequires:  maven2-plugin-compiler
-BuildRequires:  maven2-plugin-install
-BuildRequires:  maven2-plugin-jar
-BuildRequires:  maven2-plugin-javadoc
-BuildRequires:  maven2-plugin-plugin
-BuildRequires:  maven2-plugin-resources
-BuildRequires:  maven2-plugin-assembly
+BuildRequires:  maven-compiler-plugin
+BuildRequires:  maven-install-plugin
+BuildRequires:  maven-jar-plugin
+BuildRequires:  maven-javadoc-plugin
+BuildRequires:  maven-plugin-plugin
+BuildRequires:  maven-resources-plugin
+BuildRequires:  maven-assembly-plugin
 BuildRequires:  maven-site-plugin
 BuildRequires:  maven-invoker-plugin
 BuildRequires:  maven-shared-invoker
@@ -78,14 +78,10 @@ BuildRequires:  maven-surefire-provider-junit
 BuildRequires:  maven-surefire-provider-junit4
 BuildRequires:  maven2-common-poms >= 0:1.0-21
 BuildRequires:  modello >= 1.1
-BuildRequires:  modello-maven-plugin >= 1.1
 BuildRequires:  netbeans-cvsclient
 BuildRequires:  plexus-utils >= 1.5.6
 BuildRequires:  saxon-scripts
-BuildRequires:  tomcat5-jsp-2.0-api
-BuildRequires:  tomcat5-servlet-2.4-api
-BuildRequires:  tomcat5
-BuildRequires:  maven-shared-plugin-testing-harness
+BuildRequires:  maven-plugin-testing-harness
 BuildRequires:  maven-doxia-sitetools
 BuildRequires:  plexus-interpolation
 BuildRequires:  bzr
@@ -95,7 +91,6 @@ BuildRequires:  plexus-classworlds
 Requires:       junit >= 3.8.2
 Requires:       jakarta-commons-collections >= 3.1
 Requires:       modello >= 1.0-0.a8
-Requires:       modello-maven-plugin >= 1.0-0.a8
 Requires:       netbeans-cvsclient >= 6.9
 Requires:       jakarta-oro >= 2.0.8
 Requires:       plexus-utils >= 1.2
@@ -131,8 +126,6 @@ Javadoc for %{name}.
 %patch4 -p1
 %patch5 -p1
 
-# We don't have svm synergy classes, so disable those tests for now
-#rm -f maven-scm-providers/maven-scm-provider-synergy/src/test/java/org/apache/maven/scm/provider/synergy/util/SynergyCCMTest.java
 # We dont have mockito, needed for accurev tests, disable for now
 find maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev -type f -name "*Test*" -exec rm -f '{}' \;
 
@@ -164,9 +157,6 @@ for jar in `find . -type f -name "*.jar" | grep -E "target/.*.jar$"`; do
           $RPM_BUILD_ROOT%{_javadir}/%{name}/$newname
 done
 
-(cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{namedversion}*; \
-  do ln -sf ${jar} `echo $jar| sed  "s|-%{namedversion}||g"`; done)
-
 #poms (exclude the svn/cvstest poms. They are unnecessary)
 # ignore 
 #  1) poms in target/ (they are either copies, or temps)
@@ -184,21 +174,8 @@ cp -p pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven-scm-scm.pom
 %add_to_maven_depmap org.apache.maven.plugins maven-scm-plugin %{namedversion} JPP/maven-scm plugin
 
 # javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-
-for docsdir in `find -name apidocs`; do
-        subdir=`echo $docsdir | \
-          awk -F / '{print $(NF-3)}' | sed -e s:^maven-scm-::g`
-        install -dm 755 \
-          $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/$subdir
-        cp -pr $docsdir/* \
-          $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/$subdir
-done
-
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 %post
 %update_maven_depmap
@@ -228,6 +205,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_javadocdir}/*
 
 %changelog
+* Mon Jan 3 2011 Alexander Kurtakov <akurtako@redhat.com> 0:1.4-4
+- Drop tomcat BRs.
+- No more versioned jar and javadoc.
+
 * Wed Sep 08 2010 Guido Grazioli <guido.grazioli@gmail.com> 0:1.4-2
 - Fix BR
 - Remove unused patch