Skip to content

Commit

Permalink
[releng] Switch to Spring Boot 3.4.1
Browse files Browse the repository at this point in the history 
Signed-off-by: Stéphane Bégaudeau <[email protected]>
  • Loading branch information
@sbegaudeau
sbegaudeau committed Jan 3, 2025
1 parent a7c6b22 commit 885d0f8
Show file tree
Hide file tree
Showing 111 changed files with 203 additions and 195 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ jobs:
with:
build: docker compose -f ../packages/sirius-web/backend/sirius-web/docker-compose.yml up -d
start: docker compose -f ../packages/sirius-web/backend/sirius-web/docker-compose.yml ps
wait-on: "http://localhost:8080/login"
wait-on: "http://localhost:8080"
wait-on-timeout: 180
working-directory: integration-tests
record: false
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@

- [releng] Upgrade `turbo` to version 2.3.3 (from 1.13.3 before).
The `start` task used in our turbo configuration is now marked as `persistent` and as a result we have separated the `start` script from `sirius-web` used to run the frontend in dev from from the `start` script from other packages used to build them in development mode by remaning the later to `build-dev`.
- [releng] Switch to https://github.com/spring-projects/spring-boot/releases/tag/v3.4.1[Spring Boot 3.4.1].
As part of this switch, the way we redirect the HTTP requests of frontend views to the `index.html` file on the backend has been updated.
The previous strategy relied on an odd configuration of the `WebMvcConfigurer#addResourceHandlers` in order to redirect those requests to the `index.html` file.
Now that the behavior of this method https://github.com/spring-projects/spring-framework/issues/33712[has been changed in Spring Framework] to only support folders as valid locations, we must update to https://docs.spring.io/spring-framework/reference/web/webmvc-functional.html#webmvc-fn-resource[the recommended way] to perform the routing of single page applications.
This may have some consequences for downstream applications which are embedding static resources.


=== Bug fixes
Expand Down
2 changes: 1 addition & 1 deletion packages/charts/backend/sirius-components-charts-graphql/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.3.3</version>
<version>3.4.1</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<groupId>org.eclipse.sirius</groupId>
Expand Down
2 changes: 1 addition & 1 deletion packages/charts/backend/sirius-components-charts/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.3.3</version>
<version>3.4.1</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<groupId>org.eclipse.sirius</groupId>
Expand Down
2 changes: 1 addition & 1 deletion packages/charts/backend/sirius-components-collaborative-charts/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.3.3</version>
<version>3.4.1</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<groupId>org.eclipse.sirius</groupId>
Expand Down
2 changes: 1 addition & 1 deletion packages/compatibility/backend/sirius-components-compatibility-emf/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.3.3</version>
<version>3.4.1</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>org.eclipse.sirius</groupId>
Expand Down
2 changes: 1 addition & 1 deletion packages/compatibility/backend/sirius-components-compatibility/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.3.3</version>
<version>3.4.1</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<groupId>org.eclipse.sirius</groupId>
Expand Down
2 changes: 1 addition & 1 deletion packages/core/backend/sirius-components-annotations-spring/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.3.3</version>
<version>3.4.1</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<groupId>org.eclipse.sirius</groupId>
Expand Down
2 changes: 1 addition & 1 deletion packages/core/backend/sirius-components-annotations/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.3.3</version>
<version>3.4.1</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<groupId>org.eclipse.sirius</groupId>
Expand Down
2 changes: 1 addition & 1 deletion packages/core/backend/sirius-components-collaborative/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.3.3</version>
<version>3.4.1</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<groupId>org.eclipse.sirius</groupId>
Expand Down
2 changes: 1 addition & 1 deletion packages/core/backend/sirius-components-core-graphql/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.3.3</version>
<version>3.4.1</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<groupId>org.eclipse.sirius</groupId>
Expand Down
2 changes: 1 addition & 1 deletion packages/core/backend/sirius-components-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.3.3</version>
<version>3.4.1</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<groupId>org.eclipse.sirius</groupId>
Expand Down
2 changes: 1 addition & 1 deletion packages/core/backend/sirius-components-events/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.3.3</version>
<version>3.4.1</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<groupId>org.eclipse.sirius</groupId>
Expand Down
2 changes: 1 addition & 1 deletion packages/core/backend/sirius-components-graphql-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.3.3</version>
<version>3.4.1</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<groupId>org.eclipse.sirius</groupId>
Expand Down
2 changes: 1 addition & 1 deletion packages/core/backend/sirius-components-representations/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.3.3</version>
<version>3.4.1</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<groupId>org.eclipse.sirius</groupId>
Expand Down
2 changes: 1 addition & 1 deletion packages/deck/backend/sirius-components-collaborative-deck/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.3.3</version>
<version>3.4.1</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<groupId>org.eclipse.sirius</groupId>
Expand Down
2 changes: 1 addition & 1 deletion packages/deck/backend/sirius-components-deck-graphql/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.3.3</version>
<version>3.4.1</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<groupId>org.eclipse.sirius</groupId>
Expand Down
2 changes: 1 addition & 1 deletion packages/deck/backend/sirius-components-deck/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.3.3</version>
<version>3.4.1</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<groupId>org.eclipse.sirius</groupId>
Expand Down
2 changes: 1 addition & 1 deletion packages/diagrams/backend/sirius-components-collaborative-diagrams/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.3.3</version>
<version>3.4.1</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<groupId>org.eclipse.sirius</groupId>
Expand Down
2 changes: 1 addition & 1 deletion packages/diagrams/backend/sirius-components-diagrams-graphql/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.3.3</version>
<version>3.4.1</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<groupId>org.eclipse.sirius</groupId>
Expand Down
2 changes: 1 addition & 1 deletion packages/diagrams/backend/sirius-components-diagrams-tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.3.3</version>
<version>3.4.1</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<groupId>org.eclipse.sirius</groupId>
Expand Down
2 changes: 1 addition & 1 deletion packages/diagrams/backend/sirius-components-diagrams/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.3.3</version>
<version>3.4.1</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<groupId>org.eclipse.sirius</groupId>
Expand Down
2 changes: 1 addition & 1 deletion packages/domain/backend/sirius-components-domain-edit/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.3.3</version>
<version>3.4.1</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<groupId>org.eclipse.sirius</groupId>
Expand Down
2 changes: 1 addition & 1 deletion packages/domain/backend/sirius-components-domain-emf/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.3.3</version>
<version>3.4.1</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<groupId>org.eclipse.sirius</groupId>
Expand Down
2 changes: 1 addition & 1 deletion packages/domain/backend/sirius-components-domain/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.3.3</version>
<version>3.4.1</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<groupId>org.eclipse.sirius</groupId>
Expand Down
2 changes: 1 addition & 1 deletion packages/emf/backend/sirius-components-emf-forms/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.3.3</version>
<version>3.4.1</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<groupId>org.eclipse.sirius</groupId>
Expand Down
2 changes: 1 addition & 1 deletion packages/emf/backend/sirius-components-emf/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.3.3</version>
<version>3.4.1</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<groupId>org.eclipse.sirius</groupId>
Expand Down
2 changes: 1 addition & 1 deletion packages/emf/backend/sirius-components-interpreter/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.3.3</version>
<version>3.4.1</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<groupId>org.eclipse.sirius</groupId>
Expand Down
2 changes: 1 addition & 1 deletion ...s/backend/sirius-components-collaborative-formdescriptioneditors-widget-reference/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.3.3</version>
<version>3.4.1</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<groupId>org.eclipse.sirius</groupId>
Expand Down
2 changes: 1 addition & 1 deletion ...descriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.3.3</version>
<version>3.4.1</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<groupId>org.eclipse.sirius</groupId>
Expand Down
2 changes: 1 addition & 1 deletion ...s/formdescriptioneditors/backend/sirius-components-formdescriptioneditors-graphql/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.3.3</version>
<version>3.4.1</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<groupId>org.eclipse.sirius</groupId>
Expand Down
2 changes: 1 addition & 1 deletion packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.3.3</version>
<version>3.4.1</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<groupId>org.eclipse.sirius</groupId>
Expand Down
2 changes: 1 addition & 1 deletion packages/forms/backend/sirius-components-collaborative-forms/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.3.3</version>
<version>3.4.1</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<groupId>org.eclipse.sirius</groupId>
Expand Down
2 changes: 1 addition & 1 deletion packages/forms/backend/sirius-components-collaborative-widget-reference/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.3.3</version>
<version>3.4.1</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<groupId>org.eclipse.sirius</groupId>
Expand Down
2 changes: 1 addition & 1 deletion packages/forms/backend/sirius-components-forms-graphql/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.3.3</version>
<version>3.4.1</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<groupId>org.eclipse.sirius</groupId>
Expand Down
2 changes: 1 addition & 1 deletion packages/forms/backend/sirius-components-forms-tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.3.3</version>
<version>3.4.1</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<groupId>org.eclipse.sirius</groupId>
Expand Down
2 changes: 1 addition & 1 deletion packages/forms/backend/sirius-components-forms/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.3.3</version>
<version>3.4.1</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<groupId>org.eclipse.sirius</groupId>
Expand Down
2 changes: 1 addition & 1 deletion packages/forms/backend/sirius-components-widget-reference-graphql/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.3.3</version>
<version>3.4.1</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<groupId>org.eclipse.sirius</groupId>
Expand Down
2 changes: 1 addition & 1 deletion packages/forms/backend/sirius-components-widget-reference/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.3.3</version>
<version>3.4.1</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>org.eclipse.sirius</groupId>
Expand Down
2 changes: 1 addition & 1 deletion packages/gantt/backend/sirius-components-collaborative-gantt/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.3.3</version>
<version>3.4.1</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<groupId>org.eclipse.sirius</groupId>
Expand Down
2 changes: 1 addition & 1 deletion packages/gantt/backend/sirius-components-gantt-graphql/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.3.3</version>
<version>3.4.1</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<groupId>org.eclipse.sirius</groupId>
Expand Down
2 changes: 1 addition & 1 deletion packages/gantt/backend/sirius-components-gantt-tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.3.3</version>
<version>3.4.1</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<groupId>org.eclipse.sirius</groupId>
Expand Down
2 changes: 1 addition & 1 deletion packages/gantt/backend/sirius-components-gantt/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.3.3</version>
<version>3.4.1</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<groupId>org.eclipse.sirius</groupId>
Expand Down
2 changes: 1 addition & 1 deletion packages/papaya/backend/sirius-components-papaya-edit/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.3.3</version>
<version>3.4.1</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<groupId>org.eclipse.sirius</groupId>
Expand Down
Loading

0 comments on commit 885d0f8

Please sign in to comment.