Removed Tomcat 6 dependency.
The Tomcat Servlet API packages have been replaced with the equivalent JBoss Servlet API packages.
This commit is contained in:
Endi S. Dewata
Ade Lee
parent
04b1dbdaaa
commit
a3c4ee164c
|
|
@ -0,0 +1,75 @@
|
|||
From dff39e93cefe92475caa1008cd7c3c1e2d0b3752 Mon Sep 17 00:00:00 2001
|
||||
From: Endi Sukma Dewata <edewata@redhat.com>
|
||||
Date: Wed, 3 Apr 2013 14:07:34 -0400
|
||||
Subject: [PATCH] Removed Tomcat 6 dependency
|
||||
|
||||
---
|
||||
async-http-servlet-3.0/async-http-servlet-3.0/pom.xml | 2 +-
|
||||
pom.xml | 6 +++---
|
||||
resteasy-jaxrs/pom.xml | 4 ++--
|
||||
tjws/pom.xml | 4 ++--
|
||||
4 files changed, 8 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/async-http-servlet-3.0/async-http-servlet-3.0/pom.xml b/async-http-servlet-3.0/async-http-servlet-3.0/pom.xml
|
||||
index 480582611cbb4a89dff781775f53f72a1ee468d3..a1f6d889a50ff5b8fb1e273455afa7b98ce80258 100644
|
||||
--- a/async-http-servlet-3.0/async-http-servlet-3.0/pom.xml
|
||||
+++ b/async-http-servlet-3.0/async-http-servlet-3.0/pom.xml
|
||||
@@ -16,7 +16,7 @@
|
||||
<dependency>
|
||||
<groupId>org.jboss.spec.javax.servlet</groupId>
|
||||
<artifactId>jboss-servlet-api_3.0_spec</artifactId>
|
||||
- <version>1.0.0.Beta2</version>
|
||||
+ <version>1.0.1.Final</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
diff --git a/pom.xml b/pom.xml
|
||||
index 2f72f897e62633fab1f074a3059045825a99a269..4b4f734599fab99acb46a28a5290f4576651444c 100644
|
||||
--- a/pom.xml
|
||||
+++ b/pom.xml
|
||||
@@ -238,9 +238,9 @@
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
- <groupId>javax.servlet</groupId>
|
||||
- <artifactId>servlet-api</artifactId>
|
||||
- <version>2.5</version>
|
||||
+ <groupId>org.jboss.spec.javax.servlet</groupId>
|
||||
+ <artifactId>jboss-servlet-api_2.5_spec</artifactId>
|
||||
+ <version>1.0.1.Final</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.james</groupId>
|
||||
diff --git a/resteasy-jaxrs/pom.xml b/resteasy-jaxrs/pom.xml
|
||||
index 36d546096dde31d5b0255ff30fa2ac46379d18ed..b256334bc5d03e403c70649ec9d484c0cb02d6f7 100644
|
||||
--- a/resteasy-jaxrs/pom.xml
|
||||
+++ b/resteasy-jaxrs/pom.xml
|
||||
@@ -25,8 +25,8 @@
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
- <groupId>javax.servlet</groupId>
|
||||
- <artifactId>servlet-api</artifactId>
|
||||
+ <groupId>org.jboss.spec.javax.servlet</groupId>
|
||||
+ <artifactId>jboss-servlet-api_2.5_spec</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
|
||||
diff --git a/tjws/pom.xml b/tjws/pom.xml
|
||||
index 1f703262dbcd6ac3facfb3b59bb8c59999cb9c0a..e95bb6ad9c326394285ed7231180a8d5b57d6a98 100644
|
||||
--- a/tjws/pom.xml
|
||||
+++ b/tjws/pom.xml
|
||||
@@ -15,8 +15,8 @@
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
- <groupId>javax.servlet</groupId>
|
||||
- <artifactId>servlet-api</artifactId>
|
||||
+ <groupId>org.jboss.spec.javax.servlet</groupId>
|
||||
+ <artifactId>jboss-servlet-api_2.5_spec</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
--
|
||||
1.8.1.4
|
||||
|
||||
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
Name: resteasy
|
||||
Version: 2.3.2
|
||||
Release: 11%{?dist}
|
||||
Release: 12%{?dist}
|
||||
Summary: Framework for RESTful Web services and Java applications
|
||||
Group: Development/Libraries
|
||||
License: ASL 2.0 and CDDL
|
||||
|
|
@ -20,6 +20,7 @@ Patch2: %{name}-%{namedversion}-remove-currently-unbuilt-modules.patch
|
|||
Patch3: %{name}-%{namedversion}-fix-javadoc.patch
|
||||
# Support for mime4j 0.7.2
|
||||
Patch4: %{name}-%{namedversion}-mime4j-0.7.2.patch
|
||||
Patch5: %{name}-%{namedversion}-Removed-Tomcat-6-dependency.patch
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
|
|
@ -54,6 +55,8 @@ BuildRequires: javassist
|
|||
BuildRequires: jandex >= 1.0.3-4
|
||||
# BuildRequires: jboss-ejb3-ext-api
|
||||
# BuildRequires: jbosscache-core
|
||||
BuildRequires: jboss-servlet-2.5-api
|
||||
BuildRequires: jboss-servlet-3.0-api
|
||||
# BuildRequires: jboss-web
|
||||
BuildRequires: jcip-annotations
|
||||
BuildRequires: jettison
|
||||
|
|
@ -72,10 +75,6 @@ BuildRequires: snakeyaml
|
|||
BuildRequires: glassfish-fastinfoset
|
||||
#BuildRequires: sun-sjsxp
|
||||
BuildRequires: tomcat-el-2.2-api
|
||||
BuildRequires: tomcat-servlet-3.0-api
|
||||
BuildRequires: tomcat6-servlet-2.5-api
|
||||
#BuildRequires: tomcat6
|
||||
#BuildRequires: tomcat6-lib
|
||||
BuildRequires: cdi-api
|
||||
BuildRequires: xerces-j2
|
||||
|
||||
|
|
@ -141,6 +140,8 @@ Requires: jakarta-commons-httpclient
|
|||
Requires: java
|
||||
Requires: javamail
|
||||
Requires: javassist
|
||||
Requires: jboss-servlet-2.5-api
|
||||
Requires: jboss-servlet-3.0-api
|
||||
Requires: jcip-annotations
|
||||
Requires: jettison
|
||||
Requires: jpackage-utils
|
||||
|
|
@ -151,11 +152,7 @@ Requires: slf4j
|
|||
Requires: snakeyaml
|
||||
|
||||
# T:
|
||||
#Requires: tomcat6
|
||||
#Requires: tomcat6-lib
|
||||
Requires: tomcat-el-2.2-api
|
||||
Requires: tomcat6-servlet-2.5-api
|
||||
Requires: tomcat-servlet-3.0-api
|
||||
Requires: ws-jaxme
|
||||
Requires: xerces-j2
|
||||
|
||||
|
|
@ -180,6 +177,7 @@ This package contains the API documentation for %{name}.
|
|||
%patch2 -p1 -b .p2
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
|
||||
%build
|
||||
mvn-rpmbuild -Dmaven.test.skip=true -e install javadoc:aggregate
|
||||
|
|
@ -268,6 +266,9 @@ cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
|
|||
%doc License.html
|
||||
|
||||
%changelog
|
||||
* Tue Apr 2 2013 Endi S. Dewata <edewata@redhat.com> - 2.3.2-12
|
||||
- Removed Tomcat 6 dependency
|
||||
|
||||
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.2-11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue