upgrade to JAX-RS-2.1
This is required for CXF-3.2 to work.
Currently depending on a staging repo for tests.
Should get removed once the release is acked.
diff --git a/pom.xml b/pom.xml
index 2c3d236..89f99f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,6 +17,7 @@
limitations under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache</groupId>
@@ -26,11 +27,11 @@
</parent>
<groupId>org.apache.tomee</groupId>
- <modelVersion>4.0.0</modelVersion>
<artifactId>javaee-api</artifactId>
- <packaging>jar</packaging>
- <name>TomEE :: JavaEE 8 Full API - Work in Progress!</name>
<version>8.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+
+ <name>TomEE :: JavaEE 8 Full API - Work in Progress!</name>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/tomee/javaee-api/trunk</connection>
@@ -45,7 +46,7 @@
<geronimo-jta_1.2_spec.version>1.0-alpha-1</geronimo-jta_1.2_spec.version>
<geronimo-jacc_1.4_spec.version>1.0</geronimo-jacc_1.4_spec.version>
<geronimo-jaxr_1.0_spec.version>2.1</geronimo-jaxr_1.0_spec.version>
- <geronimo-jaxrs_2.0_spec.version>1.0-alpha-1</geronimo-jaxrs_2.0_spec.version>
+ <geronimo-jaxrs_2.1_spec.version>1.0</geronimo-jaxrs_2.1_spec.version>
<geronimo-jaxrpc_1.1_spec.version>2.1</geronimo-jaxrpc_1.1_spec.version>
<geronimo-j2ee-deployment_1.1_spec.version>1.1</geronimo-j2ee-deployment_1.1_spec.version>
<geronimo-j2ee-connector_1.6_spec.version>1.0</geronimo-j2ee-connector_1.6_spec.version>
@@ -68,9 +69,20 @@
<geronimo-concurrent_1.0_spec.version>1.0-alpha-1</geronimo-concurrent_1.0_spec.version>
<geronimo-jbatch_1.0_spec.version>1.0</geronimo-jbatch_1.0_spec.version>
<geronimo-jcache_1.0_spec.version>1.0-alpha-1</geronimo-jcache_1.0_spec.version>
- <tomcat.version>9.0.0.M26</tomcat.version>
+ <tomcat.version>9.0.2</tomcat.version>
</properties>
+
+ <repositories>
+ <!-- TODO this MUST be commented out before any release! -->
+ <repository>
+ <id>staging</id>
+ <url>https://repository.apache.org/content/repositories/orgapachegeronimo-1046</url>
+ <releases><enabled>true</enabled></releases>
+ <snapshots><enabled>false</enabled></snapshots>
+ </repository>
+ </repositories>
+
<build>
<resources>
<resource>
@@ -484,15 +496,15 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxrs_2.0_spec</artifactId>
- <version>${geronimo-jaxrs_2.0_spec.version}</version>
+ <artifactId>geronimo-jaxrs_2.1_spec</artifactId>
+ <version>${geronimo-jaxrs_2.1_spec.version}</version>
<classifier>sources</classifier>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxrs_2.0_spec</artifactId>
- <version>${geronimo-jaxrs_2.0_spec.version}</version>
+ <artifactId>geronimo-jaxrs_2.1_spec</artifactId>
+ <version>${geronimo-jaxrs_2.1_spec.version}</version>
<optional>true</optional>
</dependency>
<dependency>
