76 lines
2.9 KiB
Diff
76 lines
2.9 KiB
Diff
|
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
|
||
|
|
|