Removed maven* BRs in favour of apache-commons-parent

Added deprecated groupId to depmap for compatibility reasons
Removed commons-pool from custom depmap

apache-commons-dbcp.spec

@@ -3,36 +3,26 @@
 
 Name:             apache-%{short_name}
 Version:          1.4
-Release:          4%{?dist}
+Release:          5%{?dist}
 Summary:          Apache Commons DataBase Pooling 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
 
-# Depmap needed to remove tomcat* deps (needed only for testing), fix 
-# geronimo transaction and find commons-pool.jar
+# Depmap needed to remove tomcat* deps (needed only for testing) 
+# and fix geronimo transaction
 Source1:          %{short_name}.depmap
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:        noarch
 
 BuildRequires:    java-devel >= 1:1.6.0
 BuildRequires:    jpackage-utils
+BuildRequires:    apache-commons-parent
 BuildRequires:    apache-commons-pool
 BuildRequires:    geronimo-parent-poms
 BuildRequires:    jta
-BuildRequires:    maven2 >= 2.2.1
-BuildRequires:    maven-antrun-plugin
-BuildRequires:    maven-assembly-plugin
-BuildRequires:    maven-compiler-plugin
-BuildRequires:    maven-idea-plugin
-BuildRequires:    maven-install-plugin
-BuildRequires:    maven-jar-plugin
-BuildRequires:    maven-javadoc-plugin
-BuildRequires:    maven-plugin-bundle
 BuildRequires:    maven-plugin-cobertura
-BuildRequires:    maven-resources-plugin
-BuildRequires:    maven-surefire-plugin
 
 Requires:         java >= 1:1.6.0
 Requires:         jpackage-utils
@@ -100,6 +90,10 @@ install -d -m 755 %{buildroot}%{_mavenpomdir}
 install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.pom
 %add_to_maven_depmap org.apache.commons %{short_name} %{version} JPP %{short_name}
 
+# following line is only for backwards compatibility. New packages
+# should use proper groupid org.apache.commons and also artifactid
+%add_to_maven_depmap %{short_name} %{short_name} %{version} JPP %{short_name}
+
 # javadoc
 install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
 cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
@@ -128,6 +122,11 @@ rm -rf %{buildroot}
 %{_javadocdir}/%{name}
 
 %changelog
+* Tue Nov 9 2010 Chris Spike <chris.spike@arcor.de> 1.4-5
+- Removed maven* BRs in favour of apache-commons-parent
+- Added deprecated groupId to depmap for compatibility reasons
+- Removed commons-pool from custom depmap
+
 * Wed Oct 27 2010 Chris Spike <chris.spike@arcor.de> 1.4-4
 - Added depmap entry to find commons-pool.jar
 

commons-dbcp.depmap

@@ -17,14 +17,4 @@
             <artifactId>naming-common</artifactId>
         </maven>
     </dependency>
-    <dependency>
-        <maven>
-            <groupId>commons-pool</groupId>
-            <artifactId>commons-pool</artifactId>
-        </maven>
-        <jpp>
-            <groupId>JPP</groupId>
-            <artifactId>commons-pool</artifactId>
-        </jpp>
-    </dependency>
 </dependencies>