You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2014/07/22 20:03:40 UTC
svn commit: r1612633 - in /tomee/javaee-api/trunk: pom.xml
src/main/java/javax/ws/rs/core/
Author: rmannibucau
Date: Tue Jul 22 18:03:39 2014
New Revision: 1612633
URL: http://svn.apache.org/r1612633
Log:
importing geronimo jaxrs 2 and versioning it 7
Removed:
tomee/javaee-api/trunk/src/main/java/javax/ws/rs/core/
Modified:
tomee/javaee-api/trunk/pom.xml
Modified: tomee/javaee-api/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tomee/javaee-api/trunk/pom.xml?rev=1612633&r1=1612632&r2=1612633&view=diff
==============================================================================
--- tomee/javaee-api/trunk/pom.xml (original)
+++ tomee/javaee-api/trunk/pom.xml Tue Jul 22 18:03:39 2014
@@ -29,7 +29,7 @@
<artifactId>javaee-api</artifactId>
<packaging>jar</packaging>
<name>OpenEJB :: JavaEE Full API (zip and jar files)</name>
- <version>6.0-7-SNAPSHOT</version>
+ <version>7.0-SNAPSHOT</version>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/tomee/javaee-api/trunk</connection>
@@ -53,8 +53,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>1.7</source>
+ <target>1.7</target>
</configuration>
</plugin>
@@ -123,7 +123,7 @@
<shadedArtifactAttached>true</shadedArtifactAttached>
<shadedClassifierName>tomcat</shadedClassifierName>
<artifactSet>
- <excludes> <!-- when upgrading to API 7 remove javax.annotation from tomcat jar -->
+ <excludes>
<exclude>*:*:sources</exclude>
<exclude>*:geronimo-jsp*</exclude>
<exclude>*:geronimo-servlet*</exclude>
@@ -137,7 +137,6 @@
<exclude>META-INF/*.txt</exclude>
<exclude>META-INF/LICENSE</exclude>
<exclude>javax/xml/bind/**/*.class</exclude>
- <exclude>javax/ws/rs/core/UriBuilder.class</exclude>
<exclude>org/apache/geronimo/osgi/locator/ProviderLocator.class</exclude>
<exclude>org/apache/geronimo/osgi/locator/Activator.class</exclude>
</excludes>
@@ -199,7 +198,6 @@
<exclude>META-INF/*.txt</exclude>
<exclude>META-INF/LICENSE</exclude>
<exclude>META-INF/NOTICE</exclude>
- <exclude>javax/ws/rs/core/UriBuilder.class</exclude>
<exclude>javax/xml/bind/ContextFinder.class</exclude>
<exclude>javax/xml/bind/DatatypeConverter.class</exclude>
<exclude>org/apache/geronimo/osgi/locator/ProviderLocator.class</exclude>
@@ -466,15 +464,15 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxrs_1.1_spec</artifactId>
- <version>${geronimo-jaxrs_1.1_spec.version}</version>
+ <artifactId>geronimo-jaxrs_2.0_spec</artifactId>
+ <version>${geronimo-jaxrs_2.0_spec.version}</version>
<classifier>sources</classifier>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxrs_1.1_spec</artifactId>
- <version>${geronimo-jaxrs_1.1_spec.version}</version>
+ <artifactId>geronimo-jaxrs_2.0_spec</artifactId>
+ <version>${geronimo-jaxrs_2.0_spec.version}</version>
<optional>true</optional>
</dependency>
<dependency>
@@ -644,7 +642,7 @@
<geronimo-jta_1.1_spec.version>1.1.1</geronimo-jta_1.1_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_1.1_spec.version>1.0</geronimo-jaxrs_1.1_spec.version>
+ <geronimo-jaxrs_2.0_spec.version>1.0-SNAPSHOT</geronimo-jaxrs_2.0_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>