From 27e7ec945f3ae7c9e1357bb7caf6c0bdcb4782a6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 20 Oct 2023 06:12:35 +0000 Subject: [PATCH 1/2] Bump org.springframework.boot from 3.1.3 to 3.1.5 Bumps [org.springframework.boot](https://github.com/spring-projects/spring-boot) from 3.1.3 to 3.1.5. - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.1.3...v3.1.5) --- updated-dependencies: - dependency-name: org.springframework.boot dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index b089f3384..db0dcf650 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ buildscript { plugins { id "java" - id "org.springframework.boot" version "3.1.3" + id "org.springframework.boot" version "3.1.5" id "idea" } From c44db20e43aae2aa1fdc5acf65ef41e778577894 Mon Sep 17 00:00:00 2001 From: kubo Date: Thu, 2 Nov 2023 15:07:23 +0100 Subject: [PATCH 2/2] Fix jetty vs tomcat conflicting setup --- build.gradle | 3 --- src/main/resources/config/application.yml | 2 -- 2 files changed, 5 deletions(-) diff --git a/build.gradle b/build.gradle index db0dcf650..f49ffe870 100644 --- a/build.gradle +++ b/build.gradle @@ -113,8 +113,6 @@ repositories { compileJava.dependsOn(processResources) configurations { - compile.exclude module: "spring-boot-starter-tomcat" - compile.exclude module: "tomcat-jdbc" compile.exclude module: "assertj-core" } @@ -224,7 +222,6 @@ dependencies { implementation("org.springframework.boot:spring-boot-starter-data-jpa") implementation("org.springframework.boot:spring-boot-starter-web") implementation("org.springframework.boot:spring-boot-starter-amqp") - implementation("org.springframework.boot:spring-boot-starter-jetty") implementation("org.springframework.boot:spring-boot-starter-security") implementation("org.springframework.boot:spring-boot-starter-thymeleaf") implementation("org.springframework.boot:spring-boot-starter-mail") diff --git a/src/main/resources/config/application.yml b/src/main/resources/config/application.yml index 9e441dfac..a12ea67f7 100644 --- a/src/main/resources/config/application.yml +++ b/src/main/resources/config/application.yml @@ -157,8 +157,6 @@ server: charset: utf-8 enabled: true force: true - jetty: - max-http-form-post-size: 367001600 forward-headers-strategy: native tomcat: relaxed-query-chars: "[,]" # Elide makes heave use of these and many browsers don't escape them