diff --git a/backend/data/src/main/kotlin/io/tolgee/configuration/MetricsConfiguration.kt b/backend/data/src/main/kotlin/io/tolgee/configuration/MetricsConfiguration.kt index 1fe35b12b4..99eb6639b4 100644 --- a/backend/data/src/main/kotlin/io/tolgee/configuration/MetricsConfiguration.kt +++ b/backend/data/src/main/kotlin/io/tolgee/configuration/MetricsConfiguration.kt @@ -1,8 +1,8 @@ package io.tolgee.configuration import io.micrometer.core.instrument.MeterRegistry -import io.micrometer.prometheus.PrometheusConfig -import io.micrometer.prometheus.PrometheusMeterRegistry +import io.micrometer.prometheusmetrics.PrometheusConfig +import io.micrometer.prometheusmetrics.PrometheusMeterRegistry import org.springframework.context.annotation.Bean import org.springframework.context.annotation.Configuration diff --git a/backend/data/src/main/kotlin/io/tolgee/model/dataImport/ImportFile.kt b/backend/data/src/main/kotlin/io/tolgee/model/dataImport/ImportFile.kt index 979fbb10e5..5202c0f4b1 100644 --- a/backend/data/src/main/kotlin/io/tolgee/model/dataImport/ImportFile.kt +++ b/backend/data/src/main/kotlin/io/tolgee/model/dataImport/ImportFile.kt @@ -17,7 +17,7 @@ class ImportFile( @field:Size(max = 2000) @Column(length = 2000) var name: String?, - @ManyToOne(optional = false) + @field:ManyToOne(optional = false) val import: Import, ) : StandardAuditModel() { @OneToMany(mappedBy = "file", orphanRemoval = true) diff --git a/gradle.properties b/gradle.properties index 44e057a471..921f95549a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,8 +1,8 @@ kotlinVersion=1.9.21 -springBootVersion=3.1.5 +springBootVersion=3.3.3 springDocVersion=2.3.0 jjwtVersion=0.11.2 -hibernateVersion=6.4.1.Final +hibernateVersion=6.5.2.Final amazonAwsSdkVersion=2.20.8 springDependencyManagementVersion=1.0.11.RELEASE org.gradle.jvmargs=-Xmx6g -Dkotlin.daemon.jvm.options=-Xmx6g diff --git a/settings.gradle b/settings.gradle index f1edc57be3..345e8ee887 100644 --- a/settings.gradle +++ b/settings.gradle @@ -67,7 +67,7 @@ dependencyResolutionManagement { library('hibernateTypes', "io.hypersistence:hypersistence-utils-hibernate-63:3.7.0") library('redissonSpringBootStarter', "org.redisson:redisson-spring-boot-starter:3.26.0") library('postHog', 'com.posthog.java:posthog:1.1.1') - library('micrometerPrometheus', "io.micrometer:micrometer-registry-prometheus:1.9.12") + library('micrometerPrometheus', "io.micrometer:micrometer-registry-prometheus:1.13.3") library('mailjet', "com.mailjet:mailjet-client:5.2.5") library('azureBlob', 'com.azure.spring:spring-cloud-azure-starter-storage-blob:5.11.0') library('slackApiClient', "com.slack.api:slack-api-client:$slackSdkVersion")