diff --git a/back001/app/build.gradle.kts b/back001/app/build.gradle.kts index 1321845..5b17d6e 100644 --- a/back001/app/build.gradle.kts +++ b/back001/app/build.gradle.kts @@ -24,11 +24,12 @@ dependencies { implementation("org.springframework.boot:spring-boot-starter-oauth2-resource-server") implementation("org.springframework.boot:spring-boot-starter-data-redis") implementation("org.flywaydb:flyway-core") - implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.5.0") + implementation("org.flywaydb:flyway-database-postgresql") + implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.7.0") implementation("io.micrometer:micrometer-registry-prometheus") implementation("io.micrometer:micrometer-tracing-bridge-otel") - implementation("io.opentelemetry:opentelemetry-exporter-otlp:1.38.0") - implementation("software.amazon.awssdk:s3:2.25.63") + implementation("io.opentelemetry:opentelemetry-exporter-otlp:1.46.0") + implementation("software.amazon.awssdk:s3:2.29.52") runtimeOnly("org.postgresql:postgresql") diff --git a/back001/build.gradle.kts b/back001/build.gradle.kts index 06557c2..a8a9e0f 100644 --- a/back001/build.gradle.kts +++ b/back001/build.gradle.kts @@ -3,11 +3,11 @@ import org.gradle.api.plugins.JavaPluginExtension import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - kotlin("jvm") version "1.9.23" apply false - kotlin("plugin.spring") version "1.9.23" apply false - kotlin("plugin.jpa") version "1.9.23" apply false - id("org.springframework.boot") version "3.2.5" apply false - id("io.spring.dependency-management") version "1.1.4" apply false + kotlin("jvm") version "1.9.25" apply false + kotlin("plugin.spring") version "1.9.25" apply false + kotlin("plugin.jpa") version "1.9.25" apply false + id("org.springframework.boot") version "3.4.1" apply false + id("io.spring.dependency-management") version "1.1.7" apply false } allprojects { @@ -23,14 +23,14 @@ subprojects { plugins.withId("io.spring.dependency-management") { the().apply { imports { - mavenBom("org.springframework.boot:spring-boot-dependencies:3.2.5") + mavenBom("org.springframework.boot:spring-boot-dependencies:3.4.1") } } } tasks.withType { kotlinOptions { - jvmTarget = "21" + jvmTarget = "17" freeCompilerArgs = listOf("-Xjsr305=strict") } } @@ -38,14 +38,14 @@ subprojects { plugins.withId("java") { extensions.configure { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(17)) } } } plugins.withId("org.jetbrains.kotlin.jvm") { extensions.configure { - jvmToolchain(21) + jvmToolchain(17) } } diff --git a/back001/docker-compose.yml b/back001/docker-compose.yml index d5ac6f1..5094449 100644 --- a/back001/docker-compose.yml +++ b/back001/docker-compose.yml @@ -1,6 +1,6 @@ services: postgres: - image: postgres:16 + image: postgres:17 environment: POSTGRES_DB: mosenioring POSTGRES_USER: mosenioring @@ -11,7 +11,7 @@ services: - pgdata:/var/lib/postgresql/data keycloak: - image: quay.io/keycloak/keycloak:22.0.5 + image: quay.io/keycloak/keycloak:26.0.8 command: start-dev --import-realm environment: KEYCLOAK_ADMIN: admin @@ -22,18 +22,18 @@ services: - ./docker/keycloak/realm.json:/opt/keycloak/data/import/realm.json:ro rabbitmq: - image: rabbitmq:3.12-management + image: rabbitmq:3.13-management ports: - "5672:5672" - "15672:15672" redis: - image: redis:7 + image: redis:7.4 ports: - "6379:6379" minio: - image: minio/minio:RELEASE.2024-04-06T05-26-02Z + image: minio/minio:latest environment: MINIO_ROOT_USER: minio MINIO_ROOT_PASSWORD: minio123 diff --git a/back001/gradle/wrapper/gradle-wrapper.properties b/back001/gradle/wrapper/gradle-wrapper.properties index b82aa23..cea7a79 100644 --- a/back001/gradle/wrapper/gradle-wrapper.properties +++ b/back001/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME