You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2022/11/18 06:41:54 UTC

[isis] 01/01: merge master

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

commit ac230b4b2ab6c3f52cfd129bbaca7d5904f1c758
Merge: e111177f57 d28b277936
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Nov 18 07:41:48 2022 +0100

    merge master

 bom/pom.xml               | 4 ++--
 tooling/javamodel/pom.xml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --cc bom/pom.xml
index 0749d8f5af,5e13fbff7e..99a31218f8
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@@ -405,23 -405,16 +405,23 @@@ It is therefore a copy of org.apache:ap
  
          <quartz-scheduler.version>2.3.2</quartz-scheduler.version>
  
 -        <resteasy-spring-boot-starter.version>5.0.0.Final</resteasy-spring-boot-starter.version>
 -        <resteasy.version>5.0.0.Final</resteasy.version> <!-- keep in sync with property defined in resteasy4-spring-boot-starter -->
 +        <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-jaxb-provider.version>6.2.1.Final</resteasy-jaxb-provider.version>
 +        
  
          <select2.version>4.0.13</select2.version>
 -        <shiro.version>1.10.0</shiro.version>
 +        <shiro.version>2.0.0-SNAPSHOT</shiro.version> <!-- latest release was 1.10.0, however we need jakarta namespace support -->
          <simpleslackapi.version>1.4.0</simpleslackapi.version>
-         <slf4j-api.version>2.0.3</slf4j-api.version> <!-- also provided by spring-boot-starter-logging, needed to solve convergence issues -->
+         <slf4j-api.version>2.0.4</slf4j-api.version> <!-- also provided by spring-boot-starter-logging, needed to solve convergence issues -->
 -        <spring-boot.version>2.7.5</spring-boot.version>
 +        <spring-boot.version>3.0.0-RC2</spring-boot.version>
          <summernote.version>0.8.20</summernote.version>
 -        <surefire-plugin.argLine>-Xmx512m</surefire-plugin.argLine>
 +        <surefire-plugin.argLine>
 +			-Xmx512m 
 +			--add-modules com.sun.tools.xjc 
 +			--add-reads org.eclipse.persistence.moxy=com.sun.tools.xjc
 +		</surefire-plugin.argLine>
          <swagger-core.version>1.6.9</swagger-core.version>
  
          <togglz.version>3.3.1</togglz.version>