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 2023/01/10 08:10:28 UTC

[isis] branch spring6 updated (8ca18d206b -> fc643f18ab)

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

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


    from 8ca18d206b Merge pull request #1342 from apache/dependabot/maven/spring6/com.google.errorprone-error_prone_annotations-2.18.0
     add f8741c7ef0 Bump error_prone_annotations from 2.17.0 to 2.18.0
     add 471570f2c8 Merge pull request #1341 from apache/dependabot/maven/master/com.google.errorprone-error_prone_annotations-2.18.0
     add 9f9c8699df Bump swagger-core from 2.2.7 to 2.2.8
     new fc643f18ab Merge remote-tracking branch 'origin/master' into spring6

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 bom/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


[isis] 01/01: Merge remote-tracking branch 'origin/master' into spring6

Posted by ah...@apache.org.
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 fc643f18ab214b570b3215547866f715e3b2f897
Merge: 8ca18d206b 9f9c8699df
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Jan 10 09:10:22 2023 +0100

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

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

diff --cc bom/pom.xml
index 3685479f7b,edd20d72f2..8fb22e0731
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@@ -173,22 -169,17 +173,22 @@@ 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.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>
 +        
  
          <select2.version>4.0.13</select2.version>
 -        <shiro.version>1.10.1</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.6</slf4j-api.version> <!-- also provided by spring-boot-starter-logging, needed to solve convergence issues -->
 -        <spring-boot.version>2.7.7</spring-boot.version>
 +        <spring-boot.version>3.0.1</spring-boot.version>
          <summernote.version>0.8.20</summernote.version>
 -        <surefire-plugin.argLine>-Xmx384m</surefire-plugin.argLine>
 +        <surefire-plugin.argLine>
 +			-Xmx384m 
 +		</surefire-plugin.argLine>
-         <swagger-core.version>2.2.7</swagger-core.version>
+         <swagger-core.version>2.2.8</swagger-core.version>
  
          <togglz.version>3.3.3</togglz.version>