Skip to content

Commit

Permalink
Merge pull request DSpace#10165 from DSpace/dependabot/maven/spring-6…
Browse files Browse the repository at this point in the history
…b8a343f65

Bump the spring group across 1 directory with 24 updates
  • Loading branch information
tdonohue authored Jan 16, 2025
2 parents e404479 + 97d017a commit cb622de
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 3 deletions.
5 changes: 5 additions & 0 deletions dspace-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -756,6 +756,11 @@
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
</exclusion>
<!-- Exclude snakeyaml as a newer version is brought in by Spring Boot -->
<exclusion>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
</exclusion>
</exclusions>
</dependency>

Expand Down
12 changes: 12 additions & 0 deletions dspace-server-webapp/src/main/resources/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
<properties>
<!--=== GENERAL / DSPACE-API DEPENDENCIES ===-->
<java.version>17</java.version>
<spring.version>6.2.0</spring.version>
<spring-boot.version>3.3.5</spring-boot.version>
<spring-security.version>6.4.0</spring-security.version> <!-- sync with version used by spring-boot-->
<spring.version>6.2.1</spring.version>
<spring-boot.version>3.4.1</spring-boot.version>
<spring-security.version>6.4.2</spring-security.version> <!-- sync with version used by spring-boot-->
<hibernate.version>6.4.8.Final</hibernate.version>
<hibernate-validator.version>8.0.1.Final</hibernate-validator.version>
<postgresql.driver.version>42.7.5</postgresql.driver.version>
Expand Down

0 comments on commit cb622de

Please sign in to comment.