Skip to content

Commit 9cc9d75

Browse files
committed
Merge origin/main (Spring Boot 4, Jackson 3, Gradle 9.6)
The branch had not built or run CI since its first commit, because main moved to Spring Boot 4 underneath it. Four things in this changeset needed updating: - the Jackson Kotlin module moved to tools.jackson.module.kotlin - Sentry's Spring integration is now io.sentry.spring7 - AutoConfigureMockMvc moved to org.springframework.boot.webmvc.test.autoconfigure - JsonNode no longer maps as a plain Iterable, so the session id list reads through values() The schema conflict is both sides appending changesets; main's run first, as they already have in production. The translation files were regenerated rather than hand-merged.
2 parents e817ff0 + 10d26c8 commit 9cc9d75

450 files changed

Lines changed: 6854 additions & 2927 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/actions/setup-env/action.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ runs:
3232
if: "${{ inputs.java == 'true' }}"
3333
uses: actions/setup-java@v4
3434
with:
35-
java-version: 21
35+
java-version: 25
3636
distribution: temurin
3737

3838
- name: Setup Gradle

.github/workflows/prerelease-alpha.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414

1515
- uses: actions/setup-java@v3
1616
with:
17-
java-version: 21
17+
java-version: 25
1818
distribution: adopt
1919

2020
- name: Setup node

.github/workflows/preview.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616

1717
- uses: actions/setup-java@v3
1818
with:
19-
java-version: 21
19+
java-version: 25
2020
distribution: adopt
2121

2222
- name: Setup node

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818

1919
- uses: actions/setup-java@v3
2020
with:
21-
java-version: 21
21+
java-version: 25
2222
distribution: adopt
2323

2424
- name: Setup node

CHANGELOG.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
## [3.216.2](https://github.com/tolgee/tolgee-platform/compare/v3.216.1...v3.216.2) (2026-08-04)
2+
3+
4+
### Bug Fixes
5+
6+
* default isBatch on the legacy translate endpoint under Jackson 3 ([#3840](https://github.com/tolgee/tolgee-platform/issues/3840)) ([748f7c1](https://github.com/tolgee/tolgee-platform/commit/748f7c1f3e8ab103097b5516290558b4e684fb08)), closes [#3804](https://github.com/tolgee/tolgee-platform/issues/3804)
7+
8+
## [3.216.1](https://github.com/tolgee/tolgee-platform/compare/v3.216.0...v3.216.1) (2026-08-04)
9+
10+
11+
### Bug Fixes
12+
13+
* strip structural newlines from plural source in AI translator prompt ([#3830](https://github.com/tolgee/tolgee-platform/issues/3830)) ([b435134](https://github.com/tolgee/tolgee-platform/commit/b435134d8640d093865707f2e30122bcad6d8b46))
14+
115
# [3.216.0](https://github.com/tolgee/tolgee-platform/compare/v3.215.0...v3.216.0) (2026-08-03)
216

317

backend/api/build.gradle

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ apply plugin: 'io.spring.dependency-management'
2727

2828
java {
2929
toolchain {
30-
languageVersion = JavaLanguageVersion.of(21)
30+
languageVersion = JavaLanguageVersion.of(javaVersion.toInteger())
3131
}
3232
}
3333

3434
kotlin {
3535
compilerOptions {
36-
freeCompilerArgs.addAll("-Xjsr305=strict")
36+
freeCompilerArgs.addAll("-Xjsr305=strict", "-Xannotation-default-target=param-property")
3737
}
3838
}
3939

@@ -59,6 +59,7 @@ dependencies {
5959
implementation libs.springDocWebmvcApi
6060
implementation libs.springDocOpenApiUi
6161
implementation libs.redissonSpringBootStarter
62+
implementation libs.redissonSpringCache
6263

6364
/**
6465
* Misc

backend/api/src/main/kotlin/io/tolgee/api/v2/controllers/suggestion/MtResultStreamer.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package io.tolgee.api.v2.controllers.suggestion
22

3-
import com.fasterxml.jackson.databind.ObjectMapper
43
import io.sentry.Sentry
54
import io.tolgee.constants.MtServiceType
65
import io.tolgee.dtos.cacheable.ProjectDto
@@ -27,6 +26,7 @@ import kotlinx.coroutines.runBlocking
2726
import org.springframework.context.ApplicationContext
2827
import org.springframework.security.core.context.SecurityContextHolder
2928
import org.springframework.web.servlet.mvc.method.annotation.StreamingResponseBody
29+
import tools.jackson.databind.ObjectMapper
3030
import java.io.OutputStream
3131
import java.io.OutputStreamWriter
3232

backend/api/src/main/kotlin/io/tolgee/component/EnumNameKryo5Codec.kt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,11 @@ class EnumNameKryo5Codec : Kryo5Codec {
1010
/** Redisson reflectively requires a `(ClassLoader, <this exact type>)` constructor to rebind the codec. */
1111
constructor(classLoader: ClassLoader?, codec: EnumNameKryo5Codec) : super(classLoader, codec)
1212

13-
override fun createKryo(classLoader: ClassLoader?): Kryo {
14-
return super.createKryo(classLoader).apply {
13+
override fun createKryo(
14+
classLoader: ClassLoader?,
15+
useReferences: Boolean,
16+
): Kryo {
17+
return super.createKryo(classLoader, useReferences).apply {
1518
addDefaultSerializer(Enum::class.java, EnumNameSerializer::class.java)
1619
}
1720
}

backend/api/src/main/kotlin/io/tolgee/component/KeyComplexEditHelper.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package io.tolgee.component
22

3-
import com.fasterxml.jackson.databind.ObjectMapper
43
import io.tolgee.activity.ActivityHolder
54
import io.tolgee.activity.data.ActivityType
65
import io.tolgee.constants.Message
@@ -28,6 +27,7 @@ import io.tolgee.util.executeInNewRepeatableTransaction
2827
import org.springframework.context.ApplicationContext
2928
import org.springframework.transaction.PlatformTransactionManager
3029
import org.springframework.transaction.TransactionDefinition
30+
import tools.jackson.databind.ObjectMapper
3131
import kotlin.properties.Delegates
3232

3333
class KeyComplexEditHelper(

backend/api/src/main/kotlin/io/tolgee/component/ProjectLastModifiedManager.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class ProjectLastModifiedManager(
3636
* - Cache-Control header set to max-age=0 to ensure validation on each request
3737
*
3838
*/
39-
fun <T> onlyWhenProjectDataChanged(
39+
fun <T : Any> onlyWhenProjectDataChanged(
4040
request: WebRequest,
4141
fn: (
4242
/**

0 commit comments

Comments
 (0)