Skip to content

Commit

Permalink
delvis felles dependency versjonering
Browse files Browse the repository at this point in the history
  • Loading branch information
dagframstad committed Sep 21, 2023
1 parent aa3815b commit 9ef3b77
Show file tree
Hide file tree
Showing 5 changed files with 92 additions and 54 deletions.
34 changes: 17 additions & 17 deletions cpa-repo/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -18,23 +18,23 @@ tasks {
}

dependencies {
implementation(project(":felles"))
implementation("io.ktor:ktor-server-core:2.3.4")
implementation("io.ktor:ktor-server-netty:2.3.4")
implementation("com.github.labai:labai-jsr305x-annotations:0.0.2")
implementation("jakarta.xml.bind:jakarta.xml.bind-api:4.0.0", )
implementation("org.glassfish.jaxb:jaxb-runtime:2.4.0-b180830.0438")
implementation("no.nav.emottak:ebxml-protokoll:0.0.4")
implementation("com.zaxxer:HikariCP:5.0.1")
implementation("org.flywaydb:flyway-core:9.16.3")
implementation("org.jetbrains.exposed:exposed-core:0.43.0")
implementation("org.jetbrains.exposed:exposed-dao:0.43.0")
implementation("org.jetbrains.exposed:exposed-jdbc:0.43.0")
implementation("org.jetbrains.exposed:exposed-java-time:0.43.0")
implementation("ch.qos.logback:logback-classic:1.4.11")
implementation("io.ktor:ktor-serialization-kotlinx-json:2.3.4")
testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.1")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.1")
api(project(":felles"))
implementation(libs.ktor.server.core)
implementation(libs.ktor.server.netty)
implementation(libs.labai.jsr305x.annotations)
implementation(libs.jakarta.xml.bind.api)
implementation(libs.jaxb.runtime)
implementation(libs.ebxml.protokoll)
implementation(libs.hikari)
implementation(libs.flyway.core)
implementation(libs.exposed.core)
implementation(libs.exposed.dao)
implementation(libs.exposed.jdbc)
implementation(libs.exposed.java.time)
implementation(libs.logback.classic)
implementation(libs.ktor.serialization.kotlinx.json)
testImplementation(testLibs.junit.jupiter.api)
testRuntimeOnly(testLibs.junit.jupiter.engine)

runtimeOnly("org.postgresql:postgresql:42.6.0")
}
Expand Down
31 changes: 14 additions & 17 deletions ebms-provider/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -24,24 +24,21 @@ tasks.test {

dependencies {
implementation(project(":felles"))
implementation("io.ktor:ktor-server-core:2.3.4")
implementation("io.ktor:ktor-server-netty:2.3.4")
implementation("com.github.labai:labai-jsr305x-annotations:0.0.2")
implementation("jakarta.xml.bind:jakarta.xml.bind-api:4.0.0", )
implementation("org.glassfish.jaxb:jaxb-runtime:2.4.0-b180830.0438")
implementation("com.zaxxer:HikariCP:5.0.1")
implementation("org.flywaydb:flyway-core:9.16.3")
implementation("org.jetbrains.exposed:exposed-core:0.43.0")
implementation("org.jetbrains.exposed:exposed-dao:0.43.0")
implementation("org.jetbrains.exposed:exposed-jdbc:0.43.0")
implementation("org.jetbrains.exposed:exposed-java-time:0.43.0")
implementation(libs.ktor.server.core)
implementation(libs.ktor.server.netty)
implementation(libs.labai.jsr305x.annotations)
implementation(libs.jakarta.xml.bind.api)
implementation(libs.jaxb.runtime)
implementation(libs.hikari)
implementation(libs.flyway.core)
implementation(libs.exposed.core)
implementation(libs.exposed.dao)
implementation(libs.exposed.jdbc)
implementation(libs.exposed.java.time)
//implementation("org.glassfish.jaxb:jaxb-runtime:4.0.3") // TODO: Latest. Krever at protokoll oppdateres
implementation("no.nav.emottak:ebxml-protokoll:0.0.4")
testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.1")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.1")

runtimeOnly("org.postgresql:postgresql:42.6.0")

implementation(libs.ebxml.protokoll)
testImplementation(testLibs.junit.jupiter.api)
testRuntimeOnly(testLibs.junit.jupiter.engine)
}

application {
Expand Down
18 changes: 9 additions & 9 deletions felles/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ tasks.register<Wrapper>("wrapper") {
}

dependencies {
implementation("no.nav.emottak:ebxml-protokoll:0.0.4")
implementation("com.zaxxer:HikariCP:5.0.1")
implementation("org.flywaydb:flyway-core:9.16.3")
implementation("ch.qos.logback:logback-classic:1.4.11")
implementation("io.ktor:ktor-serialization-kotlinx-json:2.3.4")
api("org.bouncycastle:bcprov-jdk18on:1.76")
api("org.bouncycastle:bcpkix-jdk18on:1.76")
testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.1")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.1")
implementation(libs.ebxml.protokoll)
implementation(libs.hikari)
implementation(libs.flyway.core)
implementation(libs.logback.classic)
implementation(libs.ktor.serialization.kotlinx.json)
api(libs.bcprov.jdk18on)
api(libs.bcpkix.jdk18on)
testImplementation(testLibs.junit.jupiter.api)
testRuntimeOnly(testLibs.junit.jupiter.engine)

runtimeOnly("org.postgresql:postgresql:42.6.0")
}
Expand Down
22 changes: 11 additions & 11 deletions payload-processor/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -23,20 +23,20 @@ tasks {

dependencies {
implementation(project(":felles"))
implementation("io.ktor:ktor-server-core:2.3.4")
implementation("io.ktor:ktor-server-netty:2.3.4")
implementation("io.ktor:ktor-server-call-logging-jvm:2.3.4")
implementation("io.ktor:ktor-server-content-negotiation:2.3.4")
implementation("io.ktor:ktor-serialization-kotlinx-json:2.3.4")
implementation("io.ktor:ktor-client-core:2.3.4")
implementation("io.ktor:ktor-client-cio:2.3.4")
implementation("jakarta.xml.bind:jakarta.xml.bind-api:4.0.0", )
implementation(libs.ktor.server.core)
implementation(libs.ktor.server.netty)
implementation(libs.ktor.server.call.logging.jvm)
implementation(libs.ktor.server.content.negotiation)
implementation(libs.ktor.serialization.kotlinx.json)
implementation(libs.ktor.client.core)
implementation(libs.ktor.client.cio)
implementation(libs.jakarta.xml.bind.api)
implementation("org.glassfish.jaxb:jaxb-runtime:4.0.3")
implementation("ch.qos.logback:logback-classic:1.4.11")
implementation(libs.logback.classic)
implementation("io.micrometer:micrometer-registry-prometheus:1.11.3")

testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.1")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.1")
testImplementation(testLibs.junit.jupiter.api)
testRuntimeOnly(testLibs.junit.jupiter.engine)
implementation(kotlin("stdlib-jdk8"))
}

Expand Down
41 changes: 41 additions & 0 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,47 @@
*/

dependencyResolutionManagement {

versionCatalogs {
create("libs") {
version("bouncycastle", "1.76")
version("exposed", "0.43.0")
version("ktor", "2.3.4")

library("bcpkix-jdk18on", "org.bouncycastle", "bcpkix-jdk18on").versionRef("bouncycastle")
library("bcprov-jdk18on", "org.bouncycastle", "bcprov-jdk18on").versionRef("bouncycastle")

library("exposed-core", "org.jetbrains.exposed", "exposed-core").versionRef("exposed")
library("exposed-dao", "org.jetbrains.exposed", "exposed-dao").versionRef("exposed")
library("exposed-java-time", "org.jetbrains.exposed", "exposed-java-time").versionRef("exposed")
library("exposed-jdbc", "org.jetbrains.exposed", "exposed-jdbc").versionRef("exposed")

library("ktor-server-core", "io.ktor", "ktor-server-core").versionRef("ktor")
library("ktor-server-netty", "io.ktor", "ktor-server-netty").versionRef("ktor")
library("ktor-server-call-logging-jvm", "io.ktor", "ktor-server-call-logging-jvm").versionRef("ktor")
library("ktor-server-content-negotiation", "io.ktor", "ktor-server-content-negotiation").versionRef("ktor")
library("ktor-serialization-kotlinx-json", "io.ktor", "ktor-serialization-kotlinx-json").versionRef("ktor")
library("ktor-client-core", "io.ktor", "ktor-client-core").versionRef("ktor")
library("ktor-client-cio", "io.ktor", "ktor-client-cio").versionRef("ktor")

library("logback-classic", "ch.qos.logback:logback-classic:1.4.11")
library("hikari", "com.zaxxer:HikariCP:5.0.1")
library("labai-jsr305x-annotations", "com.github.labai:labai-jsr305x-annotations:0.0.2")
library("jakarta.xml.bind-api", "jakarta.xml.bind:jakarta.xml.bind-api:4.0.0")
library("ebxml-protokoll", "no.nav.emottak:ebxml-protokoll:0.0.4")
library("flyway-core", "org.flywaydb:flyway-core:9.16.3")
library("jaxb-runtime", "org.glassfish.jaxb:jaxb-runtime:2.4.0-b180830.0438")
}

create("testLibs") {
version("junit", "5.9.2")

library("junit-jupiter-api", "org.junit.jupiter", "junit-jupiter-api").versionRef("junit")
library("junit-jupiter-engine", "org.junit.jupiter", "junit-jupiter-engine").versionRef("junit")
}
}


repositories {
mavenCentral()
maven {
Expand Down

0 comments on commit 9ef3b77

Please sign in to comment.