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 9d61016576 ISIS-3275: fixes convergence issues with resteasy
9d61016576 is described below
commit 9d610165766de90c5302d2dacad9291392b5b07c
Author: Andi Huber <[email protected]>
AuthorDate: Tue Nov 15 09:30:50 2022 +0100
ISIS-3275: fixes convergence issues with resteasy
---
bom/pom.xml | 3 ++-
core/pom.xml | 15 +++++++++++++--
viewers/restfulobjects/jaxrs-resteasy/pom.xml | 21 +++++++++++++++++++++
3 files changed, 36 insertions(+), 3 deletions(-)
diff --git a/bom/pom.xml b/bom/pom.xml
index c450aba8d2..9024a68f2f 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -405,7 +405,8 @@ It is therefore a copy of org.apache:apache, with
customisations clearly identif
<quartz-scheduler.version>2.3.2</quartz-scheduler.version>
-
<resteasy-spring-boot-starter.version>6.0.0.Alpha2</resteasy-spring-boot-starter.version>
+
<resteasy-spring-boot.version>6.0.0.Alpha2</resteasy-spring-boot.version>
+ <resteasy-spring.version>3.0.0.Beta3</resteasy-spring.version>
<resteasy.version>6.2.1.Final</resteasy.version> <!-- keep in sync
with property defined in resteasy4-spring-boot-starter -->
<resteasy-jaxb-provider.version>6.2.1.Final</resteasy-jaxb-provider.version>
diff --git a/core/pom.xml b/core/pom.xml
index 6be1a474a7..ab742e84a4 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1172,11 +1172,22 @@
<version>${jdom.version}</version>
</dependency>
-
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-spring-boot-starter</artifactId>
-
<version>${resteasy-spring-boot-starter.version}</version>
+
<version>${resteasy-spring-boot.version}</version>
+ <!-- exclusions not supported here, but as a
reminder -->
+ <exclusions>
+ <exclusion>
+
<groupId>org.jboss.resteasy.spring</groupId>
+
<artifactId>resteasy-spring</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.resteasy.spring</groupId>
+ <artifactId>resteasy-spring</artifactId>
+ <version>${resteasy-spring.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
diff --git a/viewers/restfulobjects/jaxrs-resteasy/pom.xml
b/viewers/restfulobjects/jaxrs-resteasy/pom.xml
index 89f60698ef..8c5e06c188 100644
--- a/viewers/restfulobjects/jaxrs-resteasy/pom.xml
+++ b/viewers/restfulobjects/jaxrs-resteasy/pom.xml
@@ -92,13 +92,34 @@
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
</exclusion>
+ <exclusion>
+
<groupId>com.fasterxml.jackson.module</groupId>
+
<artifactId>jackson-module-jaxb-annotations</artifactId>
+ </exclusion>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
</exclusion>
+ <exclusion>
+
<groupId>org.jboss.resteasy.spring</groupId>
+ <artifactId>resteasy-spring</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.resteasy</groupId>
+
<artifactId>resteasy-core-spi</artifactId>
+ </exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.jboss.resteasy.spring</groupId>
+ <artifactId>resteasy-spring</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxb-provider</artifactId>
