Skip to content

Commit 676bcf5

Browse files
committed
Fix tests for older versions of Spring Boot
1 parent c67f1b3 commit 676bcf5

3 files changed

Lines changed: 14 additions & 3 deletions

File tree

.github/README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,7 @@
11
# Placeholder for documentation
2+
3+
4+
### TODO
5+
6+
* Lokaalseks jooksutamiseks skript, mis testib läbi kõik Spring Boot versioonid, kasutab sama faili mis Ations
7+
* SB versioonide uuendamiseks skript koos oma actioniga, mis teeb PRi

.github/workflows/build.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,6 @@ jobs:
4949
path: build/reports/**
5050
retention-days: 5
5151

52-
# todo kirjutada readme ka, mis põhimõttel asi toimib ning kuidas uuendada + kuidas testida erinevaid SP versioone
53-
5452
test:
5553
runs-on: ubuntu-latest
5654
strategy:

build.gradle

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ buildscript {
44
springVersion = project.hasProperty('springFrameworkVersion') ? project.springFrameworkVersion : '6.2.7'
55
jacksonVersion = '2.19.0'
66
retrofitVersion = '2.11.0'
7+
mockitoVersion = '5.2.+' // At least Mockito 5.2.0 is required to Mock final classes
78
}
89
dependencies {
910
classpath 'org.owasp:dependency-check-gradle'
@@ -79,7 +80,7 @@ dependencies {
7980
compileOnly group: 'com.squareup.okhttp3', name: 'logging-interceptor', version: '4.12.0'
8081

8182
// https://mvnrepository.com/artifact/de.siegmar/logback-gelf
82-
compileOnly group: 'de.siegmar', name: 'logback-gelf', version: '6.1.1'
83+
compileOnly group: 'de.siegmar', name: 'logback-gelf', version: '5.0.+'
8384

8485
// https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-web
8586
testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: "${springBootVersion}"
@@ -99,6 +100,12 @@ dependencies {
99100
// https://mvnrepository.com/artifact/ee.bitweb/spring-test-core
100101
testImplementation group: 'ee.bitweb', name: 'spring-test-core', version: '2.+'
101102

103+
// https://mvnrepository.com/artifact/org.mockito/mockito-core
104+
testImplementation group: 'org.mockito', name: 'mockito-core', version: "${mockitoVersion}"
105+
106+
// https://mvnrepository.com/artifact/org.mockito/mockito-junit-jupiter
107+
testImplementation group: 'org.mockito', name: 'mockito-junit-jupiter', version: "${mockitoVersion}"
108+
102109
// https://mvnrepository.com/artifact/org.mock-server/mockserver-netty
103110
testImplementation ("org.mock-server:mockserver-netty:5.15.0") {
104111
exclude group: 'junit', module: 'junit'

0 commit comments

Comments
 (0)