Skip to content

Commit

Permalink
Bump the gradle group with 6 updates (#1903)
Browse files Browse the repository at this point in the history
* Bump the gradle group with 6 updates

Bumps the gradle group with 6 updates:

| Package | From | To |
| --- | --- | --- |
| [org.flywaydb:flyway-core](https://github.com/flyway/flyway) | `9.22.3` | `10.7.2` |
| [com.fasterxml.jackson:jackson-bom](https://github.com/FasterXML/jackson-bom) | `2.16.0` | `2.16.1` |
| [org.junit.jupiter:junit-jupiter-api](https://github.com/junit-team/junit5) | `5.10.1` | `5.10.2` |
| [io.mockk:mockk](https://github.com/mockk/mockk) | `1.13.8` | `1.13.9` |
| [org.testcontainers:postgresql](https://github.com/testcontainers/testcontainers-java) | `1.19.3` | `1.19.5` |
| [org.jetbrains.kotlin.jvm](https://github.com/JetBrains/kotlin) | `1.9.21` | `1.9.22` |


Updates `org.flywaydb:flyway-core` from 9.22.3 to 10.7.2
- [Release notes](https://github.com/flyway/flyway/releases)
- [Commits](flyway/flyway@flyway-9.22.3...flyway-10.7.2)

Updates `com.fasterxml.jackson:jackson-bom` from 2.16.0 to 2.16.1
- [Commits](FasterXML/jackson-bom@jackson-bom-2.16.0...jackson-bom-2.16.1)

Updates `org.junit.jupiter:junit-jupiter-api` from 5.10.1 to 5.10.2
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](junit-team/junit5@r5.10.1...r5.10.2)

Updates `io.mockk:mockk` from 1.13.8 to 1.13.9
- [Release notes](https://github.com/mockk/mockk/releases)
- [Commits](mockk/mockk@1.13.8...1.13.9)

Updates `org.testcontainers:postgresql` from 1.19.3 to 1.19.5
- [Release notes](https://github.com/testcontainers/testcontainers-java/releases)
- [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md)
- [Commits](testcontainers/testcontainers-java@1.19.3...1.19.5)

Updates `org.jetbrains.kotlin.jvm` from 1.9.21 to 1.9.22
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md)
- [Commits](JetBrains/kotlin@v1.9.21...v1.9.22)

---
updated-dependencies:
- dependency-name: org.flywaydb:flyway-core
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: gradle
- dependency-name: com.fasterxml.jackson:jackson-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: gradle
- dependency-name: org.junit.jupiter:junit-jupiter-api
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: gradle
- dependency-name: io.mockk:mockk
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: gradle
- dependency-name: org.testcontainers:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: gradle
- dependency-name: org.jetbrains.kotlin.jvm
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: gradle
...

Signed-off-by: dependabot[bot] <[email protected]>

* Merging av flyway konfigurasjon etter modularisering i flyway

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Bjornar Askevold <[email protected]>
  • Loading branch information
dependabot[bot] and baskevold authored Feb 13, 2024
1 parent 28342d5 commit 838f562
Showing 1 changed file with 30 additions and 27 deletions.
57 changes: 30 additions & 27 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar

val mainClass = "no.nav.k9.los.K9LosKt"
val hikariVersion = "5.1.0"
val flywayVersion = "9.22.3"
val flywayVersion = "10.7.2"
val vaultJdbcVersion = "1.3.10"
val koinVersion = "3.5.3"
val kotliqueryVersion = "1.9.0"
val k9SakVersion = "4.1.8"
val k9KlageVersion = "0.4.3"
val fuelVersion = "2.3.1"
val jacksonVersion = "2.16.0"
val jacksonVersion = "2.16.1"
val commonsTextVersion = "1.11.0"

val dusseldorfKtorVersion = "4.1.3"
Expand All @@ -19,14 +19,14 @@ val kafkaVersion = "3.6.1"
val navTilgangskontroll = "3.2023.10.23_12.41-bafec3836d28"

// Test Dependencies
val testContainers = "1.19.3"
val testContainers = "1.19.5"
val jsonassertVersion = "1.5.1"
val jupiterVersion = "5.10.1"
val jupiterVersion = "5.10.2"
val assertkVersion = "0.28.0"
val mockkVersion = "1.13.8"
val mockkVersion = "1.13.9"

plugins {
id("org.jetbrains.kotlin.jvm") version "1.9.21"
id("org.jetbrains.kotlin.jvm") version "1.9.22"
id("com.github.johnrengelman.shadow") version "8.1.1"
}

Expand All @@ -40,7 +40,7 @@ dependencies {

// Database
implementation("com.zaxxer:HikariCP:$hikariVersion")
implementation("org.flywaydb:flyway-core:$flywayVersion")
implementation("org.flywaydb:flyway-database-postgresql:$flywayVersion")
implementation("no.nav:vault-jdbc:$vaultJdbcVersion")
implementation("com.github.seratch:kotliquery:$kotliqueryVersion")

Expand Down Expand Up @@ -124,30 +124,33 @@ java {
}
}

tasks.withType<ShadowJar> {
archiveBaseName.set("app")
archiveClassifier.set("")
isZip64 = true
manifest {
attributes(
mapOf(
"Main-Class" to mainClass
tasks {
withType<ShadowJar> {
archiveBaseName.set("app")
archiveClassifier.set("")
isZip64 = true
manifest {
attributes(
mapOf(
"Main-Class" to mainClass
)
)
)
}
mergeServiceFiles()
}
}

tasks.withType<Wrapper> {
gradleVersion = "8.4"
}
withType<Wrapper> {
gradleVersion = "8.6"
}

tasks.withType<Test> {
useJUnitPlatform()
// Always run tests, even when nothing changed.
dependsOn("cleanTest")
withType<Test> {
useJUnitPlatform()
// Always run tests, even when nothing changed.
dependsOn("cleanTest")

// Show test results.
testLogging {
events("passed", "skipped", "failed")
// Show test results.
testLogging {
events("passed", "skipped", "failed")
}
}
}

0 comments on commit 838f562

Please sign in to comment.