Repository: johnzon Updated Branches: refs/heads/master 8b5c87d5c -> 18e584bb8
JOHNZON-174 fixing wrong OSGi imports The wrong imports have most probably been caused by JAX-RS-2.0 spec api imports Updated those to 2.1 Project: http://git-wip-us.apache.org/repos/asf/johnzon/repo Commit: http://git-wip-us.apache.org/repos/asf/johnzon/commit/18e584bb Tree: http://git-wip-us.apache.org/repos/asf/johnzon/tree/18e584bb Diff: http://git-wip-us.apache.org/repos/asf/johnzon/diff/18e584bb Branch: refs/heads/master Commit: 18e584bb8e8aae07d6303b4ff8e4fadade983441 Parents: 8b5c87d Author: Mark Struberg <[email protected]> Authored: Thu Aug 30 16:39:18 2018 +0200 Committer: Mark Struberg <[email protected]> Committed: Thu Aug 30 16:39:18 2018 +0200 ---------------------------------------------------------------------- johnzon-jaxrs/pom.xml | 7 ++++--- johnzon-jsonb/pom.xml | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/johnzon/blob/18e584bb/johnzon-jaxrs/pom.xml ---------------------------------------------------------------------- diff --git a/johnzon-jaxrs/pom.xml b/johnzon-jaxrs/pom.xml index 8bd33ae..49205f2 100644 --- a/johnzon-jaxrs/pom.xml +++ b/johnzon-jaxrs/pom.xml @@ -30,10 +30,11 @@ <dependencies> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> - <version>2.0</version> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jaxrs_2.1_spec</artifactId> + <version>1.0</version> <scope>provided</scope> + <optional>true</optional> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/johnzon/blob/18e584bb/johnzon-jsonb/pom.xml ---------------------------------------------------------------------- diff --git a/johnzon-jsonb/pom.xml b/johnzon-jsonb/pom.xml index e265ef7..b08f979 100644 --- a/johnzon-jsonb/pom.xml +++ b/johnzon-jsonb/pom.xml @@ -43,8 +43,8 @@ </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jaxrs_2.0_spec</artifactId> - <version>1.0-alpha-1</version> + <artifactId>geronimo-jaxrs_2.1_spec</artifactId> + <version>1.0</version> <scope>provided</scope> <optional>true</optional> </dependency>
