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 f3ea44c3795550bac61abaadd91fc187d4180d73 Merge: 4f0fc70361 f69682574f Author: Andi Huber <[email protected]> AuthorDate: Mon Nov 14 15:15:38 2022 +0100 ISIS-3275: [Incubating] Migrate from Spring 5.x to Spring 6.x .github/dependabot.yml | 9 ++ .../ROOT/pages/2022/2.0.0-RC1/mignotes.adoc | 24 ++++ core/pom.xml | 5 + extensions/core/executionoutbox/restclient/pom.xml | 2 +- .../core/commandreplay/secondary/pom.xml | 2 +- mavendeps/webapp/pom.xml | 2 +- starters/pom.xml | 2 +- .../.gitignore | 0 viewers/restfulobjects/jaxrs-resteasy/pom.xml | 134 ++++++++++++++++++++ ...ayModuleViewerRestfulObjectsJaxrsResteasy4.java | 0 .../conneg/RestfulObjectsJaxbWriterForXml.java | 79 ++++++++++++ .../webmodule/WebModuleJaxrsResteasy4.java | 139 +++++++++++++++++++++ .../Parser_forCacheControl_Test.java | 0 .../Parser_forJaxRsMediaType_Test.java | 0 .../RepresentationTypeTest_getMediaType.java | 0 .../RepresentationTypeTest_getName.java | 0 .../RepresentationTypeTest_lookup.java | 0 .../RepresentationTypeTest_parser.java | 0 ...eContext_ensureCompatibleAcceptHeader_Test.java | 0 ...tfulObjectsApplicationExceptionMapper_Test.java | 0 viewers/restfulobjects/pom.xml | 2 +- 21 files changed, 395 insertions(+), 5 deletions(-) diff --cc core/pom.xml index 57a3529d21,6b66a7f196..1244365429 --- a/core/pom.xml +++ b/core/pom.xml @@@ -623,8 -623,8 +623,13 @@@ </dependency> <dependency> <groupId>org.apache.causeway.viewer</groupId> ++<<<<<<< HEAD + <artifactId>causeway-viewer-restfulobjects-jaxrsresteasy4</artifactId> + <version>3.0.0-SNAPSHOT</version> ++======= + <artifactId>causeway-viewer-restfulobjects-jaxrsresteasy</artifactId> + <version>2.0.0-SNAPSHOT</version> ++>>>>>>> refs/remotes/origin/master </dependency> <dependency> <groupId>org.apache.causeway.viewer</groupId> diff --cc starters/pom.xml index 18809975f0,b5630085bb..150b77736d --- a/starters/pom.xml +++ b/starters/pom.xml @@@ -39,12 -39,12 +39,12 @@@ <properties> - <maven.compiler.release>11</maven.compiler.release> + <maven.compiler.release>17</maven.compiler.release> - <spring-boot.version>2.7.5</spring-boot.version> + <spring-boot.version>3.0.0-RC2</spring-boot.version> <approvaltests.version>18.5.0</approvaltests.version> - <resteasy.version>4.6.2.Final</resteasy.version> <!-- keep in sync with property defined in resteasy4-spring-boot-starter --> + <resteasy.version>5.0.0.Final</resteasy.version> <!-- keep in sync with property defined in resteasy-spring-boot-starter --> </properties>
