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 1958a76ba624f3e802064e9a6b1a693efdb21ea3 Merge: 5f75ac458c ec8993ab79 Author: Andi Huber <[email protected]> AuthorDate: Wed Nov 16 06:39:05 2022 +0100 ISIS-3276: more removal of literal '4' in resteasy names bom/pom.xml | 4 ++-- .../apache/causeway/testdomain/viewers/jdo/wkt/TestAppJdoWkt.java | 2 +- .../apache/causeway/testdomain/viewers/jpa/wkt/TestAppJpaWkt.java | 2 +- valuetypes/asciidoc/ui/pom.xml | 6 +++--- .../jaxrsresteasy/webmodule/WebModuleJaxrsResteasy.java | 4 ++-- .../Parser_forCacheControl_Test.java | 2 +- .../Parser_forJaxRsMediaType_Test.java | 2 +- .../RepresentationTypeTest_getMediaType.java | 2 +- .../RepresentationTypeTest_getName.java | 2 +- .../RepresentationTypeTest_lookup.java | 2 +- .../RepresentationTypeTest_parser.java | 2 +- .../context/ResourceContext_ensureCompatibleAcceptHeader_Test.java | 2 +- .../mappers/RestfulObjectsApplicationExceptionMapper_Test.java | 2 +- 13 files changed, 17 insertions(+), 17 deletions(-) diff --cc bom/pom.xml index 9024a68f2f,e101b5ac05..358f169942 --- a/bom/pom.xml +++ b/bom/pom.xml @@@ -405,26 -405,19 +405,26 @@@ 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.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> + <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 --> - <spring-boot.version>2.7.5</spring-boot.version> + <spring-boot.version>3.0.0-RC2</spring-boot.version> <summernote.version>0.8.11</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.8</swagger-core.version> + <swagger-core.version>1.6.9</swagger-core.version> - <togglz.version>3.3.0</togglz.version> + <togglz.version>3.3.1</togglz.version> <vaadin.version>23.2.8</vaadin.version> diff --cc viewers/restfulobjects/jaxrs-resteasy/src/main/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy/webmodule/WebModuleJaxrsResteasy.java index 399070de33,e3165625e0..6bce2c8ad8 --- a/viewers/restfulobjects/jaxrs-resteasy/src/main/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy/webmodule/WebModuleJaxrsResteasy.java +++ b/viewers/restfulobjects/jaxrs-resteasy/src/main/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy/webmodule/WebModuleJaxrsResteasy.java @@@ -57,8 -58,8 +57,8 @@@ import lombok.val @Service //CAUTION: SwaggerServiceMenu refers to this name @Named(CausewayModuleViewerRestfulObjectsApplib.NAMESPACE + ".WebModuleJaxrsRestEasy") [email protected](PriorityPrecedence.MIDPOINT - 80) [email protected](PriorityPrecedence.MIDPOINT - 80) - @Qualifier("JaxrsRestEasy4") + @Qualifier("JaxrsRestEasy") public final class WebModuleJaxrsResteasy extends WebModuleAbstract { private static final String INTERACTION_FILTER_NAME = "CausewayRestfulObjectsInteractionFilter";
