Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHugues Malphettes2011-05-20 08:33:57 +0000
committerHugues Malphettes2011-05-20 08:33:57 +0000
commit850170ba5fc9f567c57868f288fac585584c5462 (patch)
treede73268fe3e2b0e13f3c6f47d7abec4fc17ebfa3 /jetty-osgi/pom.xml
parent538038a7f2434a673b35add13dd9408e0703dad0 (diff)
downloadorg.eclipse.jetty.project-850170ba5fc9f567c57868f288fac585584c5462.tar.gz
org.eclipse.jetty.project-850170ba5fc9f567c57868f288fac585584c5462.tar.xz
org.eclipse.jetty.project-850170ba5fc9f567c57868f288fac585584c5462.zip
bug 346605 commit the demo of jetty's continuation and webscoket to 'chat with the equinox console
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3221 7e9141cc-0065-0410-87d8-b60c137991c4
Diffstat (limited to 'jetty-osgi/pom.xml')
-rw-r--r--jetty-osgi/pom.xml25
1 files changed, 18 insertions, 7 deletions
diff --git a/jetty-osgi/pom.xml b/jetty-osgi/pom.xml
index dfab66bc9a..526872b107 100644
--- a/jetty-osgi/pom.xml
+++ b/jetty-osgi/pom.xml
@@ -11,8 +11,8 @@
<name>Jetty :: OSGi</name>
<packaging>pom</packaging>
<properties>
- <osgi-version>3.5.0.v20090520</osgi-version>
- <osgi-services-version>3.1.200-v20070605</osgi-services-version>
+ <osgi-version>3.6.0.v20100517</osgi-version>
+ <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>
@@ -25,6 +25,7 @@
<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>
@@ -74,6 +75,16 @@
<dependencies>
<dependency>
<groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-continuation</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-websocket</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
<version>${project.version}</version>
</dependency>
@@ -108,14 +119,14 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>osgi</artifactId>
- <version>${osgi-version}</version>
+ <groupId>org.eclipse.osgi</groupId>
+ <artifactId>org.eclipse.osgi.services</artifactId>
+ <version>${osgi-services-version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.osgi</groupId>
- <artifactId>services</artifactId>
- <version>${osgi-services-version}</version>
+ <artifactId>org.eclipse.osgi</artifactId>
+ <version>${osgi-version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.equinox.http</groupId>

Back to the top