From 950a0c4b2184ae8136398851428cb8d7d418bcd2 Mon Sep 17 00:00:00 2001 From: Ludy Date: Sat, 3 Aug 2024 14:18:51 +0200 Subject: [PATCH] Bump org.springframework.boot from 3.3.0 to 3.3.2 & Gradle 8 compatibility (#1626) Co-authored-by: Anthony Stirling <77850077+Frooodle@users.noreply.github.com> --- .github/labeler-config.yml | 2 +- build.gradle | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/labeler-config.yml b/.github/labeler-config.yml index 376ee372..d96a2a19 100644 --- a/.github/labeler-config.yml +++ b/.github/labeler-config.yml @@ -46,4 +46,4 @@ Docker: Test: - changed-files: - any-glob-to-any-file: 'cucumber/**/*' - - any-glob-to-any-file: 'test*' + - any-glob-to-any-file: 'src/test**/*' diff --git a/build.gradle b/build.gradle index 1d15af47..c4787869 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { id "java" - id "org.springframework.boot" version "3.3.0" + id "org.springframework.boot" version "3.3.2" id "io.spring.dependency-management" version "1.1.6" id "org.springdoc.openapi-gradle-plugin" version "1.8.0" id "io.swagger.swaggerhub" version "1.3.2" @@ -18,8 +18,10 @@ ext { group = "stirling.software" version = "0.26.2" -// 17 is lowest but we support and recommend 21 -sourceCompatibility = "17" +java { + // 17 is lowest but we support and recommend 21 + sourceCompatibility = JavaVersion.VERSION_17 +} repositories { mavenCentral() @@ -106,7 +108,7 @@ dependencies { // implementation "org.yaml:snakeyaml:2.2" implementation 'com.github.Carleslc.Simple-YAML:Simple-Yaml:1.8.4' - + // Exclude Tomcat and include Jetty implementation("org.springframework.boot:spring-boot-starter-web:$springBootVersion") { exclude group: "org.springframework.boot", module: "spring-boot-starter-tomcat" @@ -196,7 +198,7 @@ compileJava { options.compilerArgs << "-parameters" } -task writeVersion { +task writeVersion { def propsFile = file("src/main/resources/version.properties") def props = new Properties() props.setProperty("version", version) @@ -226,6 +228,6 @@ tasks.named("test") { useJUnitPlatform() } -task printVersion { +task printVersion { println project.version }