[shiro] branch master updated: [SHIRO-750] update jax-rs dependency to jakarta.

[fpapon]

This is an automated email from the ASF dual-hosted git repository.

fpapon pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shiro.git


The following commit(s) were added to refs/heads/master by this push:
     new 3887e5d  [SHIRO-750] update jax-rs dependency to jakarta.
     new 6a4f7e2  Merge pull request #226 from bmhm/SHIRO-750
3887e5d is described below

commit 3887e5d2e6dc9c2cba7aefab20af1c6407454d16
Author: Benjamin Marwell <bmarw...@gmail.com>
AuthorDate: Fri Mar 27 19:54:50 2020 +0100

    [SHIRO-750] update jax-rs dependency to jakarta.
    
      - Non-Breaking change.
      - Also set the scope to provided. Containers will provide this API.
      - Also add the dependency to the samples, so they do not use a
      transitive dependency.
---
 pom.xml               | 2 +-
 samples/jaxrs/pom.xml | 7 +++++++
 support/jaxrs/pom.xml | 5 +++--
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 586d77c..0ecade0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -104,7 +104,7 @@
         <spring.version>5.2.5.RELEASE</spring.version>
         <spring-boot.version>2.2.6.RELEASE</spring-boot.version>
         <guice.version>4.2.2</guice.version>
-        <jaxrs.api.version>2.0.1</jaxrs.api.version>
+        <jaxrs.api.version>2.1.6</jaxrs.api.version>
         <htmlunit.version>2.39.0</htmlunit.version>
 
         <!-- Test 3rd-party dependencies: -->
diff --git a/samples/jaxrs/pom.xml b/samples/jaxrs/pom.xml
index cf5dfb2..6878195 100644
--- a/samples/jaxrs/pom.xml
+++ b/samples/jaxrs/pom.xml
@@ -77,6 +77,13 @@
         </dependency>
 
         <dependency>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
+            <version>${jaxrs.api.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
             <!-- Required for any libraries that expect to call the commons 
logging APIs -->
             <groupId>org.slf4j</groupId>
             <artifactId>jcl-over-slf4j</artifactId>
diff --git a/support/jaxrs/pom.xml b/support/jaxrs/pom.xml
index 3302e51..c7ee487 100644
--- a/support/jaxrs/pom.xml
+++ b/support/jaxrs/pom.xml
@@ -45,9 +45,10 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.ws.rs</groupId>
-            <artifactId>javax.ws.rs-api</artifactId>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
             <version>${jaxrs.api.version}</version>
+            <scope>provided</scope>
         </dependency>
 
         <!-- Test Deps -->