diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f5b156108b..0cb939669d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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 diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc index bde2eaa9e7..a603fc5280 100644 --- a/CHANGELOG.adoc +++ b/CHANGELOG.adoc @@ -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 diff --git a/packages/charts/backend/sirius-components-charts-graphql/pom.xml b/packages/charts/backend/sirius-components-charts-graphql/pom.xml index c523b45506..17bf86e1e1 100644 --- a/packages/charts/backend/sirius-components-charts-graphql/pom.xml +++ b/packages/charts/backend/sirius-components-charts-graphql/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/charts/backend/sirius-components-charts/pom.xml b/packages/charts/backend/sirius-components-charts/pom.xml index 134a0f6979..a0025a7ef6 100644 --- a/packages/charts/backend/sirius-components-charts/pom.xml +++ b/packages/charts/backend/sirius-components-charts/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/charts/backend/sirius-components-collaborative-charts/pom.xml b/packages/charts/backend/sirius-components-collaborative-charts/pom.xml index 7b18641866..a156e318e9 100644 --- a/packages/charts/backend/sirius-components-collaborative-charts/pom.xml +++ b/packages/charts/backend/sirius-components-collaborative-charts/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/compatibility/backend/sirius-components-compatibility-emf/pom.xml b/packages/compatibility/backend/sirius-components-compatibility-emf/pom.xml index 50510cb36c..897b69bd73 100644 --- a/packages/compatibility/backend/sirius-components-compatibility-emf/pom.xml +++ b/packages/compatibility/backend/sirius-components-compatibility-emf/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/compatibility/backend/sirius-components-compatibility/pom.xml b/packages/compatibility/backend/sirius-components-compatibility/pom.xml index 1a8217934e..135c4bab8d 100644 --- a/packages/compatibility/backend/sirius-components-compatibility/pom.xml +++ b/packages/compatibility/backend/sirius-components-compatibility/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/core/backend/sirius-components-annotations-spring/pom.xml b/packages/core/backend/sirius-components-annotations-spring/pom.xml index 299f4da204..53de99a65f 100644 --- a/packages/core/backend/sirius-components-annotations-spring/pom.xml +++ b/packages/core/backend/sirius-components-annotations-spring/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/core/backend/sirius-components-annotations/pom.xml b/packages/core/backend/sirius-components-annotations/pom.xml index d284d73e05..1b460e17e3 100644 --- a/packages/core/backend/sirius-components-annotations/pom.xml +++ b/packages/core/backend/sirius-components-annotations/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/core/backend/sirius-components-collaborative/pom.xml b/packages/core/backend/sirius-components-collaborative/pom.xml index 39bb261dd1..f9eeb12b51 100644 --- a/packages/core/backend/sirius-components-collaborative/pom.xml +++ b/packages/core/backend/sirius-components-collaborative/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/core/backend/sirius-components-core-graphql/pom.xml b/packages/core/backend/sirius-components-core-graphql/pom.xml index 12e921f549..318c18f9b1 100644 --- a/packages/core/backend/sirius-components-core-graphql/pom.xml +++ b/packages/core/backend/sirius-components-core-graphql/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/core/backend/sirius-components-core/pom.xml b/packages/core/backend/sirius-components-core/pom.xml index 1f222143f0..90391c4723 100644 --- a/packages/core/backend/sirius-components-core/pom.xml +++ b/packages/core/backend/sirius-components-core/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/core/backend/sirius-components-events/pom.xml b/packages/core/backend/sirius-components-events/pom.xml index 8666b05ab6..4d975e12f2 100644 --- a/packages/core/backend/sirius-components-events/pom.xml +++ b/packages/core/backend/sirius-components-events/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/core/backend/sirius-components-graphql-api/pom.xml b/packages/core/backend/sirius-components-graphql-api/pom.xml index 97cd8d54f4..d1d1d962be 100644 --- a/packages/core/backend/sirius-components-graphql-api/pom.xml +++ b/packages/core/backend/sirius-components-graphql-api/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/core/backend/sirius-components-representations/pom.xml b/packages/core/backend/sirius-components-representations/pom.xml index b59db81cda..6c1f0db3ed 100644 --- a/packages/core/backend/sirius-components-representations/pom.xml +++ b/packages/core/backend/sirius-components-representations/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/deck/backend/sirius-components-collaborative-deck/pom.xml b/packages/deck/backend/sirius-components-collaborative-deck/pom.xml index 7372edae52..241551d034 100644 --- a/packages/deck/backend/sirius-components-collaborative-deck/pom.xml +++ b/packages/deck/backend/sirius-components-collaborative-deck/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/deck/backend/sirius-components-deck-graphql/pom.xml b/packages/deck/backend/sirius-components-deck-graphql/pom.xml index 3c48641622..d0aa344b62 100644 --- a/packages/deck/backend/sirius-components-deck-graphql/pom.xml +++ b/packages/deck/backend/sirius-components-deck-graphql/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/deck/backend/sirius-components-deck/pom.xml b/packages/deck/backend/sirius-components-deck/pom.xml index fa476f113e..0690103ba2 100644 --- a/packages/deck/backend/sirius-components-deck/pom.xml +++ b/packages/deck/backend/sirius-components-deck/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/pom.xml b/packages/diagrams/backend/sirius-components-collaborative-diagrams/pom.xml index 136874bbee..05dc57d6a9 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/pom.xml +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/diagrams/backend/sirius-components-diagrams-graphql/pom.xml b/packages/diagrams/backend/sirius-components-diagrams-graphql/pom.xml index fb4840321a..3dea2cf881 100644 --- a/packages/diagrams/backend/sirius-components-diagrams-graphql/pom.xml +++ b/packages/diagrams/backend/sirius-components-diagrams-graphql/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/diagrams/backend/sirius-components-diagrams-tests/pom.xml b/packages/diagrams/backend/sirius-components-diagrams-tests/pom.xml index 665eb69ec9..84c10c3735 100644 --- a/packages/diagrams/backend/sirius-components-diagrams-tests/pom.xml +++ b/packages/diagrams/backend/sirius-components-diagrams-tests/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/diagrams/backend/sirius-components-diagrams/pom.xml b/packages/diagrams/backend/sirius-components-diagrams/pom.xml index 936c4d93d4..b5ca6953cf 100644 --- a/packages/diagrams/backend/sirius-components-diagrams/pom.xml +++ b/packages/diagrams/backend/sirius-components-diagrams/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/domain/backend/sirius-components-domain-edit/pom.xml b/packages/domain/backend/sirius-components-domain-edit/pom.xml index 80a0266ca8..f511c28090 100644 --- a/packages/domain/backend/sirius-components-domain-edit/pom.xml +++ b/packages/domain/backend/sirius-components-domain-edit/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/domain/backend/sirius-components-domain-emf/pom.xml b/packages/domain/backend/sirius-components-domain-emf/pom.xml index 424700f260..62fcd24ee2 100644 --- a/packages/domain/backend/sirius-components-domain-emf/pom.xml +++ b/packages/domain/backend/sirius-components-domain-emf/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/domain/backend/sirius-components-domain/pom.xml b/packages/domain/backend/sirius-components-domain/pom.xml index ef5df08dfa..83485fb8d5 100644 --- a/packages/domain/backend/sirius-components-domain/pom.xml +++ b/packages/domain/backend/sirius-components-domain/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/emf/backend/sirius-components-emf-forms/pom.xml b/packages/emf/backend/sirius-components-emf-forms/pom.xml index 901459daa3..7c83aefd02 100644 --- a/packages/emf/backend/sirius-components-emf-forms/pom.xml +++ b/packages/emf/backend/sirius-components-emf-forms/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/emf/backend/sirius-components-emf/pom.xml b/packages/emf/backend/sirius-components-emf/pom.xml index acc4a305b9..5ea21122ee 100644 --- a/packages/emf/backend/sirius-components-emf/pom.xml +++ b/packages/emf/backend/sirius-components-emf/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/emf/backend/sirius-components-interpreter/pom.xml b/packages/emf/backend/sirius-components-interpreter/pom.xml index e220ddff82..243909168c 100644 --- a/packages/emf/backend/sirius-components-interpreter/pom.xml +++ b/packages/emf/backend/sirius-components-interpreter/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors-widget-reference/pom.xml b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors-widget-reference/pom.xml index 51159acb48..39e7ecf341 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors-widget-reference/pom.xml +++ b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors-widget-reference/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/pom.xml b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/pom.xml index 2f283bba36..ead77aa8fb 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/pom.xml +++ b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors-graphql/pom.xml b/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors-graphql/pom.xml index d4850f89b4..58286fc107 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors-graphql/pom.xml +++ b/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors-graphql/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors/pom.xml b/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors/pom.xml index f7a3d4485e..c38ec69a76 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors/pom.xml +++ b/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/forms/backend/sirius-components-collaborative-forms/pom.xml b/packages/forms/backend/sirius-components-collaborative-forms/pom.xml index 7056ed6b31..f0a1bd9f18 100644 --- a/packages/forms/backend/sirius-components-collaborative-forms/pom.xml +++ b/packages/forms/backend/sirius-components-collaborative-forms/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/forms/backend/sirius-components-collaborative-widget-reference/pom.xml b/packages/forms/backend/sirius-components-collaborative-widget-reference/pom.xml index 196e9a23ce..516acd50fe 100644 --- a/packages/forms/backend/sirius-components-collaborative-widget-reference/pom.xml +++ b/packages/forms/backend/sirius-components-collaborative-widget-reference/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/forms/backend/sirius-components-forms-graphql/pom.xml b/packages/forms/backend/sirius-components-forms-graphql/pom.xml index b5712c657d..879a4c2bb4 100644 --- a/packages/forms/backend/sirius-components-forms-graphql/pom.xml +++ b/packages/forms/backend/sirius-components-forms-graphql/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/forms/backend/sirius-components-forms-tests/pom.xml b/packages/forms/backend/sirius-components-forms-tests/pom.xml index aeb98fc70d..93c887d673 100644 --- a/packages/forms/backend/sirius-components-forms-tests/pom.xml +++ b/packages/forms/backend/sirius-components-forms-tests/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/forms/backend/sirius-components-forms/pom.xml b/packages/forms/backend/sirius-components-forms/pom.xml index 53d63f80da..1322ae5813 100644 --- a/packages/forms/backend/sirius-components-forms/pom.xml +++ b/packages/forms/backend/sirius-components-forms/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/forms/backend/sirius-components-widget-reference-graphql/pom.xml b/packages/forms/backend/sirius-components-widget-reference-graphql/pom.xml index 060bb94b8d..772f4541d9 100644 --- a/packages/forms/backend/sirius-components-widget-reference-graphql/pom.xml +++ b/packages/forms/backend/sirius-components-widget-reference-graphql/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/forms/backend/sirius-components-widget-reference/pom.xml b/packages/forms/backend/sirius-components-widget-reference/pom.xml index 9cc403c3c4..1be918a1b8 100644 --- a/packages/forms/backend/sirius-components-widget-reference/pom.xml +++ b/packages/forms/backend/sirius-components-widget-reference/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/gantt/backend/sirius-components-collaborative-gantt/pom.xml b/packages/gantt/backend/sirius-components-collaborative-gantt/pom.xml index fdbba30581..fe82b896aa 100644 --- a/packages/gantt/backend/sirius-components-collaborative-gantt/pom.xml +++ b/packages/gantt/backend/sirius-components-collaborative-gantt/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/gantt/backend/sirius-components-gantt-graphql/pom.xml b/packages/gantt/backend/sirius-components-gantt-graphql/pom.xml index 9d906b61dd..ba3ee3d733 100644 --- a/packages/gantt/backend/sirius-components-gantt-graphql/pom.xml +++ b/packages/gantt/backend/sirius-components-gantt-graphql/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/gantt/backend/sirius-components-gantt-tests/pom.xml b/packages/gantt/backend/sirius-components-gantt-tests/pom.xml index d06a790e6a..313339abd0 100644 --- a/packages/gantt/backend/sirius-components-gantt-tests/pom.xml +++ b/packages/gantt/backend/sirius-components-gantt-tests/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/gantt/backend/sirius-components-gantt/pom.xml b/packages/gantt/backend/sirius-components-gantt/pom.xml index b869957643..f4677555ae 100644 --- a/packages/gantt/backend/sirius-components-gantt/pom.xml +++ b/packages/gantt/backend/sirius-components-gantt/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/papaya/backend/sirius-components-papaya-edit/pom.xml b/packages/papaya/backend/sirius-components-papaya-edit/pom.xml index 743136d6c2..c5c9b5af26 100644 --- a/packages/papaya/backend/sirius-components-papaya-edit/pom.xml +++ b/packages/papaya/backend/sirius-components-papaya-edit/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/papaya/backend/sirius-components-papaya/pom.xml b/packages/papaya/backend/sirius-components-papaya/pom.xml index 358e32a607..3efe0d7ebe 100644 --- a/packages/papaya/backend/sirius-components-papaya/pom.xml +++ b/packages/papaya/backend/sirius-components-papaya/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/portals/backend/sirius-components-collaborative-portals/pom.xml b/packages/portals/backend/sirius-components-collaborative-portals/pom.xml index 8ffd32881d..b40aec81aa 100644 --- a/packages/portals/backend/sirius-components-collaborative-portals/pom.xml +++ b/packages/portals/backend/sirius-components-collaborative-portals/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/portals/backend/sirius-components-portals-graphql/pom.xml b/packages/portals/backend/sirius-components-portals-graphql/pom.xml index 39102cc25a..84c0a7e104 100644 --- a/packages/portals/backend/sirius-components-portals-graphql/pom.xml +++ b/packages/portals/backend/sirius-components-portals-graphql/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/portals/backend/sirius-components-portals-tests/pom.xml b/packages/portals/backend/sirius-components-portals-tests/pom.xml index 447e4a7eba..1eeb0fa673 100644 --- a/packages/portals/backend/sirius-components-portals-tests/pom.xml +++ b/packages/portals/backend/sirius-components-portals-tests/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/portals/backend/sirius-components-portals/pom.xml b/packages/portals/backend/sirius-components-portals/pom.xml index 773fcb3061..0562d65a17 100644 --- a/packages/portals/backend/sirius-components-portals/pom.xml +++ b/packages/portals/backend/sirius-components-portals/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/releng/backend/sirius-components-test-coverage/pom.xml b/packages/releng/backend/sirius-components-test-coverage/pom.xml index df7024bcf8..0b7b6e0411 100644 --- a/packages/releng/backend/sirius-components-test-coverage/pom.xml +++ b/packages/releng/backend/sirius-components-test-coverage/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/selection/backend/sirius-components-collaborative-selection/pom.xml b/packages/selection/backend/sirius-components-collaborative-selection/pom.xml index af68268382..e54b93d377 100644 --- a/packages/selection/backend/sirius-components-collaborative-selection/pom.xml +++ b/packages/selection/backend/sirius-components-collaborative-selection/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/selection/backend/sirius-components-selection-graphql/pom.xml b/packages/selection/backend/sirius-components-selection-graphql/pom.xml index 0f859a5212..4d7d9ae581 100644 --- a/packages/selection/backend/sirius-components-selection-graphql/pom.xml +++ b/packages/selection/backend/sirius-components-selection-graphql/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/selection/backend/sirius-components-selection/pom.xml b/packages/selection/backend/sirius-components-selection/pom.xml index c2fe120678..937ac44ba6 100644 --- a/packages/selection/backend/sirius-components-selection/pom.xml +++ b/packages/selection/backend/sirius-components-selection/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/sirius-web/backend/sirius-web-application/pom.xml b/packages/sirius-web/backend/sirius-web-application/pom.xml index e9f74429af..d13488240c 100644 --- a/packages/sirius-web/backend/sirius-web-application/pom.xml +++ b/packages/sirius-web/backend/sirius-web-application/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/sirius-web/backend/sirius-web-domain/pom.xml b/packages/sirius-web/backend/sirius-web-domain/pom.xml index a330828721..4fb20c3d33 100644 --- a/packages/sirius-web/backend/sirius-web-domain/pom.xml +++ b/packages/sirius-web/backend/sirius-web-domain/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/sirius-web/backend/sirius-web-e2e-tests/pom.xml b/packages/sirius-web/backend/sirius-web-e2e-tests/pom.xml index dbebbf636e..2ccba602fe 100644 --- a/packages/sirius-web/backend/sirius-web-e2e-tests/pom.xml +++ b/packages/sirius-web/backend/sirius-web-e2e-tests/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/sirius-web/backend/sirius-web-frontend/pom.xml b/packages/sirius-web/backend/sirius-web-frontend/pom.xml index 1619dc1601..d91d1814ab 100644 --- a/packages/sirius-web/backend/sirius-web-frontend/pom.xml +++ b/packages/sirius-web/backend/sirius-web-frontend/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/sirius-web/backend/sirius-web-infrastructure/pom.xml b/packages/sirius-web/backend/sirius-web-infrastructure/pom.xml index 928c54beb3..7197ca674b 100644 --- a/packages/sirius-web/backend/sirius-web-infrastructure/pom.xml +++ b/packages/sirius-web/backend/sirius-web-infrastructure/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/sirius-web/backend/sirius-web-infrastructure/src/main/java/org/eclipse/sirius/web/infrastructure/configuration/mvc/FrontendRouterConfiguration.java b/packages/sirius-web/backend/sirius-web-infrastructure/src/main/java/org/eclipse/sirius/web/infrastructure/configuration/mvc/FrontendRouterConfiguration.java new file mode 100644 index 0000000000..b23fddddb0 --- /dev/null +++ b/packages/sirius-web/backend/sirius-web-infrastructure/src/main/java/org/eclipse/sirius/web/infrastructure/configuration/mvc/FrontendRouterConfiguration.java @@ -0,0 +1,53 @@ +/******************************************************************************* + * Copyright (c) 2025 Obeo. + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Obeo - initial API and implementation + *******************************************************************************/ +package org.eclipse.sirius.web.infrastructure.configuration.mvc; + +import static org.springframework.web.servlet.function.RequestPredicates.path; +import static org.springframework.web.servlet.function.RequestPredicates.pathExtension; +import static org.springframework.web.servlet.function.RouterFunctions.route; + +import java.util.List; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.core.io.ClassPathResource; +import org.springframework.web.servlet.function.RouterFunction; +import org.springframework.web.servlet.function.ServerResponse; + +/** + * Used to redirect request to frontend paths to the proper static resources. + * + * @author sbegaudeau + */ +@Configuration +public class FrontendRouterConfiguration { + @Bean + public RouterFunction redirectToIndex() { + var extensionsToIgnore = List.of("css", "html", "js", "js.map", "chunk.js", "json", "ico", "ttf", "jpg", "jpeg", "png", "svg"); + + var singlePageApplicationPredicate = path("/api/**") + .or(path("/subscriptions")) + .or(pathExtension(extensionsToIgnore::contains)) + .negate(); + + var index = new ClassPathResource("static/index.html"); + if (!index.exists()) { + return route() + .GET(singlePageApplicationPredicate, request -> ServerResponse.notFound().build()) + .build(); + } + return route() + .resource(singlePageApplicationPredicate, index) + .build(); + } +} diff --git a/packages/sirius-web/backend/sirius-web-infrastructure/src/main/java/org/eclipse/sirius/web/infrastructure/configuration/mvc/SpringPathResourceResolver.java b/packages/sirius-web/backend/sirius-web-infrastructure/src/main/java/org/eclipse/sirius/web/infrastructure/configuration/mvc/SpringPathResourceResolver.java deleted file mode 100644 index 34d81f52a5..0000000000 --- a/packages/sirius-web/backend/sirius-web-infrastructure/src/main/java/org/eclipse/sirius/web/infrastructure/configuration/mvc/SpringPathResourceResolver.java +++ /dev/null @@ -1,58 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2019, 2024 Obeo. - * This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v2.0 - * which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Obeo - initial API and implementation - *******************************************************************************/ -package org.eclipse.sirius.web.infrastructure.configuration.mvc; - -import java.io.IOException; -import java.util.Objects; - -import org.springframework.core.io.Resource; -import org.springframework.web.servlet.resource.PathResourceResolver; - -/** - * The path resource resolver used to exclude API calls from the resolution of static resource. - *

- * We want to ensure that users can only request real static resources and prevent any attempt at retrieving static - * resources if the requested resource starts with the path of our API. - *

- *

- * We could attempt to do this using a whitelist approach by saying that only some specific paths can be retrieved but - * maintaing such a whitelist would be cumbersome over time since we won't know all the paths used in the front-end of - * the application. - *

- * - * @author sbegaudeau - */ -public class SpringPathResourceResolver extends PathResourceResolver { - - /** - * The path of the URL used as a prefix for our API. - */ - private final String apiBasePath; - - public SpringPathResourceResolver(String apiBasePath) { - this.apiBasePath = Objects.requireNonNull(apiBasePath); - } - - @Override - protected Resource getResource(String resourcePath, Resource location) throws IOException { - boolean isValid = !resourcePath.startsWith(this.apiBasePath); - isValid = isValid && !resourcePath.startsWith(this.apiBasePath.substring(1)); - isValid = isValid && location.exists(); - isValid = isValid && location.isReadable(); - - if (isValid) { - return location; - } - return null; - } -} diff --git a/packages/sirius-web/backend/sirius-web-infrastructure/src/main/java/org/eclipse/sirius/web/infrastructure/configuration/mvc/SpringWebMvcConfigurer.java b/packages/sirius-web/backend/sirius-web-infrastructure/src/main/java/org/eclipse/sirius/web/infrastructure/configuration/mvc/SpringWebMvcConfigurer.java index c11bb9086d..d8bada3de0 100644 --- a/packages/sirius-web/backend/sirius-web-infrastructure/src/main/java/org/eclipse/sirius/web/infrastructure/configuration/mvc/SpringWebMvcConfigurer.java +++ b/packages/sirius-web/backend/sirius-web-infrastructure/src/main/java/org/eclipse/sirius/web/infrastructure/configuration/mvc/SpringWebMvcConfigurer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2024, 2024 Obeo. + * Copyright (c) 2024, 2025 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -66,12 +66,6 @@ public void addResourceHandlers(ResourceHandlerRegistry registry) { SpringWebMvcConfigurerConstants.PNG_PATTERN, SpringWebMvcConfigurerConstants.SVG_PATTERN ).addResourceLocations(SpringWebMvcConfigurerConstants.STATIC_ASSETS_PATH); - - // Make sure that all other requests are redirected to index.html, the React router will handle it - registry.addResourceHandler(SpringWebMvcConfigurerConstants.EMPTY_PATTERN, SpringWebMvcConfigurerConstants.HOMEPAGE_PATTERN, SpringWebMvcConfigurerConstants.ANY_PATTERN) - .addResourceLocations(SpringWebMvcConfigurerConstants.INDEX_HTML_PATH) - .resourceChain(true) - .addResolver(new SpringPathResourceResolver(SpringWebMvcConfigurerConstants.API_BASE_PATH)); } @Override diff --git a/packages/sirius-web/backend/sirius-web-infrastructure/src/main/java/org/eclipse/sirius/web/infrastructure/configuration/mvc/SpringWebMvcConfigurerConstants.java b/packages/sirius-web/backend/sirius-web-infrastructure/src/main/java/org/eclipse/sirius/web/infrastructure/configuration/mvc/SpringWebMvcConfigurerConstants.java index 3cfc112435..c16ca0a551 100644 --- a/packages/sirius-web/backend/sirius-web-infrastructure/src/main/java/org/eclipse/sirius/web/infrastructure/configuration/mvc/SpringWebMvcConfigurerConstants.java +++ b/packages/sirius-web/backend/sirius-web-infrastructure/src/main/java/org/eclipse/sirius/web/infrastructure/configuration/mvc/SpringWebMvcConfigurerConstants.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2024 Obeo. + * Copyright (c) 2019, 2025 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -19,9 +19,6 @@ */ public final class SpringWebMvcConfigurerConstants { - /** Base path of the API. */ - public static final String API_BASE_PATH = "/api"; - /** Pattern used to match CSS resources from the front-end. */ public static final String CSS_PATTERN = "/**/*.css"; @@ -61,21 +58,12 @@ public final class SpringWebMvcConfigurerConstants { /** Pattern used to match SVG images. */ public static final String SVG_PATTERN = "/**/*.svg"; - /** Pattern used to match the raw hostname with any specific path. */ - public static final String EMPTY_PATTERN = ""; - - /** Pattern used to match the path of the homepage. */ - public static final String HOMEPAGE_PATTERN = "/"; - /** Pattern used to match any path. */ public static final String ANY_PATTERN = "/**"; /** Path of the folder containing the static resources. */ public static final String STATIC_ASSETS_PATH = "classpath:/static/"; - /** Path of the index.html file. */ - public static final String INDEX_HTML_PATH = "classpath:/static/index.html"; - private SpringWebMvcConfigurerConstants() { // Prevent instantiation } diff --git a/packages/sirius-web/backend/sirius-web-papaya/pom.xml b/packages/sirius-web/backend/sirius-web-papaya/pom.xml index 15d1ca65ad..45425c184f 100644 --- a/packages/sirius-web/backend/sirius-web-papaya/pom.xml +++ b/packages/sirius-web/backend/sirius-web-papaya/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/sirius-web/backend/sirius-web-starter/pom.xml b/packages/sirius-web/backend/sirius-web-starter/pom.xml index fca79e2e8b..4b353e8102 100644 --- a/packages/sirius-web/backend/sirius-web-starter/pom.xml +++ b/packages/sirius-web/backend/sirius-web-starter/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/sirius-web/backend/sirius-web-table/pom.xml b/packages/sirius-web/backend/sirius-web-table/pom.xml index faedc6c5c8..8befc22ba4 100644 --- a/packages/sirius-web/backend/sirius-web-table/pom.xml +++ b/packages/sirius-web/backend/sirius-web-table/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/sirius-web/backend/sirius-web-tests/pom.xml b/packages/sirius-web/backend/sirius-web-tests/pom.xml index b5c8c5ae79..af9784da68 100644 --- a/packages/sirius-web/backend/sirius-web-tests/pom.xml +++ b/packages/sirius-web/backend/sirius-web-tests/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/sirius-web/backend/sirius-web/pom.xml b/packages/sirius-web/backend/sirius-web/pom.xml index 3ff9d5e9c6..89a1f1312b 100644 --- a/packages/sirius-web/backend/sirius-web/pom.xml +++ b/packages/sirius-web/backend/sirius-web/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/application/services/SpringPathResourceResolverTests.java b/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/application/services/SpringPathResourceResolverTests.java index 859e44baa1..1421da8e36 100644 --- a/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/application/services/SpringPathResourceResolverTests.java +++ b/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/application/services/SpringPathResourceResolverTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2024 Obeo. + * Copyright (c) 2024, 2025 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -12,19 +12,20 @@ *******************************************************************************/ package org.eclipse.sirius.web.application.services; +import static org.junit.jupiter.api.Assumptions.assumeTrue; import static org.assertj.core.api.Assertions.assertThat; -import java.util.List; - import org.eclipse.sirius.web.AbstractIntegrationTests; -import org.eclipse.sirius.web.infrastructure.configuration.mvc.SpringPathResourceResolver; +import org.eclipse.sirius.web.tests.services.api.IGivenInitialServerState; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.core.io.ClassPathResource; -import org.springframework.mock.web.MockHttpServletRequest; +import org.springframework.test.web.reactive.server.WebTestClient; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.servlet.resource.PathResourceResolver; /** * Used to test the resolution of the paths using Spring. @@ -35,13 +36,38 @@ @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) public class SpringPathResourceResolverTests extends AbstractIntegrationTests { - private final PathResourceResolver pathResourceResolver = new SpringPathResourceResolver("/api"); + @Autowired + private IGivenInitialServerState givenInitialServerState; + + @LocalServerPort + private String port; + + private String getHTTPBaseUrl() { + return "http://localhost:" + this.port; + } + + @BeforeEach + public void beforeEach() { + this.givenInitialServerState.initialize(); + } @Test - @DisplayName("Given a path resource resolver, when asked to return an API resource, then null is returned") - public void givenPathResourceResolverWhenAskToReturnAPIResoureThenNullIsReturned() { - var request = new MockHttpServletRequest(); - var resource = this.pathResourceResolver.resolveResource(request, "/api/graphql", List.of(new ClassPathResource("classpath:/static")), null); - assertThat(resource).isNull(); + @DisplayName("Given a running server, when a request is sent to a non static resource, then the index.html file is returned") + public void givenRunningServerWhenRequestIsSentToNonStaticResourceThenTheIndexHtmlFileIsReturned() { + var index = new ClassPathResource("static/index.html"); + assumeTrue(index.exists()); + + var webTestClient = WebTestClient.bindToServer() + .baseUrl(this.getHTTPBaseUrl()) + .build(); + + webTestClient + .get() + .uri("/projects") + .exchange() + .expectStatus() + .isOk() + .expectBody(String.class) + .consumeWith(body -> assertThat(body.getResponseBody()).contains("")); } } diff --git a/packages/starters/backend/sirius-components-flow-starter/pom.xml b/packages/starters/backend/sirius-components-flow-starter/pom.xml index 8fb494f4bc..9b990a92cc 100644 --- a/packages/starters/backend/sirius-components-flow-starter/pom.xml +++ b/packages/starters/backend/sirius-components-flow-starter/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/starters/backend/sirius-components-task-starter/pom.xml b/packages/starters/backend/sirius-components-task-starter/pom.xml index b5f2109400..7a2bab2543 100644 --- a/packages/starters/backend/sirius-components-task-starter/pom.xml +++ b/packages/starters/backend/sirius-components-task-starter/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/tables/backend/sirius-components-collaborative-tables/pom.xml b/packages/tables/backend/sirius-components-collaborative-tables/pom.xml index 5634590def..607b2fc0b2 100644 --- a/packages/tables/backend/sirius-components-collaborative-tables/pom.xml +++ b/packages/tables/backend/sirius-components-collaborative-tables/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/tables/backend/sirius-components-tables-graphql/pom.xml b/packages/tables/backend/sirius-components-tables-graphql/pom.xml index 75856d1653..e5becbe739 100644 --- a/packages/tables/backend/sirius-components-tables-graphql/pom.xml +++ b/packages/tables/backend/sirius-components-tables-graphql/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/tables/backend/sirius-components-tables-tests/pom.xml b/packages/tables/backend/sirius-components-tables-tests/pom.xml index 115e73dc2e..6f24fadf3d 100644 --- a/packages/tables/backend/sirius-components-tables-tests/pom.xml +++ b/packages/tables/backend/sirius-components-tables-tests/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/tables/backend/sirius-components-tables/pom.xml b/packages/tables/backend/sirius-components-tables/pom.xml index a30e78be42..d5f84cb26b 100644 --- a/packages/tables/backend/sirius-components-tables/pom.xml +++ b/packages/tables/backend/sirius-components-tables/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/task/backend/sirius-components-task-edit/pom.xml b/packages/task/backend/sirius-components-task-edit/pom.xml index 522e132313..ee64310ce0 100644 --- a/packages/task/backend/sirius-components-task-edit/pom.xml +++ b/packages/task/backend/sirius-components-task-edit/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/task/backend/sirius-components-task/pom.xml b/packages/task/backend/sirius-components-task/pom.xml index 7cf5569f81..f855acff61 100644 --- a/packages/task/backend/sirius-components-task/pom.xml +++ b/packages/task/backend/sirius-components-task/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/tests/backend/sirius-components-graphql-tests/pom.xml b/packages/tests/backend/sirius-components-graphql-tests/pom.xml index 22e76b54f0..2fdbef01f6 100644 --- a/packages/tests/backend/sirius-components-graphql-tests/pom.xml +++ b/packages/tests/backend/sirius-components-graphql-tests/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/tests/backend/sirius-components-spring-tests/pom.xml b/packages/tests/backend/sirius-components-spring-tests/pom.xml index e9d10d54a6..dcb8816a18 100644 --- a/packages/tests/backend/sirius-components-spring-tests/pom.xml +++ b/packages/tests/backend/sirius-components-spring-tests/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/tests/backend/sirius-components-tests/pom.xml b/packages/tests/backend/sirius-components-tests/pom.xml index e48c07c3bc..f706e8cbe6 100644 --- a/packages/tests/backend/sirius-components-tests/pom.xml +++ b/packages/tests/backend/sirius-components-tests/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/tools/backend/sirius-components-graphiql/pom.xml b/packages/tools/backend/sirius-components-graphiql/pom.xml index d3dc3b748b..be46acc2f1 100644 --- a/packages/tools/backend/sirius-components-graphiql/pom.xml +++ b/packages/tools/backend/sirius-components-graphiql/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/tools/backend/sirius-components-graphql-voyager/pom.xml b/packages/tools/backend/sirius-components-graphql-voyager/pom.xml index 51119bad6f..dbca26437f 100644 --- a/packages/tools/backend/sirius-components-graphql-voyager/pom.xml +++ b/packages/tools/backend/sirius-components-graphql-voyager/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/trees/backend/sirius-components-collaborative-trees/pom.xml b/packages/trees/backend/sirius-components-collaborative-trees/pom.xml index 8fcf034da9..a7dfd25c97 100644 --- a/packages/trees/backend/sirius-components-collaborative-trees/pom.xml +++ b/packages/trees/backend/sirius-components-collaborative-trees/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/trees/backend/sirius-components-trees-graphql/pom.xml b/packages/trees/backend/sirius-components-trees-graphql/pom.xml index 9edd7ec10a..e7b6201ea2 100644 --- a/packages/trees/backend/sirius-components-trees-graphql/pom.xml +++ b/packages/trees/backend/sirius-components-trees-graphql/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/trees/backend/sirius-components-trees-tests/pom.xml b/packages/trees/backend/sirius-components-trees-tests/pom.xml index 1868873094..5cda9cbb70 100644 --- a/packages/trees/backend/sirius-components-trees-tests/pom.xml +++ b/packages/trees/backend/sirius-components-trees-tests/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/trees/backend/sirius-components-trees/pom.xml b/packages/trees/backend/sirius-components-trees/pom.xml index 2e298f9bbc..31acca54c2 100644 --- a/packages/trees/backend/sirius-components-trees/pom.xml +++ b/packages/trees/backend/sirius-components-trees/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/validation/backend/sirius-components-collaborative-validation/pom.xml b/packages/validation/backend/sirius-components-collaborative-validation/pom.xml index 8d6cb9d61a..3cd3c018b4 100644 --- a/packages/validation/backend/sirius-components-collaborative-validation/pom.xml +++ b/packages/validation/backend/sirius-components-collaborative-validation/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/validation/backend/sirius-components-validation-graphql/pom.xml b/packages/validation/backend/sirius-components-validation-graphql/pom.xml index b39ff955d4..2dd067ee6b 100644 --- a/packages/validation/backend/sirius-components-validation-graphql/pom.xml +++ b/packages/validation/backend/sirius-components-validation-graphql/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/validation/backend/sirius-components-validation/pom.xml b/packages/validation/backend/sirius-components-validation/pom.xml index 03045e34e0..a5f99063e7 100644 --- a/packages/validation/backend/sirius-components-validation/pom.xml +++ b/packages/validation/backend/sirius-components-validation/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/view/backend/sirius-components-view-builder/pom.xml b/packages/view/backend/sirius-components-view-builder/pom.xml index 4652d0267a..5bb36c592c 100644 --- a/packages/view/backend/sirius-components-view-builder/pom.xml +++ b/packages/view/backend/sirius-components-view-builder/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/view/backend/sirius-components-view-deck-edit/pom.xml b/packages/view/backend/sirius-components-view-deck-edit/pom.xml index 578f2e9a72..6956d36d64 100644 --- a/packages/view/backend/sirius-components-view-deck-edit/pom.xml +++ b/packages/view/backend/sirius-components-view-deck-edit/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/view/backend/sirius-components-view-deck/pom.xml b/packages/view/backend/sirius-components-view-deck/pom.xml index 276736ccf1..77162d2c6e 100644 --- a/packages/view/backend/sirius-components-view-deck/pom.xml +++ b/packages/view/backend/sirius-components-view-deck/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/view/backend/sirius-components-view-diagram-customnodes-edit/pom.xml b/packages/view/backend/sirius-components-view-diagram-customnodes-edit/pom.xml index b4d958bbed..5cf99c7e81 100644 --- a/packages/view/backend/sirius-components-view-diagram-customnodes-edit/pom.xml +++ b/packages/view/backend/sirius-components-view-diagram-customnodes-edit/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/view/backend/sirius-components-view-diagram-customnodes/pom.xml b/packages/view/backend/sirius-components-view-diagram-customnodes/pom.xml index 0adc8a9031..274a44e50c 100644 --- a/packages/view/backend/sirius-components-view-diagram-customnodes/pom.xml +++ b/packages/view/backend/sirius-components-view-diagram-customnodes/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/view/backend/sirius-components-view-diagram-edit/pom.xml b/packages/view/backend/sirius-components-view-diagram-edit/pom.xml index 099ef59e34..60a90bc2be 100644 --- a/packages/view/backend/sirius-components-view-diagram-edit/pom.xml +++ b/packages/view/backend/sirius-components-view-diagram-edit/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/view/backend/sirius-components-view-diagram/pom.xml b/packages/view/backend/sirius-components-view-diagram/pom.xml index 8f8fd2f3cb..a2ea320f72 100644 --- a/packages/view/backend/sirius-components-view-diagram/pom.xml +++ b/packages/view/backend/sirius-components-view-diagram/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/view/backend/sirius-components-view-edit/pom.xml b/packages/view/backend/sirius-components-view-edit/pom.xml index 8dcb4a7a74..6bc63ad741 100644 --- a/packages/view/backend/sirius-components-view-edit/pom.xml +++ b/packages/view/backend/sirius-components-view-edit/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/view/backend/sirius-components-view-emf-widget-reference/pom.xml b/packages/view/backend/sirius-components-view-emf-widget-reference/pom.xml index c8ff22729e..1b72f82c4b 100644 --- a/packages/view/backend/sirius-components-view-emf-widget-reference/pom.xml +++ b/packages/view/backend/sirius-components-view-emf-widget-reference/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/view/backend/sirius-components-view-emf/pom.xml b/packages/view/backend/sirius-components-view-emf/pom.xml index e55ccb62f4..09186b7077 100644 --- a/packages/view/backend/sirius-components-view-emf/pom.xml +++ b/packages/view/backend/sirius-components-view-emf/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/view/backend/sirius-components-view-form-edit/pom.xml b/packages/view/backend/sirius-components-view-form-edit/pom.xml index dcb4c93132..8e874e5e2e 100644 --- a/packages/view/backend/sirius-components-view-form-edit/pom.xml +++ b/packages/view/backend/sirius-components-view-form-edit/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/view/backend/sirius-components-view-form/pom.xml b/packages/view/backend/sirius-components-view-form/pom.xml index a237710ad8..7f655af2f6 100644 --- a/packages/view/backend/sirius-components-view-form/pom.xml +++ b/packages/view/backend/sirius-components-view-form/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/view/backend/sirius-components-view-gantt-edit/pom.xml b/packages/view/backend/sirius-components-view-gantt-edit/pom.xml index bed6caf976..999b4f5e2a 100644 --- a/packages/view/backend/sirius-components-view-gantt-edit/pom.xml +++ b/packages/view/backend/sirius-components-view-gantt-edit/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/view/backend/sirius-components-view-gantt/pom.xml b/packages/view/backend/sirius-components-view-gantt/pom.xml index ba4350cb1a..03564eb883 100644 --- a/packages/view/backend/sirius-components-view-gantt/pom.xml +++ b/packages/view/backend/sirius-components-view-gantt/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/view/backend/sirius-components-view-table-edit/pom.xml b/packages/view/backend/sirius-components-view-table-edit/pom.xml index 57c4ead052..136c7b0a76 100644 --- a/packages/view/backend/sirius-components-view-table-edit/pom.xml +++ b/packages/view/backend/sirius-components-view-table-edit/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/view/backend/sirius-components-view-table/pom.xml b/packages/view/backend/sirius-components-view-table/pom.xml index 61406eddd1..46ff9f9dd2 100644 --- a/packages/view/backend/sirius-components-view-table/pom.xml +++ b/packages/view/backend/sirius-components-view-table/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/view/backend/sirius-components-view-tree-edit/pom.xml b/packages/view/backend/sirius-components-view-tree-edit/pom.xml index a2c53344fc..c8f2f99add 100644 --- a/packages/view/backend/sirius-components-view-tree-edit/pom.xml +++ b/packages/view/backend/sirius-components-view-tree-edit/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/view/backend/sirius-components-view-tree/pom.xml b/packages/view/backend/sirius-components-view-tree/pom.xml index 34f3b53273..e25d40c8d0 100644 --- a/packages/view/backend/sirius-components-view-tree/pom.xml +++ b/packages/view/backend/sirius-components-view-tree/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/view/backend/sirius-components-view/pom.xml b/packages/view/backend/sirius-components-view/pom.xml index 20ee075240..fe8ca5aa44 100644 --- a/packages/view/backend/sirius-components-view/pom.xml +++ b/packages/view/backend/sirius-components-view/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/view/backend/sirius-components-widget-reference-view-edit/pom.xml b/packages/view/backend/sirius-components-widget-reference-view-edit/pom.xml index 38bfe7dfee..51c887c764 100644 --- a/packages/view/backend/sirius-components-widget-reference-view-edit/pom.xml +++ b/packages/view/backend/sirius-components-widget-reference-view-edit/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/view/backend/sirius-components-widget-reference-view/pom.xml b/packages/view/backend/sirius-components-widget-reference-view/pom.xml index 6f29744ec8..6548b82e74 100644 --- a/packages/view/backend/sirius-components-widget-reference-view/pom.xml +++ b/packages/view/backend/sirius-components-widget-reference-view/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/web/backend/sirius-components-graphql/pom.xml b/packages/web/backend/sirius-components-graphql/pom.xml index 5741e538a0..60f769a643 100644 --- a/packages/web/backend/sirius-components-graphql/pom.xml +++ b/packages/web/backend/sirius-components-graphql/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius diff --git a/packages/web/backend/sirius-components-web/pom.xml b/packages/web/backend/sirius-components-web/pom.xml index dd31d740ae..c0af525630 100644 --- a/packages/web/backend/sirius-components-web/pom.xml +++ b/packages/web/backend/sirius-components-web/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.1 org.eclipse.sirius