Stanislav Ochotnicky ca4ad73
From efe1875615248d81e08142e9fef92ba0a5fab7f6 Mon Sep 17 00:00:00 2001
Stanislav Ochotnicky 2c3ce1f
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
Stanislav Ochotnicky 2c3ce1f
Date: Tue, 24 Jan 2012 11:13:25 +0100
Stanislav Ochotnicky ca4ad73
Subject: [PATCH 4/6] Modify dependencies
Stanislav Ochotnicky 2c3ce1f
Stanislav Ochotnicky 2c3ce1f
- remove sun httpserver
Stanislav Ochotnicky 2c3ce1f
- add tomcat-jasper
Stanislav Ochotnicky 2c3ce1f
---
Stanislav Ochotnicky 2c3ce1f
 jetty-http-spi/pom.xml                 |    6 ------
Stanislav Ochotnicky ca4ad73
 jetty-osgi/jetty-osgi-boot-jsp/pom.xml |    9 +++++++++
Stanislav Ochotnicky ca4ad73
 2 files changed, 9 insertions(+), 6 deletions(-)
Stanislav Ochotnicky 2c3ce1f
Stanislav Ochotnicky 2c3ce1f
diff --git a/jetty-http-spi/pom.xml b/jetty-http-spi/pom.xml
Stanislav Ochotnicky ca4ad73
index 7d97c01..29b19e9 100644
Stanislav Ochotnicky 2c3ce1f
--- a/jetty-http-spi/pom.xml
Stanislav Ochotnicky 2c3ce1f
+++ b/jetty-http-spi/pom.xml
Stanislav Ochotnicky 2c3ce1f
@@ -17,12 +17,6 @@
Stanislav Ochotnicky 2c3ce1f
       <scope>test</scope>
Stanislav Ochotnicky 2c3ce1f
     </dependency>
Stanislav Ochotnicky 2c3ce1f
     <dependency>
Stanislav Ochotnicky 2c3ce1f
-      <groupId>com.sun.net.httpserver</groupId>
Stanislav Ochotnicky 2c3ce1f
-      <artifactId>http</artifactId>
Stanislav Ochotnicky 2c3ce1f
-      <version>20070405</version>
Stanislav Ochotnicky 2c3ce1f
-      <scope>provided</scope>
Stanislav Ochotnicky 2c3ce1f
-    </dependency>
Stanislav Ochotnicky 2c3ce1f
-    <dependency>
Stanislav Ochotnicky 2c3ce1f
       <groupId>org.eclipse.jetty</groupId>
Stanislav Ochotnicky 2c3ce1f
       <artifactId>jetty-server</artifactId>
Stanislav Ochotnicky 2c3ce1f
       <version>${project.version}</version>
Stanislav Ochotnicky 2c3ce1f
diff --git a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
Stanislav Ochotnicky ca4ad73
index 8f56510..3a35489 100644
Stanislav Ochotnicky 2c3ce1f
--- a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
Stanislav Ochotnicky 2c3ce1f
+++ b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
Stanislav Ochotnicky ca4ad73
@@ -41,6 +41,15 @@
Stanislav Ochotnicky ca4ad73
       <groupId>org.eclipse.jetty</groupId>
Stanislav Ochotnicky ca4ad73
       <artifactId>jetty-jsp</artifactId>
Stanislav Ochotnicky ca4ad73
       <version>${project.version}</version>
Stanislav Ochotnicky ca4ad73
+    </dependency>  
Stanislav Ochotnicky ca4ad73
+    <dependency>
Stanislav Ochotnicky 2c3ce1f
+     <groupId>org.apache.tomcat</groupId>
Stanislav Ochotnicky 2c3ce1f
+     <artifactId>tomcat-jasper</artifactId>
Stanislav Ochotnicky 2c3ce1f
+     <version>7.0.23</version>
Stanislav Ochotnicky 2c3ce1f
+    </dependency>
Stanislav Ochotnicky 2c3ce1f
+    <dependency>
Stanislav Ochotnicky ca4ad73
+     <groupId>${servlet.spec.groupId}</groupId>
Stanislav Ochotnicky ca4ad73
+     <artifactId>${servlet.spec.artifactId}</artifactId>
Stanislav Ochotnicky 2c3ce1f
     </dependency>
Stanislav Ochotnicky ca4ad73
   </dependencies>
Stanislav Ochotnicky ca4ad73
 
Stanislav Ochotnicky 2c3ce1f
-- 
Stanislav Ochotnicky ca4ad73
1.7.9
Stanislav Ochotnicky 2c3ce1f