Skip to content

Commit 92987ca

Browse files
committed
Upgrade dependencies
1 parent 1b2c15e commit 92987ca

4 files changed

Lines changed: 33 additions & 14 deletions

File tree

development.sh

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,11 @@ remove_all() {
141141
}
142142

143143
build() {
144-
mvn install
144+
if [[ "${1:-}" == "-Dclean" ]]; then
145+
mvn clean install
146+
else
147+
mvn install
148+
fi
145149
}
146150

147151
run_tests() {
@@ -155,6 +159,9 @@ print_usage() {
155159
build
156160
Build the Hastus service locally.
157161
162+
build:clean
163+
Build the Hastus service locally, cleaning previous builds.
164+
158165
build:data-inserter
159166
Build the Data-Inserter for integration tests (Git submodule).
160167
@@ -201,6 +208,10 @@ build)
201208
build
202209
;;
203210

211+
build:clean)
212+
build -Dclean
213+
;;
214+
204215
build:data-inserter)
205216
prepare_timetables_data_inserter
206217
;;

pom.xml

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.springframework.boot</groupId>
88
<artifactId>spring-boot-starter-parent</artifactId>
9-
<version>3.5.0</version>
9+
<version>4.0.3</version>
1010
<relativePath/>
1111
</parent>
1212

@@ -25,20 +25,20 @@
2525
<kotlin.compiler.incremental>true</kotlin.compiler.incremental>
2626

2727
<!-- Maven build plugins and their dependencies -->
28-
<maven-compiler-plugin.version>3.14.0</maven-compiler-plugin.version>
29-
<maven-enforcer-plugin.version>3.5.0</maven-enforcer-plugin.version>
30-
<build-helper-plugin.version>3.6.0</build-helper-plugin.version>
31-
<build-properties-plugin.version>1.2.1</build-properties-plugin.version>
32-
<surefire-plugin.version>3.5.3</surefire-plugin.version>
28+
<maven-compiler-plugin.version>3.15.0</maven-compiler-plugin.version>
29+
<maven-enforcer-plugin.version>3.6.2</maven-enforcer-plugin.version>
30+
<build-helper-plugin.version>3.6.1</build-helper-plugin.version>
31+
<build-properties-plugin.version>1.3.0</build-properties-plugin.version>
32+
<surefire-plugin.version>3.5.5</surefire-plugin.version>
3333
<ktlint-plugin.version>3.5.0</ktlint-plugin.version>
3434

3535
<!-- Library versions -->
36-
<kotlin-logging-jvm.version>7.0.7</kotlin-logging-jvm.version>
36+
<kotlin-logging-jvm.version>8.0.01</kotlin-logging-jvm.version>
3737
<quicktheories.version>0.26</quicktheories.version>
38-
<graphql-kotlin.version>8.6.0</graphql-kotlin.version>
39-
<ktor.version>2.3.12</ktor.version> <!-- must be in sync with graphql-kotlin.version -->
40-
<mockk.version>1.14.0</mockk.version>
41-
<springmockk.version>4.0.2</springmockk.version>
38+
<graphql-kotlin.version>9.0.0</graphql-kotlin.version>
39+
<ktor.version>3.0.3</ktor.version> <!-- must be in sync with graphql-kotlin.version -->
40+
<mockk.version>1.14.9</mockk.version>
41+
<springmockk.version>5.0.1</springmockk.version>
4242

4343
<!-- Other properties -->
4444
<start.class>fi.hsl.jore4.hastus.HastusApplicationKt</start.class>
@@ -280,6 +280,8 @@
280280
<arg>-Xjsr305=strict</arg>
281281
<!-- Because we are using @OptIn annotation. -->
282282
<arg>-opt-in=kotlin.RequiresOptIn</arg>
283+
<!-- Keep current behavior stable across Kotlin default-target migration. -->
284+
<arg>-Xannotation-default-target=param-property</arg>
283285
</args>
284286
</configuration>
285287
<executions>
@@ -535,6 +537,12 @@
535537
<scope>test</scope>
536538
</dependency>
537539

540+
<dependency>
541+
<groupId>org.springframework.boot</groupId>
542+
<artifactId>spring-boot-starter-webmvc-test</artifactId>
543+
<scope>test</scope>
544+
</dependency>
545+
538546
<dependency>
539547
<groupId>org.jetbrains.kotlin</groupId>
540548
<artifactId>kotlin-test-junit5</artifactId>

src/test/kotlin/fi/hsl/jore4/hastus/api/ExportControllerTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import io.mockk.verify
1414
import org.junit.jupiter.api.Test
1515
import org.junit.jupiter.api.extension.ExtendWith
1616
import org.springframework.beans.factory.annotation.Autowired
17-
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest
17+
import org.springframework.boot.webmvc.test.autoconfigure.WebMvcTest
1818
import org.springframework.context.annotation.Import
1919
import org.springframework.http.HttpHeaders
2020
import org.springframework.http.HttpStatus

src/test/kotlin/fi/hsl/jore4/hastus/api/ImportControllerTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import io.mockk.verify
1919
import org.junit.jupiter.api.Test
2020
import org.junit.jupiter.api.extension.ExtendWith
2121
import org.springframework.beans.factory.annotation.Autowired
22-
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest
22+
import org.springframework.boot.webmvc.test.autoconfigure.WebMvcTest
2323
import org.springframework.context.annotation.Import
2424
import org.springframework.http.HttpHeaders
2525
import org.springframework.http.MediaType

0 commit comments

Comments
 (0)