Skip to content

Commit

Permalink
Definér klientavhengighetene i appene de brukes i (#804)
Browse files Browse the repository at this point in the history
* Definér klientavhengighetene i appene de brukes i

* Formater
  • Loading branch information
bjerga authored Dec 10, 2024
1 parent 497d961 commit e7c3fd3
Show file tree
Hide file tree
Showing 11 changed files with 63 additions and 50 deletions.
1 change: 1 addition & 0 deletions aareg/gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
aaregClientVersion=0.7.0
2 changes: 2 additions & 0 deletions altinn/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
altinnClientVersion=0.4.0
maskinportenClientVersion=0.1.9
mockwebserverVersion=5.0.0-alpha.14
nimbusJoseJwtVersion=9.47
1 change: 1 addition & 0 deletions bro-spinn/gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
spinnInntektsmeldingKontraktVersion=2023.10.13-04-47-c372d
1 change: 1 addition & 0 deletions brreg/gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
brregKlientVersion=0.5.0
11 changes: 0 additions & 11 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,3 @@ ktorVersion=2.3.12
mockkVersion=1.13.13
tokenProviderVersion=0.4.0
utilsVersion=0.9.0

# Client dependency versions
aaregClientVersion=0.7.0
altinnClientVersion=0.4.0
maskinportenClientVersion=0.1.9
arbeidsgiverNotifikasjonKlientVersion=3.3.2
brregKlientVersion=0.5.0
dokarkivKlientVersion=0.3.1
inntektKlientVersion=0.4.0
pdlKlientVersion=0.6.2
spinnInntektsmeldingKontraktVersion=2023.10.13-04-47-c372d
1 change: 1 addition & 0 deletions inntekt/gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
inntektKlientVersion=0.4.0
91 changes: 54 additions & 37 deletions integrasjonstest/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,49 +1,65 @@
val aaregClientVersion: String by project
val altinnClientVersion: String by project
val arbeidsgiverNotifikasjonKlientVersion: String by project
val bakgrunnsjobbVersion: String by project
val brregKlientVersion: String by project
val dokarkivKlientVersion: String by project
val inntektKlientVersion: String by project
import java.util.Properties

val apps =
setOf(
"aareg",
"aktiveorgnrservice",
"altinn",
"api",
"berik-inntektsmelding-service",
"bro-spinn",
"brreg",
"db",
"distribusjon",
"feil-behandler",
"forespoersel-besvart",
"forespoersel-forkastet",
"forespoersel-infotrygd",
"forespoersel-marker-besvart",
"forespoersel-mottatt",
"helsebro",
"innsending",
"inntekt",
"inntekt-selvbestemt-service",
"inntektservice",
"joark",
"notifikasjon",
"pdl",
"selvbestemt-hent-im-service",
"selvbestemt-lagre-im-service",
"tilgangservice",
"trengerservice",
)

val props = Properties()
apps
.map { file("../$it/gradle.properties") }
.filter { it.exists() }
.forEach { file ->
file.inputStream().use { props.load(it) }
}

val aaregClientVersion: String by props
val altinnClientVersion: String by props
val arbeidsgiverNotifikasjonKlientVersion: String by props
val bakgrunnsjobbVersion: String by props
val brregKlientVersion: String by props
val dokarkivKlientVersion: String by props
val inntektKlientVersion: String by props
val pdlKlientVersion: String by props

val junitJupiterVersion: String by project
val pdlKlientVersion: String by project
val testcontainersRedisJunitVersion: String by project
val testcontainersVersion: String by project

dependencies {
testImplementation(project(":aareg"))
testImplementation(project(":aktiveorgnrservice"))
testImplementation(project(":altinn"))
testImplementation(project(":api"))
testImplementation(project(":bro-spinn"))
testImplementation(project(":brreg"))
testImplementation(project(":db"))
testImplementation(project(":distribusjon"))
testImplementation(project(":forespoersel-besvart"))
testImplementation(project(":forespoersel-forkastet"))
testImplementation(project(":forespoersel-infotrygd"))
testImplementation(project(":forespoersel-marker-besvart"))
testImplementation(project(":forespoersel-mottatt"))
testImplementation(project(":helsebro"))
testImplementation(project(":innsending"))
testImplementation(project(":inntekt"))
testImplementation(project(":inntekt-selvbestemt-service"))
testImplementation(project(":inntektservice"))
testImplementation(project(":joark"))
testImplementation(project(":notifikasjon"))
testImplementation(project(":pdl"))
testImplementation(project(":selvbestemt-hent-im-service"))
testImplementation(project(":selvbestemt-lagre-im-service"))
testImplementation(project(":tilgangservice"))
testImplementation(project(":trengerservice"))
testImplementation(project(":berik-inntektsmelding-service"))
testImplementation(project(":feil-behandler"))
apps.forEach {
testImplementation(project(":$it"))
}

testImplementation(project(":felles"))
testImplementation(project(":felles-db-exposed"))

testImplementation("no.nav.helsearbeidsgiver:hag-bakgrunnsjobb:$bakgrunnsjobbVersion")

testImplementation(testFixtures(project(":felles")))
testImplementation(testFixtures(project(":felles-db-exposed")))

Expand All @@ -57,6 +73,7 @@ dependencies {
testImplementation("no.nav.helsearbeidsgiver:pdl-client:$pdlKlientVersion")

testImplementation("com.redis.testcontainers:testcontainers-redis-junit:$testcontainersRedisJunitVersion")
testImplementation("no.nav.helsearbeidsgiver:hag-bakgrunnsjobb:$bakgrunnsjobbVersion")
testImplementation("org.junit.jupiter:junit-jupiter:$junitJupiterVersion")
testImplementation("org.testcontainers:kafka:$testcontainersVersion")
testImplementation("org.testcontainers:postgresql:$testcontainersVersion")
Expand Down
2 changes: 0 additions & 2 deletions integrasjonstest/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# Dependency versions
bakgrunnsjobbVersion=1.0.4
junitJupiterVersion=5.11.3
testcontainersRedisJunitVersion=1.6.4
testcontainersVersion=1.20.3
1 change: 1 addition & 0 deletions joark/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
dokarkivKlientVersion=0.3.1
hagImXmlKontraktVersion=1.0.8
jacksonVersion=2.14.2
jaxbAPIVersion=2.3.1
Expand Down
1 change: 1 addition & 0 deletions notifikasjon/gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
arbeidsgiverNotifikasjonKlientVersion=3.3.2
1 change: 1 addition & 0 deletions pdl/gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
pdlKlientVersion=0.6.2

0 comments on commit e7c3fd3

Please sign in to comment.