You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by re...@apache.org on 2013/06/06 14:53:31 UTC
svn commit: r1490264 - in /stanbol/branches/commons-ng/parent: ./ pom.xml
Author: reto
Date: Thu Jun 6 12:53:31 2013
New Revision: 1490264
URL: http://svn.apache.org/r1490264
Log:
STANBOL-1095: copying parent to commons-ng
Added:
stanbol/branches/commons-ng/parent/
- copied from r1487447, stanbol/trunk/parent/
Modified:
stanbol/branches/commons-ng/parent/pom.xml
Modified: stanbol/branches/commons-ng/parent/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/parent/pom.xml?rev=1490264&r1=1487447&r2=1490264&view=diff
==============================================================================
--- stanbol/branches/commons-ng/parent/pom.xml (original)
+++ stanbol/branches/commons-ng/parent/pom.xml Thu Jun 6 12:53:31 2013
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>13</version>
+ <version>14</version>
<relativePath />
</parent>
@@ -822,6 +822,12 @@
<!-- Jersey -->
<dependency>
+ <groupId>org.glassfish.jersey.containers</groupId>
+ <!-- if your container implements Servlet API older than 3.0, use "jersey-container-servlet-core" -->
+ <artifactId>jersey-container-servlet</artifactId>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
<version>${jersey-version}</version>
@@ -868,9 +874,10 @@
incompatibilities
-->
<dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>jsr311-api</artifactId>
- <version>1.1.1</version>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>javax.ws.rs-api</artifactId>
+ <version>2.0</version>
+ <scope>provided</scope>
</dependency>
<!-- Freemarker -->
@@ -1397,10 +1404,10 @@
</dependency>
<dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-client</artifactId>
- <version>${jersey-version}</version>
- <scope>test</scope>
+ <groupId>org.glassfish.jersey.core</groupId>
+ <artifactId>jersey-client</artifactId>
+ <version>2.0</version>
+ <scope>test</scope>
</dependency>
<!-- Test configuration to run a lightweight felix based OSGi container in