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 e2b5fa7283a2a49ebd37cb8be11e26d94073ac21 Merge: 2fdf9285f0 ae9e97eae0 Author: Andi Huber <[email protected]> AuthorDate: Wed Nov 23 05:18:30 2022 +0100 Merge remote-tracking branch 'origin/master' into spring6 bom/pom.xml | 2 +- .../domainobjects/ObjectAndActionInvocation.java | 16 +++ ...entNegotiationServiceForRestfulObjectsV1_0.java | 34 ++---- .../static/swagger-ui/index-ORIG-3.24.3.html | 60 --------- .../static/swagger-ui/index-ORIG-4.15.5.html | 19 +++ .../src/main/resources/static/swagger-ui/index.css | 16 +++ .../static/swagger-ui/oauth2-redirect.html | 41 ++++--- .../static/swagger-ui/swagger-initializer.js | 20 +++ .../static/swagger-ui/swagger-ui-bundle.js | 135 +-------------------- .../static/swagger-ui/swagger-ui-bundle.js.map | 2 +- .../static/swagger-ui/swagger-ui-es-bundle-core.js | 3 + .../swagger-ui/swagger-ui-es-bundle-core.js.map | 1 + .../static/swagger-ui/swagger-ui-es-bundle.js | 3 + .../static/swagger-ui/swagger-ui-es-bundle.js.map | 1 + .../swagger-ui/swagger-ui-standalone-preset.js | 23 +--- .../swagger-ui/swagger-ui-standalone-preset.js.map | 2 +- .../resources/static/swagger-ui/swagger-ui.css | 3 +- .../resources/static/swagger-ui/swagger-ui.css.map | 2 +- .../main/resources/static/swagger-ui/swagger-ui.js | 9 +- .../resources/static/swagger-ui/swagger-ui.js.map | 2 +- .../src/main/resources/swagger-ui/index.thtml | 25 ++-- .../pages/common/datatables/DatatablesDotNet.java | 2 +- 22 files changed, 144 insertions(+), 277 deletions(-) diff --cc viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceForRestfulObjectsV1_0.java index 3bb1cf4958,42fe932d99..0db0a976be --- a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceForRestfulObjectsV1_0.java +++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceForRestfulObjectsV1_0.java @@@ -21,14 -21,13 +21,13 @@@ package org.apache.causeway.viewer.rest import java.util.Collection; import java.util.List; import java.util.Optional; - import java.util.stream.Collectors; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.inject.Named; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.ResponseBuilder; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.ResponseBuilder; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service;
