Commit 3f302192 authored by Philippe Merle's avatar Philippe Merle

Moved to Java Servlet 3.0 API in order to address #118.

parent c7ac1289
......@@ -78,8 +78,8 @@
</exclusion>
<!-- Exclude Servlet API as provided by Jetty. -->
<exclusion>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<groupId>${servlet.groupId}</groupId>
<artifactId>${servlet.artifactId}</artifactId>
</exclusion>
</exclusions>
</dependency>
......
......@@ -78,8 +78,8 @@
</exclusion>
<!-- Exclude Servlet API as provided by Jetty. -->
<exclusion>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<groupId>${servlet.groupId}</groupId>
<artifactId>${servlet.artifactId}</artifactId>
</exclusion>
</exclusions>
</dependency>
......
......@@ -78,8 +78,8 @@
<artifactId>cxf-rt-transports-http-jetty</artifactId>
</exclusion>
<exclusion>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<groupId>${servlet.groupId}</groupId>
<artifactId>${servlet.artifactId}</artifactId>
</exclusion>
</exclusions>
</dependency>
......
......@@ -78,8 +78,8 @@
</exclusion>
<!-- Exclude Servlet API as provided by Jetty. -->
<exclusion>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<groupId>${servlet.groupId}</groupId>
<artifactId>${servlet.artifactId}</artifactId>
</exclusion>
</exclusions>
</dependency>
......
......@@ -103,6 +103,7 @@ OW2 FraSCAti 1.6
- OW2 Fractal Binding Factory 0.11-SNAPSHOT
- Nuxeo 5.6
- Spring Framework 3.0.7.RELEASE
- Java Servlet API 3.0.1
......
......@@ -48,9 +48,9 @@
<!-- Java Servlet API. -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5</version>
<groupId>${servlet.groupId}</groupId>
<artifactId>${servlet.artifactId}</artifactId>
<version>${servlet.version}</version>
<!-- Java Servlet API is provided by the Web application server used at deployment time. -->
<scope>provided</scope>
</dependency>
......
......@@ -2,7 +2,7 @@
<!--
* OW2 FraSCAti: SCA Implementation Resource
*
* Copyright (c) 2010-2012 Inria, University of Lille 1
* Copyright (c) 2010-2013 Inria, University of Lille 1
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
......@@ -95,10 +95,13 @@
<version>${project.version}</version>
</dependency>
<!-- Java Servlet API. -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5</version>
<groupId>${servlet.groupId}</groupId>
<artifactId>${servlet.artifactId}</artifactId>
<version>${servlet.version}</version>
<!-- Java Servlet API is provided by the Web application server used at deployment time. -->
<scope>provided</scope>
</dependency>
<!-- For test. -->
......
......@@ -95,11 +95,11 @@
<version>${project.version}</version>
</dependency>
<!-- Servlet API. -->
<!-- Java Servlet API. -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5</version>
<groupId>${servlet.groupId}</groupId>
<artifactId>${servlet.artifactId}</artifactId>
<version>${servlet.version}</version>
</dependency>
<!-- Apache Velocity. -->
......@@ -109,6 +109,13 @@
<version>${velocity.version}</version>
</dependency>
<!-- JAX-RS 2.0 API -->
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
<version>${jax-rs-api.version}</version>
</dependency>
<!-- ============ -->
<!-- For testing -->
<!-- ============ -->
......@@ -129,12 +136,6 @@
<scope>test</scope>
</dependency>
<!-- JAX-RS 2.0 API -->
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
<version>${jax-rs-api.version}</version>
</dependency>
</dependencies>
</project>
......@@ -2,7 +2,7 @@
<!--
* OW2 FraSCAti: Servlet with Apache CXF
*
* Copyright (c) 2010-2012 Inria, University of Lille 1
* Copyright (c) 2010-2013 Inria, University of Lille 1
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
......@@ -104,9 +104,9 @@
<!-- Java Servlet API. -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5</version>
<groupId>${servlet.groupId}</groupId>
<artifactId>${servlet.artifactId}</artifactId>
<version>${servlet.version}</version>
<!-- Java Servlet API is provided by the Web application server used at deployment time. -->
<scope>provided</scope>
</dependency>
......
......@@ -263,6 +263,11 @@
<jaxb2.version>0.6.0</jaxb2.version>
<slf4j.version>1.6.2</slf4j.version>
<jax-rs-api.version>2.0-m10</jax-rs-api.version>
<!-- Java Servlet API. -->
<servlet.groupId>javax.servlet</servlet.groupId>
<servlet.artifactId>javax.servlet-api</servlet.artifactId>
<servlet.version>3.0.1</servlet.version>
<build-helper-maven-plugin.version>1.8</build-helper-maven-plugin.version>
<maven-compiler-plugin.version>2.3.2</maven-compiler-plugin.version>
<maven-dependency-plugin.version>2.6</maven-dependency-plugin.version>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment