Commit 9cc9d75
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.450 files changed
Lines changed: 6854 additions & 2927 deletions
File tree
- .github
- actions/setup-env
- workflows
- backend
- api
- src/main/kotlin/io/tolgee
- api/v2/controllers/suggestion
- component
- configuration
- controllers
- hateoas
- ee
- websocket
- app
- src
- main
- kotlin/io/tolgee
- component
- configuration
- openApi
- health
- mcp
- tools
- resources
- test
- kotlin/io/tolgee
- activity
- api/v2/controllers
- administration
- batch
- configurationProps
- machineTranslation
- notification
- organizationController
- translationSuggestionController
- translations
- v2TranslationsController
- v2ExportController
- v2ImportController
- v2KeyController
- v2ProjectsController
- v2ScreenshotController
- autoTranslating
- automation
- batch
- controllers
- internal
- resetPassword
- jobs/migration/allOrganizationOwner
- openapi
- security
- rateLimits
- session
- service
- project
- resources
- data
- src
- main
- kotlin/io/tolgee
- activity
- data
- iterceptor
- batch
- processors
- component
- automations/processors
- contentDelivery/cachePurging
- azureFrontDoor
- cloudflare
- eventListeners
- machineTranslation/providers
- configuration
- tolgee
- development/testDataBuilder
- data
- dtos/contentDelivery
- formats
- apple
- in/xcstrings
- out
- flutter
- in
- out
- genericStructuredFile/out
- json
- in
- out
- yaml
- in
- out
- jobs/migration
- allOrganizationOwner
- translationStats
- model
- branching
- contentDelivery
- dataImport
- keyBigMeta
- task
- translationMemory
- webhook
- pubSub
- repository
- activity
- contentDelivery
- dataImport
- translation
- security
- authentication
- thirdParty
- service
- dataImport
- export
- key
- organization
- projectExportImport
- sidechannel
- project
- queryBuilders
- translationViewBuilder
- task
- translation
- util
- resources
- db/changelog
- test/kotlin/io/tolgee
- pubSub
- service/projectExportImport
- unit
- activity
- formats
- android/out
- apple
- in
- out
- fluttter
- in
- out
- i18next
- in
- out
- json
- in
- out
- po/in
- properties/out
- yaml
- in
- out
- util
- util
- development
- ktlint
- misc
- src/main/kotlin/io/tolgee/fixtures
- security
- testing
- src/main/kotlin/io/tolgee
- fixtures
- testing
- assertions
- util
- docker/app
- ee/backend
- app
- src/main
- kotlin/io/tolgee/ee
- api/v2
- controllers
- qa
- slack
- hateoas/model/prompt
- component
- llm
- slackIntegration
- configuration
- data
- glossary
- label
- qa
- model
- repository
- branching
- glossary
- service
- eeSubscription
- glossary
- prompt
- qa
- slackIntegration
- resources/db/changelog
- tests
- src/test
- kotlin/io/tolgee/ee
- api/v2/controllers
- activity
- branching
- glossary
- qa
- task
- translationMemory
- projectExportImport
- selfHostedLimitsAndReporting
- service
- glossary
- qa
- translationMemory
- slack
- unit
- resources
- gradle
- wrapper
- webapp/src
- i18n
- service
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
32 | 32 | | |
33 | 33 | | |
34 | 34 | | |
35 | | - | |
| 35 | + | |
36 | 36 | | |
37 | 37 | | |
38 | 38 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
14 | 14 | | |
15 | 15 | | |
16 | 16 | | |
17 | | - | |
| 17 | + | |
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
16 | 16 | | |
17 | 17 | | |
18 | 18 | | |
19 | | - | |
| 19 | + | |
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
21 | | - | |
| 21 | + | |
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
1 | 15 | | |
2 | 16 | | |
3 | 17 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
27 | 27 | | |
28 | 28 | | |
29 | 29 | | |
30 | | - | |
| 30 | + | |
31 | 31 | | |
32 | 32 | | |
33 | 33 | | |
34 | 34 | | |
35 | 35 | | |
36 | | - | |
| 36 | + | |
37 | 37 | | |
38 | 38 | | |
39 | 39 | | |
| |||
59 | 59 | | |
60 | 60 | | |
61 | 61 | | |
| 62 | + | |
62 | 63 | | |
63 | 64 | | |
64 | 65 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
4 | 3 | | |
5 | 4 | | |
6 | 5 | | |
| |||
27 | 26 | | |
28 | 27 | | |
29 | 28 | | |
| 29 | + | |
30 | 30 | | |
31 | 31 | | |
32 | 32 | | |
| |||
Lines changed: 5 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
13 | | - | |
14 | | - | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
15 | 18 | | |
16 | 19 | | |
17 | 20 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
4 | 3 | | |
5 | 4 | | |
6 | 5 | | |
| |||
28 | 27 | | |
29 | 28 | | |
30 | 29 | | |
| 30 | + | |
31 | 31 | | |
32 | 32 | | |
33 | 33 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
36 | 36 | | |
37 | 37 | | |
38 | 38 | | |
39 | | - | |
| 39 | + | |
40 | 40 | | |
41 | 41 | | |
42 | 42 | | |
| |||
0 commit comments