Skip to content

Commit c4fed93

Browse files
committed
Bumper dependencies
1 parent 406ddde commit c4fed93

File tree

3 files changed

+31
-12
lines changed

3 files changed

+31
-12
lines changed

.github/workflows/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- uses: actions/setup-java@v3
3232
with:
3333
distribution: 'temurin'
34-
java-version: '17.x'
34+
java-version: '21.x'
3535
cache: 'gradle'
3636
- name: test and build
3737
run: ./gradlew clean test build

Dockerfile

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
1-
FROM ghcr.io/navikt/baseimages/temurin:17
1+
FROM gcr.io/distroless/java21-debian12:nonroot
22

3+
COPY build/libs/*.jar /app/
4+
5+
ENV TZ="Europe/Oslo"
36
ENV JAVA_OPTS='-XX:MaxRAMPercentage=90'
47

5-
COPY build/libs/*.jar ./
8+
WORKDIR /app
9+
10+
CMD ["app.jar"]

build.gradle.kts

+23-9
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,18 @@
1-
val javaVersion = "17"
2-
val ktorVersion = "2.3.4"
3-
val logbackClassicVersion = "1.4.11"
1+
val javaVersion = "21"
2+
val ktorVersion = "2.3.7"
3+
val logbackClassicVersion = "1.4.14"
44
val logbackEncoderVersion = "7.4"
55

6-
val junitJupiterVersion = "5.10.0"
6+
val junitJupiterVersion = "5.10.1"
7+
8+
val flywayVersion = "10.4.1"
9+
val hikariCPVersion = "5.1.0"
10+
val postgresqlVersion = "42.7.1"
11+
val kotliQueryVersion = "1.9.0"
12+
val testContainerPostgresqlVersion = "1.19.3"
713

814
plugins {
9-
kotlin("jvm") version "1.9.10"
15+
kotlin("jvm") version "1.9.22"
1016
}
1117

1218
repositories {
@@ -17,12 +23,13 @@ repositories {
1723
dependencies {
1824
implementation("com.github.navikt:rapids-and-rivers:2023093008351696055717.ffdec6aede3d")
1925

20-
implementation("org.flywaydb:flyway-core:9.7.0")
21-
implementation("com.zaxxer:HikariCP:5.0.1")
26+
implementation("org.flywaydb:flyway-core:$flywayVersion")
27+
implementation("org.flywaydb:flyway-database-postgresql:$flywayVersion")
28+
implementation("com.zaxxer:HikariCP:$hikariCPVersion")
2229
implementation("org.postgresql:postgresql:42.6.0")
23-
implementation("com.github.seratch:kotliquery:1.9.0")
30+
implementation("com.github.seratch:kotliquery:$kotliQueryVersion")
2431

25-
testImplementation("org.testcontainers:postgresql:1.17.5")
32+
testImplementation("org.testcontainers:postgresql:$testContainerPostgresqlVersion")
2633

2734
testImplementation("org.junit.jupiter:junit-jupiter-api:$junitJupiterVersion")
2835
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:$junitJupiterVersion")
@@ -37,6 +44,13 @@ tasks {
3744
kotlinOptions.jvmTarget = javaVersion
3845
}
3946

47+
withType<Test> {
48+
useJUnitPlatform()
49+
testLogging {
50+
events("passed", "skipped", "failed")
51+
}
52+
}
53+
4054
withType<Jar> {
4155
archiveBaseName.set("app")
4256

0 commit comments

Comments
 (0)