Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Wilkins2011-07-07 04:18:24 -0400
committerGreg Wilkins2011-07-07 04:18:24 -0400
commit17e907c2fbd6a4537ac1b609165115bc40efaa67 (patch)
tree6c1c84cc2a3c92c4318b9741e0b59157712ec61d /jetty-osgi/pom.xml
parent54e885d9670548c12cf9ffbd58702b73d373c186 (diff)
downloadorg.eclipse.jetty.project-17e907c2fbd6a4537ac1b609165115bc40efaa67.tar.gz
org.eclipse.jetty.project-17e907c2fbd6a4537ac1b609165115bc40efaa67.tar.xz
org.eclipse.jetty.project-17e907c2fbd6a4537ac1b609165115bc40efaa67.zip
git diff 54e885d9670548c12cf9ffbd58702b73d373c186 remotes/origin/jetty-8-historical | patch -p1 ; git add -A
Diffstat (limited to 'jetty-osgi/pom.xml')
-rw-r--r--jetty-osgi/pom.xml29
1 files changed, 19 insertions, 10 deletions
diff --git a/jetty-osgi/pom.xml b/jetty-osgi/pom.xml
index a7ebe3b862..6f38abe84e 100644
--- a/jetty-osgi/pom.xml
+++ b/jetty-osgi/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.4.3-SNAPSHOT</version>
+ <version>8.0.0.RC0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.eclipse.jetty.osgi</groupId>
@@ -15,17 +15,16 @@
<osgi-services-version>3.2.100.v20100503</osgi-services-version>
<equinox-http-servlet-version>1.0.0-v20070606</equinox-http-servlet-version>
<!--equinox-servletbridge-version>1.0.0-v20070523</equinox-servletbridge-version-->
- <jsp-2.1-glassfish-version>2.1.v20100127</jsp-2.1-glassfish-version>
+ <jsp-api-2.2-tomcat-version>7.0.8</jsp-api-2.2-tomcat-version>
+ <el-api-2.2-tomcat-version>7.0.8</el-api-2.2-tomcat-version>
<logback-version>0.9.18</logback-version>
<slf4j-version>1.5.11</slf4j-version>
</properties>
<modules>
<module>jetty-osgi-boot</module>
<module>jetty-osgi-boot-jsp</module>
- <module>jetty-osgi-boot-logback</module>
<module>jetty-osgi-boot-warurl</module>
<module>jetty-osgi-httpservice</module>
- <module>jetty-osgi-equinoxtools</module>
<module>test-jetty-osgi</module>
</modules>
<build>
@@ -75,6 +74,11 @@
<dependencies>
<dependency>
<groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-annotations</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-continuation</artifactId>
<version>${project.version}</version>
</dependency>
@@ -138,15 +142,20 @@
<artifactId>servletbridge</artifactId>
<version>${equinox-servletbridge-version}</version>
</dependency-->
- <dependency>
+ <!-- not ready <dependency>
<groupId>org.mortbay.jetty</groupId>
- <artifactId>jsp-2.1-glassfish</artifactId>
- <version>${jsp-2.1-glassfish-version}</version>
+ <artifactId>jsp-impl</artifactId>
+ <version>${jsp-impl-2.2-glassfish-version}</version>
+ </dependency-->
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jsp-api</artifactId>
+ <version>${jsp-api-2.2-tomcat-version}</version>
</dependency>
<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jsp-api-2.1-glassfish</artifactId>
- <version>${jsp-2.1-glassfish-version}</version>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-el-api</artifactId>
+ <version>${el-api-2.2-tomcat-version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>

Back to the top