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 0c47551f07c92798af53455d1aa171e37e307b27
Merge: ac230b4b2a a7d41a2bbc
Author: Andi Huber <[email protected]>
AuthorDate: Fri Nov 18 07:56:48 2022 +0100

    Merge remote-tracking branch 'origin/master' into spring6

 bom/pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --cc bom/pom.xml
index 99a31218f8,51a19aad6d..046a1ac5f5
--- 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.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>-Xmx384m</surefire-plugin.argLine>
 +        <surefire-plugin.argLine>
-                       -Xmx512m 
++                      -Xmx384m 
 +                      --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>
@@@ -1422,11 -1351,7 +1422,12 @@@
                  </property>
              </activation>
              <properties>
 -                <surefire-plugin.argLine>@{argLine} 
-Xmx384m</surefire-plugin.argLine>
 +                <surefire-plugin.argLine>
 +                                      @{argLine}
++                                      -Xmx384m
 +                                      --add-modules com.sun.tools.xjc 
 +                                      --add-reads 
org.eclipse.persistence.moxy=com.sun.tools.xjc 
 +                              </surefire-plugin.argLine>
              </properties>
              <build>
                  <plugins>

Reply via email to