[apache-commons-configuration] Cleanup dependencies

[Mikolaj Izdebski]

commit fd0eb1b96cdbf0bbd0ce7ea175ef460a5e5d212f
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Tue Jun 19 10:47:13 2012 +0200

    Cleanup dependencies

 apache-commons-configuration.spec |   69 ++++++++++++++++---------------------
 1 files changed, 30 insertions(+), 39 deletions(-)
---
diff --git a/apache-commons-configuration.spec b/apache-commons-configuration.spec
index c61f437..439f5d4 100644
--- a/apache-commons-configuration.spec
+++ b/apache-commons-configuration.spec
@@ -10,64 +10,56 @@ Summary:        Commons Configuration Package
 Group:          Development/Libraries
 License:        ASL 2.0
 URL:            http://commons.apache.org/%{base_name}/
-Source0:        http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
+Source0:        http://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
 BuildArch:      noarch
 
 BuildRequires:  java-devel
-BuildRequires:  jpackage-utils >= 0:1.7.2
-BuildRequires:  maven-doxia-sitetools
-BuildRequires:  maven-plugin-bundle
-BuildRequires:  maven-surefire-plugin
-BuildRequires:  maven-surefire-provider-junit
+BuildRequires:  jpackage-utils
+
+BuildRequires:  maven
 BuildRequires:  maven-antrun-plugin
 BuildRequires:  maven-assembly-plugin
 BuildRequires:  maven-compiler-plugin
+BuildRequires:  maven-doxia-sitetools
 BuildRequires:  maven-idea-plugin
 BuildRequires:  maven-install-plugin
 BuildRequires:  maven-jar-plugin
+BuildRequires:  javacc-maven-plugin
 BuildRequires:  maven-javadoc-plugin
+BuildRequires:  maven-plugin-bundle
 BuildRequires:  maven-resources-plugin
-BuildRequires:  maven
+BuildRequires:  maven-surefire-plugin
+BuildRequires:  maven-surefire-provider-junit
 
-BuildRequires:  xalan-j2
-BuildRequires:  xerces-j2
-BuildRequires:  xml-commons-apis
-BuildRequires:  apache-commons-beanutils >= 0:1.7.0
+BuildRequires:  apache-commons-beanutils
 BuildRequires:  apache-commons-codec
-BuildRequires:  apache-commons-lang
-BuildRequires:  apache-commons-logging
 BuildRequires:  apache-commons-collections
-BuildRequires:  apache-commons-dbcp
 BuildRequires:  apache-commons-digester
+BuildRequires:  apache-commons-jexl
 BuildRequires:  apache-commons-jxpath
-BuildRequires:  apache-commons-pool
+BuildRequires:  apache-commons-lang
+BuildRequires:  apache-commons-logging
+BuildRequires:  apache-commons-vfs
 BuildRequires:  tomcat-servlet-3.0-api
+BuildRequires:  xml-commons-resolver
 
-Requires:  tomcat-servlet-3.0-api
-Requires:  apache-commons-beanutils >= 0:1.7.0
-Requires:  apache-commons-codec
-Requires:  apache-commons-jxpath
-Requires:  apache-commons-lang
-Requires:  apache-commons-logging
-Requires:  apache-commons-collections
-Requires:  apache-commons-dbcp
-Requires:  apache-commons-digester
-Requires:  apache-commons-pool
-Requires:  xerces-j2
-Requires:  xml-commons-apis
-
-Requires(post):   jpackage-utils >= 1.7.2
-Requires(postun): jpackage-utils >= 1.7.2
+Requires:       java
+Requires:       jpackage-utils
+Requires:       apache-commons-beanutils
+Requires:       apache-commons-codec
+Requires:       apache-commons-collections
+Requires:       apache-commons-digester
+Requires:       apache-commons-jexl
+Requires:       apache-commons-jxpath
+Requires:       apache-commons-lang
+Requires:       apache-commons-logging
+Requires:       apache-commons-vfs
+Requires:       tomcat-servlet-3.0-api
+Requires:       xml-commons-resolver
 
 Provides:       jakarta-%{short_name} = 0:%{version}-%{release}
 Obsoletes:      jakarta-%{short_name} < 0:%{version}-%{release}
 
-# for 1.8
-Requires: apache-commons-vfs
-BuildRequires: apache-commons-vfs
-Requires: apache-commons-jexl
-BuildRequires: apache-commons-jexl
-BuildRequires: javacc-maven-plugin
 
 %description
 Configuration is a project to provide a generic Configuration
@@ -99,9 +91,8 @@ Obsoletes:      jakarta-%{short_name}-javadoc < 0:%{version}-%{release}
 %{__sed} -i 's/\r//' LICENSE.txt
 
 %build
-# we skip tests because we don't have test deps
-mvn-rpmbuild -Dmaven.test.skip=true \
-        install javadoc:javadoc
+# We skip tests because we don't have test deps (dbunit in particular).
+mvn-rpmbuild -Dmaven.test.skip=true install javadoc:javadoc
 
 %install
 # jars