[mule] Fix FTBFS (#992306)

[madsa]

commit c83319a2aaa865ce1146af8a841d62c891c500ae
Author: Matt Spaulding <mspaulding06 at gmail.com>
Date:   Sun Oct 20 20:18:48 2013 -0700

    Fix FTBFS (#992306)

 mule-depmap |  182 -----------------------------------------------------------
 mule.spec   |   64 ++++++++++++++++++---
 2 files changed, 55 insertions(+), 191 deletions(-)
---
diff --git a/mule.spec b/mule.spec
index 030ba3b..3e7b061 100644
--- a/mule.spec
+++ b/mule.spec
@@ -13,7 +13,8 @@ Group: Development/Libraries
 URL: http://www.mulesoft.com
 # svn export http://svn.codehaus.org/mule/tags/mule-2.0.2.20080813
 Source0: mule-2.0.2.20080813.tbz
-Source1: mule-depmap
+# Depmap is not used anymore with mvn_build
+#Source1: mule-depmap
 
 # Fix for newer apache-commons-fileutils
 Patch0: mule-fix-movefile-return.patch
@@ -44,7 +45,7 @@ Patch13: mule-remove-wagon-webdav-extension.patch
 
 BuildArch: noarch
 BuildRequires: jpackage-utils
-BuildRequires: java-devel >= 1.5.0
+BuildRequires: java-devel >= 1:1.7.0
 BuildRequires: maven-local
 BuildRequires: maven-shared
 BuildRequires: maven-enforcer-plugin
@@ -96,8 +97,8 @@ BuildRequires: xmlunit
 BuildRequires: xstream
 
 # mule-core
-Requires: java >= 0:1.5.0
 Requires: jpackage-utils
+Requires: java >= 1:1.7.0
 Requires: apache-commons-beanutils
 Requires: apache-commons-cli
 Requires: apache-commons-collections
@@ -120,7 +121,7 @@ be contacted.
 
 %package buildtools
 Summary: Tools used by the Mule's build procedure
-Requires: java >= 0:1.5.0
+Requires: java >= 1:1.7.0
 Requires: jpackage-utils
 
 %description buildtools
@@ -471,15 +472,57 @@ find modules/management/src/main/java/org/mule/module/management -name "YourKitP
 %pom_disable_module examples
 %pom_disable_module tools 
 
-# %pom_remove_dep org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec
-# %pom_xpath_inject "pom:dependencies" "<dependency><groupId>org.jboss.spec.javax.resource</groupId><artifactId>jboss-connector-api_1.6_spec</artifactId><version>1.0.1-SNAPSHOT</version></dependency>"
-# %pom_remove_dep org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec core
-# %pom_xpath_inject "pom:dependencies" "<dependency><groupId>org.jboss.spec.javax.resource</groupId><artifactId>jboss-connector-api_1.6_spec</artifactId><version>1.0.1-SNAPSHOT</version></dependency>" core
+# Remaining pom file changes below are a replacement of mule-depmap
+%pom_remove_dep org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec
+%pom_remove_dep org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec core
+%pom_add_dep_mgmt org.jboss.spec.javax.resource:jboss-connector-api_1.6_spec
+%pom_add_dep org.jboss.spec.javax.resource:jboss-connector-api_1.6_spec core
+
+%pom_remove_dep org.apache.geronimo.specs:geronimo-jta_1.0.1B_spec
+%pom_remove_dep org.apache.geronimo.specs:geronimo-jta_1.0.1B_spec core
+%pom_add_dep org.apache.geronimo.specs:geronimo-jta_1.1_spec core
+
+%pom_remove_dep org.safehaus.jug:jug core
+%pom_remove_dep org.slf4j:jcl104-over-slf4j core
+%pom_add_dep org.slf4j:jcl-over-slf4j core
+
+%pom_add_dep com.fasterxml.uuid:java-uuid-generator core
+
+for m in modules/builders transports/{http,servlet}; do
+    %pom_remove_dep org.apache.geronimo.specs:geronimo-servlet_2.4_spec ${m}
+    %pom_add_dep org.apache.tomcat:tomcat-servlet-api ${m}
+done
+
+%pom_remove_dep org.codehaus.woodstox:wstx-asl modules/xml
+%pom_add_dep org.codehaus.woodstox:woodstox-core-asl modules/xml
+
+%pom_remove_dep net.sf.saxon:saxon-dom modules/xml
+%pom_add_dep net.sf.saxon:saxon modules/xml
+
+%pom_remove_dep org.apache.geronimo.specs:geronimo-j2ee-management_1.0_spec modules/management
+%pom_add_dep org.jboss.spec.javax.management.j2ee:jboss-j2eemgmt-api_1.1_spec modules/management
+
+%pom_remove_dep org.apache.geronimo.specs:geronimo-j2ee-management_1.0_spec transports/jms
+%pom_add_dep org.jboss.spec.javax.management.j2ee:jboss-j2eemgmt-api_1.1_spec transports/jms
+
+%pom_remove_dep ognl:ognl modules/ognl
+%pom_add_dep org.apache.commons:commons-ognl modules/ognl
+
+%pom_remove_dep jboss:javassist modules/ognl
+%pom_add_dep org.javassist:javassist modules/ognl
+
+%pom_remove_dep quartz:quartz-all transports/quartz
+%pom_add_dep org.quartz-scheduler:quartz transports/quartz
+
+%pom_remove_dep com.sun.xml.messaging.saaj:saaj-impl transports/soap
+%pom_add_dep org.apache.geronimo.specs:geronimo-saaj_1.3_spec transports/soap
+
+%pom_xpath_remove "pom:project/pom:dependencies/pom:dependency[pom:scope = 'system' ]/pom:systemPath" modules/management
+%pom_xpath_remove "pom:project/pom:dependencies/pom:dependency[pom:scope = 'system' ]/pom:scope" modules/management
 
 %build
 %mvn_build -X -f -- \
   -Dproject.build.sourceEncoding=ISO-8859-1
-  # -Dmaven.local.depmap.file="%{SOURCE1}"
 
 %install
 cp -p core/src/main/resources/MULE_LICENSE.txt LICENSE.txt
@@ -613,6 +656,9 @@ cp -rpf target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
 %{_javadocdir}/%{name}
 
 %changelog
+* Sun Oct 20 2013 Matt Spaulding <mspaulding06 at gmail.com> - 2.0.2.20080813-12
+- Fix FTBFS (#992306)
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.2.20080813-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild