Skip to content

Commit

Permalink
Update to Spring Boot 2.7.18 (#474)
Browse files Browse the repository at this point in the history
* Update to Spring Boot 2.7.18

https://spring.io/blog/2023/11/23/spring-boot-2-7-18-available-now

* Update to Gradle 8.7

This fixes Gradle on Java 21, which is used in the Dev Container.

* Fix Mockito imports

`org.mockito.Matchers` was deprecated and removed in favour of
`org.mockito.ArgumentMatchers`.

* Fix Gradle JaCoCo configuration
  • Loading branch information
praseodym authored May 4, 2024
1 parent 4b1b8a1 commit 2d78079
Show file tree
Hide file tree
Showing 11 changed files with 242 additions and 175 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- name: Run a build and generate the dependency graph which will be submitted post-job
run: ./gradlew build
- name: Test Coverage
run: ./gradlew jacocoTestReport jacocoFix --scan
run: ./gradlew jacocoTestReport
- name: Login to GitHub Container Registry
uses: docker/login-action@v3
with:
Expand Down
21 changes: 1 addition & 20 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
buildscript {
ext {
springBootVersion = '2.5.15'
springBootVersion = '2.7.18'
}
ext['log4j2.version'] = '2.17.2'
repositories {
mavenCentral()
}
Expand Down Expand Up @@ -105,24 +104,6 @@ dependencies {
implementation 'org.javatuples:javatuples:1.2'
}

jacocoTestReport {
reports {
xml.required = true
html.required = false
}
}

task jacocoFix(type: Copy) {
from 'build/reports/jacoco/test/jacocoTestReport.xml'
into './src/main/java/'
rename { String fileName ->
fileName.replace("jacocoTestReport.xml", "jacoco.xml")
}
}

test {
maxHeapSize = "4096m"
}


check.dependsOn jacocoTestReport
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
7 changes: 4 additions & 3 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#Fri Sep 17 19:04:36 CEST 2021
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-all.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit 2d78079

Please sign in to comment.