From 4e257b6a1e3951ad92a0fabea37c06b6a03f3061 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Jan 2025 22:38:19 +0000 Subject: [PATCH 1/3] Bump the spring group across 1 directory with 24 updates Bumps the spring group with 24 updates in the / directory: | Package | From | To | | --- | --- | --- | | [org.springframework:spring-orm](https://github.com/spring-projects/spring-framework) | `6.2.0` | `6.2.1` | | [org.springframework:spring-core](https://github.com/spring-projects/spring-framework) | `6.2.0` | `6.2.1` | | [org.springframework:spring-beans](https://github.com/spring-projects/spring-framework) | `6.2.0` | `6.2.1` | | [org.springframework:spring-aop](https://github.com/spring-projects/spring-framework) | `6.2.0` | `6.2.1` | | [org.springframework:spring-context](https://github.com/spring-projects/spring-framework) | `6.2.0` | `6.2.1` | | [org.springframework:spring-context-support](https://github.com/spring-projects/spring-framework) | `6.2.0` | `6.2.1` | | [org.springframework:spring-tx](https://github.com/spring-projects/spring-framework) | `6.2.0` | `6.2.1` | | [org.springframework:spring-jdbc](https://github.com/spring-projects/spring-framework) | `6.2.0` | `6.2.1` | | [org.springframework:spring-web](https://github.com/spring-projects/spring-framework) | `6.2.0` | `6.2.1` | | [org.springframework:spring-webmvc](https://github.com/spring-projects/spring-framework) | `6.2.0` | `6.2.1` | | [org.springframework:spring-expression](https://github.com/spring-projects/spring-framework) | `6.2.0` | `6.2.1` | | [org.springframework:spring-test](https://github.com/spring-projects/spring-framework) | `6.2.0` | `6.2.1` | | [org.springframework.boot:spring-boot-starter-test](https://github.com/spring-projects/spring-boot) | `3.3.5` | `3.4.1` | | [org.springframework.boot:spring-boot-starter-tomcat](https://github.com/spring-projects/spring-boot) | `3.3.5` | `3.4.1` | | [org.springframework.boot:spring-boot-maven-plugin](https://github.com/spring-projects/spring-boot) | `3.3.5` | `3.4.1` | | [org.springframework.boot:spring-boot-starter-cache](https://github.com/spring-projects/spring-boot) | `3.3.5` | `3.4.1` | | [org.springframework.boot:spring-boot-starter](https://github.com/spring-projects/spring-boot) | `3.3.5` | `3.4.1` | | [org.springframework.boot:spring-boot-starter-web](https://github.com/spring-projects/spring-boot) | `3.3.5` | `3.4.1` | | [org.springframework.boot:spring-boot-starter-data-rest](https://github.com/spring-projects/spring-boot) | `3.3.5` | `3.4.1` | | [org.springframework.boot:spring-boot-starter-security](https://github.com/spring-projects/spring-boot) | `3.3.5` | `3.4.1` | | [org.springframework.boot:spring-boot-starter-aop](https://github.com/spring-projects/spring-boot) | `3.3.5` | `3.4.1` | | [org.springframework.boot:spring-boot-starter-actuator](https://github.com/spring-projects/spring-boot) | `3.3.5` | `3.4.1` | | [org.springframework.boot:spring-boot-starter-log4j2](https://github.com/spring-projects/spring-boot) | `3.3.5` | `3.4.1` | | [org.springframework.security:spring-security-test](https://github.com/spring-projects/spring-security) | `6.4.0` | `6.4.2` | Updates `org.springframework:spring-orm` from 6.2.0 to 6.2.1 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v6.2.0...v6.2.1) Updates `org.springframework:spring-core` from 6.2.0 to 6.2.1 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v6.2.0...v6.2.1) Updates `org.springframework:spring-beans` from 6.2.0 to 6.2.1 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v6.2.0...v6.2.1) Updates `org.springframework:spring-aop` from 6.2.0 to 6.2.1 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v6.2.0...v6.2.1) Updates `org.springframework:spring-context` from 6.2.0 to 6.2.1 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v6.2.0...v6.2.1) Updates `org.springframework:spring-context-support` from 6.2.0 to 6.2.1 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v6.2.0...v6.2.1) Updates `org.springframework:spring-tx` from 6.2.0 to 6.2.1 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v6.2.0...v6.2.1) Updates `org.springframework:spring-jdbc` from 6.2.0 to 6.2.1 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v6.2.0...v6.2.1) Updates `org.springframework:spring-web` from 6.2.0 to 6.2.1 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v6.2.0...v6.2.1) Updates `org.springframework:spring-webmvc` from 6.2.0 to 6.2.1 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v6.2.0...v6.2.1) Updates `org.springframework:spring-expression` from 6.2.0 to 6.2.1 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v6.2.0...v6.2.1) Updates `org.springframework:spring-test` from 6.2.0 to 6.2.1 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v6.2.0...v6.2.1) Updates `org.springframework:spring-core` from 6.2.0 to 6.2.1 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v6.2.0...v6.2.1) Updates `org.springframework:spring-beans` from 6.2.0 to 6.2.1 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v6.2.0...v6.2.1) Updates `org.springframework:spring-aop` from 6.2.0 to 6.2.1 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v6.2.0...v6.2.1) Updates `org.springframework:spring-context` from 6.2.0 to 6.2.1 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v6.2.0...v6.2.1) Updates `org.springframework:spring-context-support` from 6.2.0 to 6.2.1 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v6.2.0...v6.2.1) Updates `org.springframework:spring-tx` from 6.2.0 to 6.2.1 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v6.2.0...v6.2.1) Updates `org.springframework:spring-jdbc` from 6.2.0 to 6.2.1 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v6.2.0...v6.2.1) Updates `org.springframework:spring-web` from 6.2.0 to 6.2.1 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v6.2.0...v6.2.1) Updates `org.springframework:spring-webmvc` from 6.2.0 to 6.2.1 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v6.2.0...v6.2.1) Updates `org.springframework:spring-expression` from 6.2.0 to 6.2.1 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v6.2.0...v6.2.1) Updates `org.springframework:spring-test` from 6.2.0 to 6.2.1 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v6.2.0...v6.2.1) Updates `org.springframework.boot:spring-boot-starter-test` from 3.3.5 to 3.4.1 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.3.5...v3.4.1) Updates `org.springframework.boot:spring-boot-starter-tomcat` from 3.3.5 to 3.4.1 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.3.5...v3.4.1) Updates `org.springframework.boot:spring-boot-maven-plugin` from 3.3.5 to 3.4.1 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.3.5...v3.4.1) Updates `org.springframework.boot:spring-boot-starter-cache` from 3.3.5 to 3.4.1 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.3.5...v3.4.1) Updates `org.springframework.boot:spring-boot-starter` from 3.3.5 to 3.4.1 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.3.5...v3.4.1) Updates `org.springframework.boot:spring-boot-starter-web` from 3.3.5 to 3.4.1 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.3.5...v3.4.1) Updates `org.springframework.boot:spring-boot-starter-data-rest` from 3.3.5 to 3.4.1 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.3.5...v3.4.1) Updates `org.springframework.boot:spring-boot-starter-security` from 3.3.5 to 3.4.1 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.3.5...v3.4.1) Updates `org.springframework.boot:spring-boot-starter-aop` from 3.3.5 to 3.4.1 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.3.5...v3.4.1) Updates `org.springframework.boot:spring-boot-starter-actuator` from 3.3.5 to 3.4.1 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.3.5...v3.4.1) Updates `org.springframework.boot:spring-boot-starter-log4j2` from 3.3.5 to 3.4.1 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.3.5...v3.4.1) Updates `org.springframework.boot:spring-boot-starter-tomcat` from 3.3.5 to 3.4.1 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.3.5...v3.4.1) Updates `org.springframework.security:spring-security-test` from 6.4.0 to 6.4.2 - [Release notes](https://github.com/spring-projects/spring-security/releases) - [Changelog](https://github.com/spring-projects/spring-security/blob/main/RELEASE.adoc) - [Commits](https://github.com/spring-projects/spring-security/compare/6.4.0...6.4.2) Updates `org.springframework.boot:spring-boot-maven-plugin` from 3.3.5 to 3.4.1 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.3.5...v3.4.1) Updates `org.springframework.boot:spring-boot-starter-cache` from 3.3.5 to 3.4.1 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.3.5...v3.4.1) Updates `org.springframework.boot:spring-boot-starter` from 3.3.5 to 3.4.1 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.3.5...v3.4.1) Updates `org.springframework.boot:spring-boot-starter-web` from 3.3.5 to 3.4.1 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.3.5...v3.4.1) Updates `org.springframework.boot:spring-boot-starter-data-rest` from 3.3.5 to 3.4.1 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.3.5...v3.4.1) Updates `org.springframework.boot:spring-boot-starter-security` from 3.3.5 to 3.4.1 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.3.5...v3.4.1) Updates `org.springframework.boot:spring-boot-starter-aop` from 3.3.5 to 3.4.1 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.3.5...v3.4.1) Updates `org.springframework.boot:spring-boot-starter-actuator` from 3.3.5 to 3.4.1 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.3.5...v3.4.1) Updates `org.springframework.boot:spring-boot-starter-log4j2` from 3.3.5 to 3.4.1 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.3.5...v3.4.1) --- updated-dependencies: - dependency-name: org.springframework:spring-orm dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring - dependency-name: org.springframework:spring-core dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring - dependency-name: org.springframework:spring-beans dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring - dependency-name: org.springframework:spring-aop dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring - dependency-name: org.springframework:spring-context dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring - dependency-name: org.springframework:spring-context-support dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring - dependency-name: org.springframework:spring-tx dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring - dependency-name: org.springframework:spring-jdbc dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring - dependency-name: org.springframework:spring-web dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring - dependency-name: org.springframework:spring-webmvc dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring - dependency-name: org.springframework:spring-expression dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring - dependency-name: org.springframework:spring-test dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring - dependency-name: org.springframework:spring-core dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring - dependency-name: org.springframework:spring-beans dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring - dependency-name: org.springframework:spring-aop dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring - dependency-name: org.springframework:spring-context dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring - dependency-name: org.springframework:spring-context-support dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring - dependency-name: org.springframework:spring-tx dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring - dependency-name: org.springframework:spring-jdbc dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring - dependency-name: org.springframework:spring-web dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring - dependency-name: org.springframework:spring-webmvc dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring - dependency-name: org.springframework:spring-expression dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring - dependency-name: org.springframework:spring-test dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring - dependency-name: org.springframework.boot:spring-boot-starter-test dependency-type: direct:production update-type: version-update:semver-minor dependency-group: spring - dependency-name: org.springframework.boot:spring-boot-starter-tomcat dependency-type: direct:production update-type: version-update:semver-minor dependency-group: spring - dependency-name: org.springframework.boot:spring-boot-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor dependency-group: spring - dependency-name: org.springframework.boot:spring-boot-starter-cache dependency-type: direct:production update-type: version-update:semver-minor dependency-group: spring - dependency-name: org.springframework.boot:spring-boot-starter dependency-type: direct:production update-type: version-update:semver-minor dependency-group: spring - dependency-name: org.springframework.boot:spring-boot-starter-web dependency-type: direct:production update-type: version-update:semver-minor dependency-group: spring - dependency-name: org.springframework.boot:spring-boot-starter-data-rest dependency-type: direct:production update-type: version-update:semver-minor dependency-group: spring - dependency-name: org.springframework.boot:spring-boot-starter-security dependency-type: direct:production update-type: version-update:semver-minor dependency-group: spring - dependency-name: org.springframework.boot:spring-boot-starter-aop dependency-type: direct:production update-type: version-update:semver-minor dependency-group: spring - dependency-name: org.springframework.boot:spring-boot-starter-actuator dependency-type: direct:production update-type: version-update:semver-minor dependency-group: spring - dependency-name: org.springframework.boot:spring-boot-starter-log4j2 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: spring - dependency-name: org.springframework.boot:spring-boot-starter-tomcat dependency-type: direct:production update-type: version-update:semver-minor dependency-group: spring - dependency-name: org.springframework.security:spring-security-test dependency-type: direct:production update-type: version-update:semver-patch dependency-group: spring - dependency-name: org.springframework.boot:spring-boot-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor dependency-group: spring - dependency-name: org.springframework.boot:spring-boot-starter-cache dependency-type: direct:production update-type: version-update:semver-minor dependency-group: spring - dependency-name: org.springframework.boot:spring-boot-starter dependency-type: direct:production update-type: version-update:semver-minor dependency-group: spring - dependency-name: org.springframework.boot:spring-boot-starter-web dependency-type: direct:production update-type: version-update:semver-minor dependency-group: spring - dependency-name: org.springframework.boot:spring-boot-starter-data-rest dependency-type: direct:production update-type: version-update:semver-minor dependency-group: spring - dependency-name: org.springframework.boot:spring-boot-starter-security dependency-type: direct:production update-type: version-update:semver-minor dependency-group: spring - dependency-name: org.springframework.boot:spring-boot-starter-aop dependency-type: direct:production update-type: version-update:semver-minor dependency-group: spring - dependency-name: org.springframework.boot:spring-boot-starter-actuator dependency-type: direct:production update-type: version-update:semver-minor dependency-group: spring - dependency-name: org.springframework.boot:spring-boot-starter-log4j2 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: spring ... Signed-off-by: dependabot[bot] --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 6fc9c2c070c9..a1f47873c514 100644 --- a/pom.xml +++ b/pom.xml @@ -19,9 +19,9 @@ 17 - 6.2.0 - 3.3.5 - 6.4.0 + 6.2.1 + 3.4.1 + 6.4.2 6.4.8.Final 8.0.1.Final 42.7.4 From 9d6746f6e68a5a346d461d895d1c2f289a6c8f69 Mon Sep 17 00:00:00 2001 From: Tim Donohue Date: Tue, 14 Jan 2025 14:46:27 -0600 Subject: [PATCH 2/3] Dependency convergence fix --- dspace-api/pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dspace-api/pom.xml b/dspace-api/pom.xml index 599303275f9f..c51489a03851 100644 --- a/dspace-api/pom.xml +++ b/dspace-api/pom.xml @@ -756,6 +756,11 @@ org.javassist javassist + + + org.yaml + snakeyaml + From 97d017a9e7f829e2a52ccbbd8b844d251df94f2a Mon Sep 17 00:00:00 2001 From: Tim Donohue Date: Tue, 14 Jan 2025 16:23:21 -0600 Subject: [PATCH 3/3] Tell Spring Boot to use the simple HttpURLConnection for RestClient, like in Spring boot 3.3 --- .../src/main/resources/application.properties | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dspace-server-webapp/src/main/resources/application.properties b/dspace-server-webapp/src/main/resources/application.properties index 8233298ef0b0..0d9b9cd836ec 100644 --- a/dspace-server-webapp/src/main/resources/application.properties +++ b/dspace-server-webapp/src/main/resources/application.properties @@ -135,3 +135,15 @@ spring.servlet.multipart.max-file-size = 512MB # Maximum size of a multipart request (i.e. max total size of all files in one request) (default = 10MB) spring.servlet.multipart.max-request-size = 512MB + +################################## +# Spring Boot's HTTP Client configuration (for RestClient and RestTemplate) +# https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-3.4-Release-Notes#restclient-and-resttemplate +# +# "simple" tells Spring Boot to use JDK's HttpURLConnection (SimpleClientHttpRequestFactory) +# We have to configure this explicitly for DSpace because Spring Boot's autoconfiguration will attempt to +# use Jetty or similar if found on the classpath (and Jetty is on the classpath for Handle Server, etc) +spring.http.client.factory = simple +# "dont_follow" tells Spring Boot not to follow any redirects itself, but instead return the 3xx code to +# the user's browser. +spring.http.client.redirects = dont_follow \ No newline at end of file