Skip to content

Commit

Permalink
[releng] Switch to Sirius Web 2025.1.1
Browse files Browse the repository at this point in the history
Signed-off-by: Axel RICHARD <axel.richard@obeo.fr>
  • Loading branch information
AxelRICHARD committed Jan 15, 2025
1 parent 7a920cc commit 6362dc4
Show file tree
Hide file tree
Showing 33 changed files with 394 additions and 339 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ jobs:
with:
build: docker compose -f docker-compose-integration-tests.yml up -d
start: docker compose -f docker-compose-integration-tests.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
3 changes: 3 additions & 0 deletions CHANGELOG.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,9 @@ The changes are:
=== Dependency update

- [releng] Switch to Sirius Web 2025.1.0
- [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 `syson` used to run the frontend in dev from from the `start` script from other packages used to build them in development mode by renaming 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].

=== Bug fixes

Expand Down
6 changes: 3 additions & 3 deletions backend/application/syson-application-configuration/pom.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2023, 2024 Obeo.
Copyright (c) 2023, 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
Expand All @@ -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.syson</groupId>
Expand All @@ -29,7 +29,7 @@

<properties>
<java.version>17</java.version>
<sirius.web.version>2025.1.0</sirius.web.version>
<sirius.web.version>2025.1.1</sirius.web.version>
</properties>

<repositories>
Expand Down
6 changes: 3 additions & 3 deletions backend/application/syson-application/pom.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2023, 2024 Obeo.
Copyright (c) 2023, 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
Expand All @@ -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.syson</groupId>
Expand All @@ -30,7 +30,7 @@
<properties>
<java.version>17</java.version>
<eef.version>2.1.5-SNAPSHOT</eef.version>
<sirius.web.version>2025.1.0</sirius.web.version>
<sirius.web.version>2025.1.1</sirius.web.version>
</properties>

<repositories>
Expand Down
4 changes: 2 additions & 2 deletions backend/application/syson-frontend/pom.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2023, 2024 Obeo.
Copyright (c) 2023, 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
Expand All @@ -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.syson</groupId>
Expand Down
6 changes: 3 additions & 3 deletions backend/application/syson-sysml-export/pom.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2023, 2024 Obeo.
Copyright (c) 2023, 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
Expand All @@ -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.syson</groupId>
Expand All @@ -29,7 +29,7 @@

<properties>
<java.version>17</java.version>
<sirius.web.version>2025.1.0</sirius.web.version>
<sirius.web.version>2025.1.1</sirius.web.version>
</properties>

<repositories>
Expand Down
6 changes: 3 additions & 3 deletions backend/application/syson-sysml-import/pom.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2023, 2024 Obeo.
Copyright (c) 2023, 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
Expand All @@ -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.syson</groupId>
Expand All @@ -29,7 +29,7 @@

<properties>
<java.version>17</java.version>
<sirius.web.version>2025.1.0</sirius.web.version>
<sirius.web.version>2025.1.1</sirius.web.version>
</properties>

<repositories>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2023, 2024 Obeo.
Copyright (c) 2023, 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
Expand All @@ -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.syson</groupId>
Expand All @@ -29,7 +29,7 @@

<properties>
<java.version>17</java.version>
<sirius.web.version>2025.1.0</sirius.web.version>
<sirius.web.version>2025.1.1</sirius.web.version>
</properties>

<repositories>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2023, 2024 Obeo.
Copyright (c) 2023, 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
Expand All @@ -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.syson</groupId>
Expand All @@ -29,7 +29,7 @@

<properties>
<java.version>17</java.version>
<sirius.web.version>2025.1.0</sirius.web.version>
<sirius.web.version>2025.1.1</sirius.web.version>
</properties>

<repositories>
Expand Down
4 changes: 2 additions & 2 deletions backend/metamodel/syson-sysml-metamodel-edit/pom.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2023, 2024 Obeo.
Copyright (c) 2023, 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
Expand All @@ -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.syson</groupId>
Expand Down
4 changes: 2 additions & 2 deletions backend/metamodel/syson-sysml-metamodel/pom.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2023, 2024 Obeo.
Copyright (c) 2023, 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
Expand All @@ -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.syson</groupId>
Expand Down
4 changes: 2 additions & 2 deletions backend/releng/syson-test-coverage/pom.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
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
Expand All @@ -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.syson</groupId>
Expand Down
6 changes: 3 additions & 3 deletions backend/services/syson-direct-edit-grammar/pom.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
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
Expand All @@ -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.syson</groupId>
Expand All @@ -29,7 +29,7 @@

<properties>
<java.version>17</java.version>
<sirius.web.version>2025.1.0</sirius.web.version>
<sirius.web.version>2025.1.1</sirius.web.version>
<antlr.version>4.10.1</antlr.version>
</properties>

Expand Down
6 changes: 3 additions & 3 deletions backend/services/syson-services/pom.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2023, 2024 Obeo.
Copyright (c) 2023, 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
Expand All @@ -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.syson</groupId>
Expand All @@ -29,7 +29,7 @@

<properties>
<java.version>17</java.version>
<sirius.web.version>2025.1.0</sirius.web.version>
<sirius.web.version>2025.1.1</sirius.web.version>
<antlr.version>4.10.1</antlr.version>
</properties>

Expand Down
4 changes: 2 additions & 2 deletions backend/services/syson-sysml-rest-api-services/pom.xml
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.syson</groupId>
Expand All @@ -29,7 +29,7 @@

<properties>
<java.version>17</java.version>
<sirius.web.version>2025.1.0</sirius.web.version>
<sirius.web.version>2025.1.1</sirius.web.version>
</properties>

<repositories>
Expand Down
4 changes: 2 additions & 2 deletions backend/tests/syson-tests/pom.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
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
Expand All @@ -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.syson</groupId>
Expand Down
6 changes: 3 additions & 3 deletions backend/views/syson-diagram-actionflow-view/pom.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
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
Expand All @@ -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.syson</groupId>
Expand All @@ -29,7 +29,7 @@

<properties>
<java.version>17</java.version>
<sirius.web.version>2025.1.0</sirius.web.version>
<sirius.web.version>2025.1.1</sirius.web.version>
</properties>

<repositories>
Expand Down
6 changes: 3 additions & 3 deletions backend/views/syson-diagram-common-view/pom.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
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
Expand All @@ -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.syson</groupId>
Expand All @@ -29,7 +29,7 @@

<properties>
<java.version>17</java.version>
<sirius.web.version>2025.1.0</sirius.web.version>
<sirius.web.version>2025.1.1</sirius.web.version>
</properties>

<repositories>
Expand Down
Loading

0 comments on commit 6362dc4

Please sign in to comment.