[fedora-java] [jetty: 1/2] - Resolves #652020 - Remove tomcat5 references and replace with appropriate alternatives.

[Jeff Johnston]

commit 7ebedb1ce0f741c4358433351d1545d8f557b60a
Author: Jeff Johnston <jjohnstn at redhat.com>
Date:   Wed Nov 24 14:19:15 2010 -0500

    - Resolves #652020
    - Remove tomcat5 references and replace with appropriate alternatives.

 jetty-depmap.xml |   42 +++++++++++++++++++++++++++++++++++++++---
 jetty.spec       |   26 +++++++++++++++-----------
 2 files changed, 54 insertions(+), 14 deletions(-)
---
diff --git a/jetty-depmap.xml b/jetty-depmap.xml
index a3657b7..d5ce978 100644
--- a/jetty-depmap.xml
+++ b/jetty-depmap.xml
@@ -73,14 +73,50 @@
 	</dependency>
 	<dependency>
 		<maven>
+			<groupId>ant</groupId>
+			<artifactId>ant</artifactId>
+			<version>1.6.5</version>
+		</maven>
+		<jpp>
+			<groupId>JPP</groupId>
+			<artifactId>ant</artifactId>
+			<version>1.7.1</version>
+		</jpp>
+	</dependency>
+	<dependency>
+		<maven>
 			<groupId>tomcat</groupId>
 			<artifactId>jasper-compiler-jdt</artifactId>
 			<version>5.5.15</version>
 		</maven>
 		<jpp>
-			<groupId>JPP</groupId>
-			<artifactId>jasper5-compiler</artifactId>
-			<version>5.5.27</version>
+			<groupId>JPP/tomcat6</groupId>
+			<artifactId>jasper-jdt</artifactId>
+			<version>6.0.18</version>
+		</jpp>
+	</dependency>
+	<dependency>
+		<maven>
+			<groupId>tomcat</groupId>
+			<artifactId>jasper-compiler</artifactId>
+			<version>5.5.15</version>
+		</maven>
+		<jpp>
+			<groupId>JPP/tomcat6</groupId>
+			<artifactId>jasper</artifactId>
+			<version>6.0.26</version>
+		</jpp>
+	</dependency>
+	<dependency>
+		<maven>
+			<groupId>tomcat</groupId>
+			<artifactId>jasper-runtime</artifactId>
+			<version>5.5.15</version>
+		</maven>
+		<jpp>
+			<groupId>JPP/tomcat6</groupId>
+			<artifactId>jasper</artifactId>
+			<version>6.0.26</version>
 		</jpp>
 	</dependency>
 	<dependency>
diff --git a/jetty.spec b/jetty.spec
index 50e65fb..c5a1cd5 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -42,7 +42,7 @@
 
 Name:           jetty
 Version:        6.1.24
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        The Jetty Webserver and Servlet Container
 
 Group:          Applications/Internet
@@ -70,6 +70,7 @@ BuildRequires:  fedora-usermgmt-devel
 BuildRequires:  jpackage-utils >= 0:1.6
 # build only
 BuildRequires: maven-antrun-plugin
+BuildRequires: apache-commons-parent
 BuildRequires: maven-compiler-plugin
 BuildRequires: maven-enforcer-plugin
 BuildRequires: maven-install-plugin
@@ -86,10 +87,9 @@ BuildRequires: maven-war-plugin
 BuildRequires: maven-plugin-bundle
 BuildRequires: maven-surefire-maven-plugin
 BuildRequires: maven-shared-dependency-tree
-BuildRequires: tomcat5
-BuildRequires: tomcat5-jasper
-BuildRequires: tomcat6-servlet-2.5-api
-BuildRequires: tomcat6-jsp-2.1-api
+BuildRequires: tomcat6-lib
+BuildRequires: servlet25
+BuildRequires: jsp21
 BuildRequires: slf4j
 BuildRequires: objectweb-asm
 BuildRequires: apache-commons-el
@@ -100,13 +100,14 @@ BuildRequires: geronimo-parent-poms
 Requires:  chkconfig
 Requires:  jpackage-utils >= 0:1.6
 Requires:  ant >= 0:1.6
+Requires:  apache-commons-parent
 Requires:  apache-commons-el
 Requires:  apache-commons-logging
-Requires:  tomcat5-jasper >= 5.5.26-1.5
+Requires:  tomcat6-lib >= 6.0.26
 Requires:  jsp
 Requires:  mx4j >= 0:3.0
-Requires: tomcat6-servlet-2.5-api
-Requires: tomcat6-jsp-2.1-api
+Requires: servlet25
+Requires: jsp21
 Requires: slf4j
 Requires: javamail
 Requires:  xerces-j2 >= 0:2.7
@@ -297,8 +298,7 @@ pushd $RPM_BUILD_ROOT%{homedir}/lib/jsp-2.0
 rm -fr *.jar
 build-jar-repository . ant
 build-jar-repository . commons-el
-build-jar-repository . jasper5-compiler
-build-jar-repository . jasper5-runtime
+build-jar-repository . tomcat6/jasper
 build-jar-repository . slf4j/jcl-over-slf4j
 build-jar-repository . slf4j/api
 build-jar-repository . slf4j/simple
@@ -385,11 +385,15 @@ fi
 %doc %{_docdir}/%{name}-%{version}
 
 %changelog
+* Mon Nov 22 2010 Jeff Johnston <jjohnstn at redhat.com> 6.1.24-2
+- Resolves #652020
+- Remove tomcat5 references and replace with appropriate alternatives.
+
 * Tue Jun 15 2010 Alexander Kurtakov <akurtako at redhat.com> 6.1.24-1
 - Update to 6.1.24.
 
 * Wed Dec 02 2009 Jeff Johnston <jjohnstn at redhat.com> 6.1.21-4
-- Resovles #543081
+- Resolves #543081
 - Add maven depmap fragments.
 
 * Tue Nov 03 2009 Jeff Johnston <jjohnstn at redhat.com> 6.1.21-3