From e33c7ebf78d1cddeb84069b88615749f6e59fdc7 Mon Sep 17 00:00:00 2001 From: Jan-Niclas Struewer <j.n.struewer@gmail.com> Date: Mon, 15 Jul 2024 14:11:15 +0200 Subject: [PATCH] version bumps --- .jpb/jpb-settings.xml | 6 ------ build.gradle.kts | 38 ++++++++++++++++++------------------- tools/db/docker-compose.yml | 3 +-- 3 files changed, 20 insertions(+), 27 deletions(-) delete mode 100644 .jpb/jpb-settings.xml diff --git a/.jpb/jpb-settings.xml b/.jpb/jpb-settings.xml deleted file mode 100644 index 9e8fa787..00000000 --- a/.jpb/jpb-settings.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="JpaPluginProjectSettings"> - <option name="lastSelectedLanguage" value="Kotlin"/> - </component> -</project> \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index 2c4a111b..b3e62a58 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,16 +1,16 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile -val springVersion = "3.2.0" +val springVersion = "3.3.1" plugins { - id("org.springframework.boot") version "3.2.0" - id("io.spring.dependency-management") version "1.1.4" - id("org.jetbrains.kotlin.plugin.allopen") version "1.9.21" + id("org.springframework.boot") version "3.3.1" + id("io.spring.dependency-management") version "1.1.6" + id("org.jetbrains.kotlin.plugin.allopen") version "2.0.20-Beta2" // id("io.gitlab.arturbosch.detekt").version("1.23.3") - kotlin("jvm") version "1.9.21" - kotlin("plugin.spring") version "1.9.21" - kotlin("plugin.jpa") version "1.9.21" - kotlin("plugin.serialization") version "1.9.21" + kotlin("jvm") version "2.0.0" + kotlin("plugin.spring") version "2.0.20-Beta2" + kotlin("plugin.jpa") version "2.0.20-Beta2" + kotlin("plugin.serialization") version "2.0.0" } allOpen { @@ -35,23 +35,23 @@ repositories { mavenCentral() } -val coroutineVersion = "1.7.3" -val ktorVersion = "2.3.7" +val coroutineVersion = "1.9.0-RC" +val ktorVersion = "2.3.12" dependencies { // detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.23.3") implementation("org.springframework.boot:spring-boot-starter-data-jpa:$springVersion") implementation("org.springframework.boot:spring-boot-starter-validation:$springVersion") implementation("org.springframework.boot:spring-boot-starter-security:$springVersion") implementation("org.springframework.boot:spring-boot-starter-webflux:$springVersion") - implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.16.0") - implementation("org.jetbrains.kotlin:kotlin-reflect:1.9.21") + implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.17.1") + implementation("org.jetbrains.kotlin:kotlin-reflect:2.0.0") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutineVersion") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-reactive:$coroutineVersion") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-reactor:$coroutineVersion") - implementation("org.springdoc:springdoc-openapi-starter-webflux-ui:2.2.0") - implementation("org.gitlab4j:gitlab4j-api:6.0.0-rc.3") - implementation("org.eclipse.jgit:org.eclipse.jgit:6.7.0.202309050840-r") - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.2") + implementation("org.springdoc:springdoc-openapi-starter-webflux-ui:2.5.0") + implementation("org.gitlab4j:gitlab4j-api:6.0.0-rc.5") + implementation("org.eclipse.jgit:org.eclipse.jgit:6.10.0.202406032230-r") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.1") implementation("org.springframework.boot:spring-boot-starter-actuator:$springVersion") implementation("io.ktor:ktor-client-core-jvm:$ktorVersion") implementation("io.ktor:ktor-client-cio-jvm:$ktorVersion") @@ -59,14 +59,14 @@ dependencies { implementation("io.ktor:ktor-serialization-kotlinx-json:$ktorVersion") implementation("com.auth0:java-jwt:4.4.0") developmentOnly("org.springframework.boot:spring-boot-devtools:$springVersion") - runtimeOnly("org.postgresql:postgresql:42.7.1") + runtimeOnly("org.postgresql:postgresql:42.7.3") testImplementation("org.springframework.boot:spring-boot-starter-test:$springVersion") { exclude(module = "mockito-core") exclude(group = "org.junit.vintage", module = "junit-vintage-engine") } - testImplementation("org.junit.jupiter:junit-jupiter-api:5.9.2") + testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.3") testImplementation("io.ktor:ktor-client-mock-jvm:$ktorVersion") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.2") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.3") testRuntimeOnly("com.h2database:h2:2.2.224") testImplementation("com.ninja-squad:springmockk:4.0.2") testImplementation("org.springframework.security:spring-security-test:6.1.5") diff --git a/tools/db/docker-compose.yml b/tools/db/docker-compose.yml index d22d179b..66c87ed4 100644 --- a/tools/db/docker-compose.yml +++ b/tools/db/docker-compose.yml @@ -1,7 +1,6 @@ -version: '3.7' services: crdb: - image: cockroachdb/cockroach:v23.1.13 + image: cockroachdb/cockroach:v24.1.2 restart: always environment: - COCKROACH_USER=sa -- GitLab