[isis] branch spring6 updated: ISIS-3275: fixing resteasy convergence issues

[ahuber]

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

ahuber pushed a commit to branch spring6
in repository https://gitbox.apache.org/repos/asf/isis.git


The following commit(s) were added to refs/heads/spring6 by this push:
     new 00a170873e ISIS-3275: fixing resteasy convergence issues
00a170873e is described below

commit 00a170873e2568408bc846bde5af313ddc4e501a
Author: Andi Huber <ahu...@apache.org>
AuthorDate: Wed Dec 14 09:27:17 2022 +0100

    ISIS-3275: fixing resteasy convergence issues
---
 bom/pom.xml                                   |  2 +-
 viewers/restfulobjects/jaxrs-resteasy/pom.xml | 17 ++++++++++++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index 6a358fcd2b..5e97c95341 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -171,7 +171,7 @@ It is therefore a copy of org.apache:apache, with 
customisations clearly identif
 
         
<resteasy-spring-boot.version>6.0.0.Alpha2</resteasy-spring-boot.version>
         <resteasy-spring.version>3.0.0.Final</resteasy-spring.version>
-        <resteasy.version>6.2.1.Final</resteasy.version> <!-- keep in sync 
with property defined in resteasy4-spring-boot-starter -->
+        <resteasy.version>6.2.2.Final</resteasy.version> <!-- keep in sync 
with property defined in resteasy4-spring-boot-starter -->
         
<resteasy-jaxb-provider.version>6.2.2.Final</resteasy-jaxb-provider.version>
         
 
diff --git a/viewers/restfulobjects/jaxrs-resteasy/pom.xml 
b/viewers/restfulobjects/jaxrs-resteasy/pom.xml
index b7229846c4..103f444dbd 100644
--- a/viewers/restfulobjects/jaxrs-resteasy/pom.xml
+++ b/viewers/restfulobjects/jaxrs-resteasy/pom.xml
@@ -129,18 +129,29 @@
                <dependency>
                    <groupId>org.jboss.resteasy.spring</groupId>
                        <artifactId>resteasy-spring</artifactId>
+                       <exclusions>
+                               <exclusion>
+                                       <groupId>org.jboss.resteasy</groupId>
+                                       <artifactId>resteasy-client</artifactId>
+                               </exclusion>
+                       </exclusions>
+               </dependency>
+               <dependency>
+                       <groupId>org.jboss.resteasy</groupId>
+                       <artifactId>resteasy-client</artifactId>
+                       <version>${resteasy.version}</version> 
+                       <!--                    6.2.2.Final-->
                </dependency>
                <dependency>
                    <groupId>org.jboss.resteasy</groupId>
                    <artifactId>resteasy-servlet-initializer</artifactId>
-                   <version>6.2.2.Final</version>
+                   <version>${resteasy.version}</version>
                </dependency>
                <dependency>
                        <groupId>org.jboss.resteasy</groupId>
                        <artifactId>resteasy-jackson2-provider</artifactId>
-                       <version>6.2.2.Final</version>
+                       <version>${resteasy.version}</version>
                </dependency>
-               
 
                <dependency>
                    <groupId>org.jboss.resteasy</groupId>