Skip to content

[PROD] bump version #115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 21 commits into from
Aug 29, 2024
Merged

[PROD] bump version #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
2180176
Bump com.expediagroup.graphql from 7.1.1 to 7.1.4
dependabot[bot] Jul 15, 2024
f0a0b71
Bump io.mockk:mockk from 1.13.11 to 1.13.12
dependabot[bot] Jul 16, 2024
5e6df9c
Merge pull request #104 from navikt/dependabot/gradle/io.mockk-mockk-…
LudvigHz Jul 29, 2024
dc8e59e
Merge pull request #103 from navikt/dependabot/gradle/com.expediagrou…
LudvigHz Jul 29, 2024
d496396
Bump com.sun.xml.ws:jaxws-ri from 4.0.2 to 4.0.3
dependabot[bot] Jul 31, 2024
83220a3
Merge pull request #105 from navikt/dependabot/gradle/com.sun.xml.ws-…
LudvigHz Jul 31, 2024
0430056
Bump org.jetbrains.kotlin.plugin.serialization from 2.0.0 to 2.0.10
dependabot[bot] Aug 7, 2024
edf5c48
Bump org.slf4j:jul-to-slf4j from 2.0.13 to 2.0.15
dependabot[bot] Aug 9, 2024
85d8faf
Merge pull request #109 from navikt/dependabot/gradle/org.slf4j-jul-t…
LudvigHz Aug 9, 2024
28aaff8
Merge pull request #107 from navikt/dependabot/gradle/org.jetbrains.k…
LudvigHz Aug 9, 2024
5047eaf
Bump jvm from 2.0.0 to 2.0.10
dependabot[bot] Aug 9, 2024
7fdf4b5
Merge pull request #106 from navikt/dependabot/gradle/jvm-2.0.10
LudvigHz Aug 9, 2024
a1154dc
Bump org.slf4j:jul-to-slf4j from 2.0.15 to 2.0.16
dependabot[bot] Aug 12, 2024
82279ab
Merge pull request #110 from navikt/dependabot/gradle/org.slf4j-jul-t…
LudvigHz Aug 12, 2024
6b14f91
Bump jvm from 2.0.10 to 2.0.20
dependabot[bot] Aug 23, 2024
1ee57f9
Merge pull request #112 from navikt/dependabot/gradle/jvm-2.0.20
LudvigHz Aug 26, 2024
68a1467
Bump org.jetbrains.kotlin.plugin.serialization from 2.0.10 to 2.0.20
dependabot[bot] Aug 26, 2024
38611ca
Merge pull request #111 from navikt/dependabot/gradle/org.jetbrains.k…
LudvigHz Aug 26, 2024
d3714df
Gi tilgang til rpa-saf-tiltakspenger
LudvigHz Aug 27, 2024
6d211a2
Bump com.expediagroup.graphql from 7.1.4 to 8.0.0
dependabot[bot] Aug 28, 2024
5dfb515
Merge pull request #114 from navikt/dependabot/gradle/com.expediagrou…
LudvigHz Aug 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .nais/dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
labels:
team: personoversikt
spec:
image: {{image}}
image: "{{image}}"
port: 7070
liveness:
path: /internal/isAlive
Expand Down Expand Up @@ -60,6 +60,9 @@ spec:
- application: rpa-medlemskap-og-avgift
namespace: team-rpa
cluster: dev-fss
- application: rpa-saf-tiltakspenger
namespace: team-rpa
cluster: dev-fss
- application: ida
cluster: prod-fss
namespace: traktor
Expand Down
12 changes: 6 additions & 6 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ val graphql_kotlin_version: String by project

plugins {
application
kotlin("jvm") version "2.0.0"
id("org.jetbrains.kotlin.plugin.serialization") version "2.0.0"
kotlin("jvm") version "2.0.20"
id("org.jetbrains.kotlin.plugin.serialization") version "2.0.20"
id("com.github.johnrengelman.shadow") version "8.1.1"
id("com.expediagroup.graphql") version "7.1.1"
id("com.expediagroup.graphql") version "8.0.0"
}

group = "no.nav"
Expand Down Expand Up @@ -77,8 +77,8 @@ dependencies {
implementation("no.nav.common:cxf:$nav_common_version")
implementation("no.nav.common:client:$nav_common_version")
implementation("no.nav.common:log:$nav_common_version")
implementation("org.slf4j:jul-to-slf4j:2.0.13")
implementation("com.sun.xml.ws:jaxws-ri:4.0.2")
implementation("org.slf4j:jul-to-slf4j:2.0.16")
implementation("com.sun.xml.ws:jaxws-ri:4.0.3")
implementation("io.micrometer:micrometer-registry-prometheus:$prometeus_version")
implementation("ch.qos.logback:logback-classic:$logback_version")
implementation("net.logstash.logback:logstash-logback-encoder:$logstash_version")
Expand All @@ -87,7 +87,7 @@ dependencies {
implementation("io.ktor:ktor-server-core-jvm:2.3.12")
implementation("io.ktor:ktor-server-swagger-jvm:2.3.12")

testImplementation("io.mockk:mockk:1.13.11")
testImplementation("io.mockk:mockk:1.13.12")
testImplementation("io.ktor:ktor-server-tests:2.3.12")
testImplementation("io.ktor:ktor-client-mock:$ktor_version")
testImplementation("org.junit.jupiter:junit-jupiter:$junit_version")
Expand Down