Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[releng] Switch to AQL 8.0.2 final #4035

Merged
merged 1 commit into from
Oct 11, 2024
Merged

[releng] Switch to AQL 8.0.2 final #4035

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
18 changes: 5 additions & 13 deletions packages/emf/backend/sirius-components-interpreter/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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>

Expand Down Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ...w-emf/src/main/java/org/eclipse/sirius/components/view/emf/ViewAQLInterpreterFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
2 changes: 1 addition & 1 deletion ...mponents-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/ViewConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Loading