[releng] Switch to AQL 8.0.2 final

Signed-off-by: Pierre-Charles David <[email protected]>
eclipse-sirius · Oct 11, 2024 · 183aa6c · 183aa6c
1 parent 6119566
commit 183aa6c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 15 deletions.
diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
@@ -44,6 +44,7 @@ This allows an error to be displayed when there is a problem during uploading
 - [releng] Switch to Spring Boot 3.3.3
 - https://github.com/eclipse-sirius/sirius-web/issues/3846[#3846] [core] Migrate the frontend to `react 18.3.1`, `react-dom 18.3.1`, `react-router-dom 6.26.0`, `@xstate/react: 3.0.0` and `@ObeoNetwork/gantt-task-react 0.6.0`
 - https://github.com/eclipse-sirius/sirius-web/issues/3840[#3840] [diagram] Migrate to ReactFlow 12
+- [releng] Switch to the final release version of AQL 8.0.2
 
 
 === Bug fixes

diff --git a/packages/emf/backend/sirius-components-interpreter/pom.xml b/packages/emf/backend/sirius-components-interpreter/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright (c) 2019, 2023 Obeo.
+ 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
@@ -45,11 +45,8 @@
 			<url>https://repo.maven.apache.org/maven2</url>
 		</repository>
 		<repository>
-			<id>Eclipse-Acceleo-Snapshots</id>
-			<url>https://repo.eclipse.org/content/repositories/acceleo-snapshots</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
+			<id>Eclipse-Acceleo</id>
+			<url>https://download.eclipse.org/acceleo/updates/releases/4.0/R202407021157</url>
 		</repository>
 	</repositories>
 
@@ -86,13 +83,8 @@
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.acceleo</groupId>
-			<artifactId>org.eclipse.acceleo.annotations</artifactId>
-			<version>8.0.2-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.acceleo</groupId>
-			<artifactId>org.eclipse.acceleo.query</artifactId>
-			<version>8.0.2-SNAPSHOT</version>
+			<artifactId>aql</artifactId>
+			<version>8.0.2</version>
 		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>

diff --git a/...w-emf/src/main/java/org/eclipse/sirius/components/view/emf/ViewAQLInterpreterFactory.java b/...w-emf/src/main/java/org/eclipse/sirius/components/view/emf/ViewAQLInterpreterFactory.java
@@ -51,7 +51,7 @@ public class ViewAQLInterpreterFactory implements IViewAQLInterpreterFactory {
     public ViewAQLInterpreterFactory(List<IJavaServiceProvider> javaServiceProviders, ApplicationContext applicationContext) {
         this.javaServiceProviders = new ArrayList<>();
         this.javaServiceProviders.addAll(Objects.requireNonNull(javaServiceProviders));
-        IServiceProvider nodeServiceProvider = (IReadOnlyQueryEnvironment queryEnvironment) -> ServiceUtils.getReceiverServices(null, Node.class).stream().toList();
+        IServiceProvider nodeServiceProvider = (IReadOnlyQueryEnvironment queryEnvironment, boolean forWorkspace) -> ServiceUtils.getReceiverServices(null, Node.class).stream().toList();
         this.javaServiceProviders.add((View view) -> List.of(CanonicalServices.class, DiagramServices.class, nodeServiceProvider.getClass()));
         this.applicationContext = Objects.requireNonNull(applicationContext);
     }

diff --git a/...mponents-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/ViewConverter.java b/...mponents-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/ViewConverter.java
@@ -63,7 +63,7 @@ public class ViewConverter implements IViewConverter {
     public ViewConverter(List<IJavaServiceProvider> javaServiceProviders, List<IRepresentationDescriptionConverter> representationDescriptionConverters, ApplicationContext applicationContext, List<IDialogDescriptionConverter> dialogDescriptionConverts) {
         this.javaServiceProviders = new ArrayList<>();
         this.javaServiceProviders.addAll(Objects.requireNonNull(javaServiceProviders));
-        IServiceProvider nodeServiceProvider = (IReadOnlyQueryEnvironment queryEnvironment) -> ServiceUtils.getReceiverServices(null, Node.class).stream().toList();
+        IServiceProvider nodeServiceProvider = (IReadOnlyQueryEnvironment queryEnvironment, boolean forWorkspace) -> ServiceUtils.getReceiverServices(null, Node.class).stream().toList();
         this.javaServiceProviders.add((View view) -> List.of(CanonicalServices.class, DiagramServices.class, nodeServiceProvider.getClass()));
         this.representationDescriptionConverters = Objects.requireNonNull(representationDescriptionConverters);
         this.applicationContext = Objects.requireNonNull(applicationContext);