[java-sig-commits] [jetty] - Resolves #655808 - Fix util pom to reference javax.servlet groupid for servlet-api. - Don't add to

[Jeff Johnston]

commit e4eb8839736680eaff707c98082e88798603c40e
Author: Jeff Johnston <jjohnstn at redhat.com>
Date:   Wed Dec 1 14:53:58 2010 -0500

    - Resolves #655808
    - Fix util pom to reference javax.servlet groupid for servlet-api.
    - Don't add tomcat6-servlet-api to depmap.
    - Remove tomcat5 BR.

 jetty-depmap.xml |   12 ------------
 jetty.spec       |   16 +++++++++++-----
 2 files changed, 11 insertions(+), 17 deletions(-)
---
diff --git a/jetty-depmap.xml b/jetty-depmap.xml
index b7d84c8..a5fc441 100644
--- a/jetty-depmap.xml
+++ b/jetty-depmap.xml
@@ -14,18 +14,6 @@
 	<dependency>
 		<maven>
 			<groupId>org.mortbay.jetty</groupId>
-			<artifactId>servlet-api</artifactId>
-			<version>2.5-20081211</version>
-		</maven>
-		<jpp>
-			<groupId>JPP</groupId>
-			<artifactId>tomcat6-servlet-2.5-api</artifactId>
-			<version>6.0.18</version>
-		</jpp>
-	</dependency>
-	<dependency>
-		<maven>
-			<groupId>org.mortbay.jetty</groupId>
 			<artifactId>jsp-2.1-glassfish</artifactId>
 			<version>9.1.1.B60.25.p2</version>
 		</maven>
diff --git a/jetty.spec b/jetty.spec
index 5ef7d5e..961ad2e 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -42,7 +42,7 @@
 
 Name:           jetty
 Version:        6.1.26
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        The Jetty Webserver and Servlet Container
 
 Group:          Applications/Internet
@@ -53,8 +53,9 @@ Source1:	djetty.script
 Source2:        jetty.init
 Source3:        jetty.logrotate
 Source4:        %{name}-depmap.xml
-Patch0:     disable-modules.patch
-Patch4:		jetty-plugin-fix-site.patch
+Patch0:	        disable-modules.patch
+Patch1:	        jetty-util-pom.patch
+Patch4:	        jetty-plugin-fix-site.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -91,7 +92,6 @@ BuildRequires: apache-commons-daemon
 BuildRequires: geronimo-jta
 BuildRequires: geronimo-parent-poms
 BuildRequires: apache-commons-parent
-BuildRequires: tomcat5
 BuildRequires: derby
 
 Requires:  chkconfig
@@ -150,6 +150,7 @@ for f in $(find . -name "*.?ar"); do rm $f; done
 find . -name "*.class" -exec rm {} \;
 
 %patch0 -b .sav
+%patch1 -b .sav
 %patch4 -b .sav
 
 cp %{SOURCE1} djetty
@@ -212,7 +213,6 @@ install -pm 644 modules/util/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP
 
 %add_to_maven_depmap org.mortbay.jetty jetty %{version} JPP/jetty jetty
 %add_to_maven_depmap org.mortbay.jetty jetty-util %{version} JPP/jetty jetty-util
-%add_to_maven_depmap org.mortbay.jetty servlet-api %{version} JPP tomcat6-servlet-2.5-api
 
 install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 install -dm 755 $RPM_BUILD_ROOT%{confdir}
@@ -375,6 +375,12 @@ fi
 %doc %{_docdir}/%{name}-%{version}
 
 %changelog
+* Wed Dec 01 2010 Jeff Johnston <jjohnstn at redhat.com> 6.1.26-3
+- Resolves #655808
+- Fix util pom to reference javax.servlet groupid for servlet-api.
+- Don't add tomcat6-servlet-api to depmap.
+- Remove tomcat5 BR.
+
 * Mon Nov 22 2010 Jeff Johnston <jjohnstn at redhat.com> 6.1.26-2
 - Resolves #652020
 - Remove tomcat5 references and replace with appropriate alternatives.