diff options
author | Hugues Malphettes | 2012-09-24 05:04:57 +0000 |
---|---|---|
committer | Hugues Malphettes | 2012-09-24 05:04:57 +0000 |
commit | 1cfa277c6c55252022227c9f1ee2bae8c49c9595 (patch) | |
tree | ea1ee6f148afc5e6274073413ba425ab4d764be2 /jetty-osgi/test-jetty-osgi/pom.xml | |
parent | 96dc4fe15080b3a456acf9c00d85b0ec8b6e8b0c (diff) | |
download | org.eclipse.jetty.project-1cfa277c6c55252022227c9f1ee2bae8c49c9595.tar.gz org.eclipse.jetty.project-1cfa277c6c55252022227c9f1ee2bae8c49c9595.tar.xz org.eclipse.jetty.project-1cfa277c6c55252022227c9f1ee2bae8c49c9595.zip |
jetty-9 osgi support
Diffstat (limited to 'jetty-osgi/test-jetty-osgi/pom.xml')
-rw-r--r-- | jetty-osgi/test-jetty-osgi/pom.xml | 55 |
1 files changed, 47 insertions, 8 deletions
diff --git a/jetty-osgi/test-jetty-osgi/pom.xml b/jetty-osgi/test-jetty-osgi/pom.xml index b36ae6c4ef..905b7e8a5b 100644 --- a/jetty-osgi/test-jetty-osgi/pom.xml +++ b/jetty-osgi/test-jetty-osgi/pom.xml @@ -13,7 +13,8 @@ <bundle-symbolic-name>${project.groupId}.boot.test</bundle-symbolic-name> <jetty-orbit-url>http://download.eclipse.org/jetty/orbit/</jetty-orbit-url> <assembly-directory>target/distribution</assembly-directory> - <paxexam-version>1.2.0</paxexam-version> + <paxexam-version-old>1.2.0</paxexam-version-old> + <paxexam-version>1.2.4</paxexam-version> </properties> <dependencies> <!-- Orbit Servlet Deps --> @@ -78,6 +79,12 @@ </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-security</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-xml</artifactId> <version>${project.version}</version> <scope>runtime</scope> @@ -99,8 +106,21 @@ <scope>runtime</scope> </dependency> <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-websocket</artifactId> + <groupId>org.eclipse.jetty.websocket</groupId> + <artifactId>websocket-client</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.eclipse.jetty.websocket</groupId> + <artifactId>websocket-core</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.eclipse.jetty.websocket</groupId> + <artifactId>websocket-server</artifactId> + <version>${project.version}</version> <scope>runtime</scope> </dependency> <dependency> @@ -120,13 +140,20 @@ <groupId>org.eclipse.osgi</groupId> <artifactId>org.eclipse.osgi.services</artifactId> <scope>runtime</scope> + <exclusions> + <exclusion> + <!-- we use the servlet jar from orbit --> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.eclipse.equinox.http</groupId> <artifactId>servlet</artifactId> <scope>runtime</scope> </dependency> - + <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>test-jetty-webapp</artifactId> @@ -134,7 +161,7 @@ <classifier>webbundle</classifier> <scope>test</scope> </dependency> - + <dependency> <groupId>org.ops4j.pax.exam</groupId> <artifactId>pax-exam</artifactId> @@ -146,13 +173,13 @@ <artifactId>pax-exam-junit</artifactId> <version>${paxexam-version}</version> <scope>test</scope> - <exclusion> + <exclusions> <exclusion> <!-- we use junit-dep --> <groupId>junit</groupId> <artifactId>junit</artifactId> </exclusion> - </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.ops4j.pax.exam</groupId> @@ -165,6 +192,18 @@ <artifactId>jetty-test-helper</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <version>${slf4j-version}</version> + <scope>provided</scope> + </dependency> + </dependencies> <build> @@ -207,7 +246,7 @@ <version>${orbit-servlet-api-version}</version> <overWrite>true</overWrite> <outputDirectory>${assembly-directory}/lib</outputDirectory> - <destFileName>servlet-api-2.5.jar</destFileName> + <destFileName>servlet-api-3.0.jar</destFileName> </artifactItem> </artifactItems> </configuration> |