use jaxrs 2.0
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/a115afdb Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/a115afdb Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/a115afdb Branch: refs/heads/master Commit: a115afdbe72432104a5d46ba96bcd2c552aef665 Parents: 1edc02a Author: Olivier Lamy <[email protected]> Authored: Sat Feb 7 23:02:56 2015 +1100 Committer: Olivier Lamy <[email protected]> Committed: Sat Feb 7 23:02:56 2015 +1100 ---------------------------------------------------------------------- .../archiva-web/archiva-rest/archiva-rest-api/pom.xml | 2 +- .../archiva-web/archiva-rest/archiva-rest-services/pom.xml | 2 +- archiva-modules/archiva-web/archiva-web-common/pom.xml | 2 +- pom.xml | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/archiva/blob/a115afdb/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml index 3978172..99bfc32 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml @@ -82,7 +82,7 @@ </dependency> <dependency> <groupId>javax.ws.rs</groupId> - <artifactId>jsr311-api</artifactId> + <artifactId>javax.ws.rs-api</artifactId> </dependency> <!-- normally not needed but here for wadl feature currently in cxf --> <dependency> http://git-wip-us.apache.org/repos/asf/archiva/blob/a115afdb/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml index f8d6d1d..cba77cd 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml @@ -176,7 +176,7 @@ <dependency> <groupId>javax.ws.rs</groupId> - <artifactId>jsr311-api</artifactId> + <artifactId>javax.ws.rs-api</artifactId> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/archiva/blob/a115afdb/archiva-modules/archiva-web/archiva-web-common/pom.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-web/archiva-web-common/pom.xml b/archiva-modules/archiva-web/archiva-web-common/pom.xml index d2d3a77..c5f0628 100644 --- a/archiva-modules/archiva-web/archiva-web-common/pom.xml +++ b/archiva-modules/archiva-web/archiva-web-common/pom.xml @@ -192,7 +192,7 @@ </dependency> <dependency> <groupId>javax.ws.rs</groupId> - <artifactId>jsr311-api</artifactId> + <artifactId>javax.ws.rs-api</artifactId> </dependency> <dependency> <groupId>org.apache.archiva.redback.components</groupId> http://git-wip-us.apache.org/repos/asf/archiva/blob/a115afdb/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 52a69c6..5a6dd6e 100644 --- a/pom.xml +++ b/pom.xml @@ -529,8 +529,8 @@ <dependency> <groupId>javax.ws.rs</groupId> - <artifactId>jsr311-api</artifactId> - <version>1.1.1</version> + <artifactId>javax.ws.rs-api</artifactId> + <version>2.0</version> </dependency> <!-- normally not needed as we are 1.6 required
