[jamonapi] Update POM to reflect current jetty and tomcat deps

[Andy Grimm]

commit a6fa296ee3515b0f8e4811b5857df3e15b37ae41
Author: Andy Grimm <agrimm at gmail.com>
Date:   Wed Mar 14 15:54:38 2012 -0400

    Update POM to reflect current jetty and tomcat deps

 jamonapi-2.73.pom |    8 ++++----
 jamonapi.spec     |    7 +++++--
 2 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/jamonapi-2.73.pom b/jamonapi-2.73.pom
index a276ed4..6845dd2 100644
--- a/jamonapi-2.73.pom
+++ b/jamonapi-2.73.pom
@@ -46,8 +46,8 @@
   <dependencies>
     <dependency>
        <groupId>org.apache.tomcat</groupId>
-       <artifactId>catalina</artifactId>
-       <version>6.0.0</version>
+       <artifactId>tomcat-catalina</artifactId>
+       <version>7.0.0</version>
     </dependency>
     <dependency>
        <groupId>javax.servlet</groupId>
@@ -55,9 +55,9 @@
        <version>2.3</version>
     </dependency>
     <dependency>
-       <groupId>org.mortbay.jetty</groupId>
+       <groupId>org.eclipse.jetty</groupId>
        <artifactId>jetty-util</artifactId>
-       <version>6.1.0</version>
+       <version>8.0.0</version>
     </dependency>
   </dependencies>
 </project>
diff --git a/jamonapi.spec b/jamonapi.spec
index ba231cc..2300ee7 100644
--- a/jamonapi.spec
+++ b/jamonapi.spec
@@ -2,7 +2,7 @@
 
 Name:       jamonapi
 Version:    2.73
-Release:    4%{?dist}
+Release:    5%{?dist}
 Summary:    A Java monitoring API
 Group:      Development/Libraries
 License:    BSD
@@ -12,7 +12,7 @@ URL:        http://jamon.sourceforge.net
 # cvs -z3 -d:pserver:anonymous at jamonapi.cvs.sourceforge.net:/cvsroot/jamonapi co -P -r v2_73 jamonapi/src
 # tar caf jamonapi-2.73.tar.gz jamonapi
 Source0:    jamonapi-2.73.tar.gz
-# I have not found the original link from which this pom was downloaded
+# This POM is completely Fedora-specific
 Source1:    jamonapi-2.73.pom
 Patch0:     jamonapi-buildxml.patch
 Patch1:     jamonapi-jetty8.patch
@@ -102,6 +102,9 @@ cp -rp src/doc/javadoc ${RPM_BUILD_ROOT}%{_javadocdir}/%{name}
 %{_javadocdir}/%{name}
 
 %changelog
+* Wed Mar 14 2012 Andy Grimm <agrimm at gmail.com> 2.73-5
+- Update POM to reflect current jetty and tomcat deps
+
 * Sun Feb 26 2012 Andy Grimm <agrimm at gmail.com> 2.73-4
 - remove duplicate javadoc directory
 - Remove PowerBuilder example zipfile