Updated to Sirius 7.1.1

Change-Id: I481f5303672137cbe43a6cb23ba967b6d217a6a0
ObeoNetwork · Mar 14, 2024 · 196dde2 · 196dde2
1 parent 8ffedd8
commit 196dde2
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 50 deletions.
diff --git a/README.md b/README.md
@@ -7,13 +7,9 @@ BPMN Designer provides a set of diagrams to work with BPMN 2.0 models.
 These plugins have been created with Eclipse/Sirius and are released under the EPL Open-Source License.
 
 To install it:
-- Download OD Community Edition version 11.1: https://www.obeodesigner.com/
+- Download OD Community Edition version 11.8: https://www.obeodesigner.com/
 - Unzip and start it
-- Add the following update sites:
- - http://download.eclipse.org/releases/oxygen/
- - https://s3-eu-west-1.amazonaws.com/obeo-bpmndesigner-releases/4.1.1/repository/
+- Add the BPMN-Designer update site: https://s3-eu-west-1.amazonaws.com/obeo-bpmndesigner-releases/5.1.0/repository/
 - Install the BPMN-Designer and Sirius Support for Legacy Queries features
 
 To test it, create a new sample project: Ctrl+N > Examples > BPMN > BPMN Samples
-
-You can also download BPMN-Designer installed in Obeo Designer Community edition here: https://github.com/ObeoNetwork/BPMN-Designer/releases/download/4.1.1/BPMNDesigner-4.1.1.zip (Windows version only).
diff --git a/....obeonetwork.dsl.bpmn2.design/src/org/obeonetwork/bpmn2/design/SiriusElementRefactor.java b/....obeonetwork.dsl.bpmn2.design/src/org/obeonetwork/bpmn2/design/SiriusElementRefactor.java
@@ -69,11 +69,11 @@
 import org.eclipse.sirius.diagram.ui.internal.refresh.diagram.DDiagramCanonicalSynchronizer;
 import org.eclipse.sirius.diagram.ui.part.SiriusDiagramEditor;
 import org.eclipse.sirius.ecore.extender.business.api.accessor.ModelAccessor;
+import org.eclipse.sirius.tools.api.SiriusPlugin;
 import org.eclipse.sirius.tools.api.interpreter.InterpreterUtil;
 import org.eclipse.sirius.ui.business.api.session.SessionEditorInput;
 import org.eclipse.sirius.viewpoint.DRepresentationDescriptor;
 import org.eclipse.sirius.viewpoint.DRepresentationElement;
-import org.eclipse.sirius.viewpoint.SiriusPlugin;
 import org.eclipse.sirius.viewpoint.ViewpointPackage;
 import org.eclipse.sirius.viewpoint.description.AnnotationEntry;
 import org.eclipse.sirius.viewpoint.description.SemanticBasedDecoration;

diff --git a/releng/org.obeonetwork.dsl.bpmn2.parent/pom.xml b/releng/org.obeonetwork.dsl.bpmn2.parent/pom.xml
@@ -28,12 +28,12 @@
   <repository>
    <id>eclipse</id>
     <layout>p2</layout>
-    <url>http://download.eclipse.org/releases/mars/</url>
+    <url>https://download.eclipse.org/releases/2021-09/</url>
   </repository>
   <repository>
    	<id>Sirius</id>
     <layout>p2</layout>
-    <url>http://download.eclipse.org/sirius/updates/releases/3.1.9/mars</url>
+    <url>https://download.eclipse.org/sirius/updates/releases/7.1.1/2021-06/</url>
   </repository>
   <repository>
    	<id>AcceleoLegacy</id>

diff --git a/releng/org.obeonetwork.dsl.bpmn2.parent/tpd/build.target b/releng/org.obeonetwork.dsl.bpmn2.parent/tpd/build.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="BPMN-Designer - Build" sequenceNumber="1709040845">
+<target name="BPMN-Designer - Build" sequenceNumber="1710407742">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="com.google.guava" version="15.0.0.v201403281430"/>
@@ -38,22 +38,22 @@
       <repository id="eclipse" location="https://download.eclipse.org/releases/2021-09/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.sirius.tests.support.feature.group" version="6.6.0.202111261321"/>
-      <unit id="org.eclipse.sirius.tests.feature.group" version="6.6.0.202111261321"/>
-      <unit id="org.eclipse.acceleo.ui.interpreter.feature.group" version="3.7.11.202102190929"/>
-      <unit id="org.eclipse.sirius.diagram.elk.feature.feature.group" version="6.6.0.202111261321"/>
-      <unit id="org.eclipse.sirius.diagram.elk.sdk.feature.feature.group" version="6.6.0.202111261321"/>
-      <unit id="org.eclipse.sirius.doc.feature.feature.group" version="6.6.0.202111261321"/>
-      <unit id="org.eclipse.sirius.interpreter.feature.feature.group" version="6.6.0.202111261321"/>
-      <unit id="org.eclipse.sirius.properties.feature.feature.group" version="6.6.0.202111261321"/>
-      <unit id="org.eclipse.sirius.runtime.acceleo.feature.group" version="6.6.0.202111261321"/>
-      <unit id="org.eclipse.sirius.runtime.aql.feature.group" version="6.6.0.202111261321"/>
-      <unit id="org.eclipse.sirius.runtime.ide.eef.feature.group" version="6.6.0.202111261321"/>
-      <unit id="org.eclipse.sirius.runtime.ide.ui.acceleo.feature.group" version="6.6.0.202111261321"/>
-      <unit id="org.eclipse.sirius.runtime.ide.ui.feature.group" version="6.6.0.202111261321"/>
-      <unit id="org.eclipse.sirius.runtime.ide.xtext.feature.group" version="6.6.0.202111261321"/>
-      <unit id="org.eclipse.sirius.runtime.feature.group" version="6.6.0.202111261321"/>
-      <repository id="sirius" location="https://download.eclipse.org/sirius/updates/releases/6.6.0/2020-09/"/>
+      <unit id="org.eclipse.sirius.tests.support.feature.group" version="7.1.1.202306201521"/>
+      <unit id="org.eclipse.sirius.tests.feature.group" version="7.1.1.202306201521"/>
+      <unit id="org.eclipse.acceleo.ui.interpreter.feature.group" version="3.7.12.202211151354"/>
+      <unit id="org.eclipse.sirius.diagram.elk.feature.feature.group" version="7.1.1.202306201521"/>
+      <unit id="org.eclipse.sirius.diagram.elk.sdk.feature.feature.group" version="7.1.1.202306201521"/>
+      <unit id="org.eclipse.sirius.doc.feature.feature.group" version="7.1.1.202306201521"/>
+      <unit id="org.eclipse.sirius.interpreter.feature.feature.group" version="7.1.1.202306201521"/>
+      <unit id="org.eclipse.sirius.properties.feature.feature.group" version="7.1.1.202306201521"/>
+      <unit id="org.eclipse.sirius.runtime.acceleo.feature.group" version="7.1.1.202306201521"/>
+      <unit id="org.eclipse.sirius.runtime.aql.feature.group" version="7.1.1.202306201521"/>
+      <unit id="org.eclipse.sirius.runtime.ide.eef.feature.group" version="7.1.1.202306201521"/>
+      <unit id="org.eclipse.sirius.runtime.ide.ui.acceleo.feature.group" version="7.1.1.202306201521"/>
+      <unit id="org.eclipse.sirius.runtime.ide.ui.feature.group" version="7.1.1.202306201521"/>
+      <unit id="org.eclipse.sirius.runtime.ide.xtext.feature.group" version="7.1.1.202306201521"/>
+      <unit id="org.eclipse.sirius.runtime.feature.group" version="7.1.1.202306201521"/>
+      <repository id="sirius" location="https://download.eclipse.org/sirius/updates/releases/7.1.1/2021-06/"/>
     </location>
   </locations>
   <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>

diff --git a/releng/org.obeonetwork.dsl.bpmn2.parent/tpd/dev.tpd b/releng/org.obeonetwork.dsl.bpmn2.parent/tpd/dev.tpd
@@ -22,7 +22,7 @@ location eclipse "https://download.eclipse.org/releases/2021-09/" {
 }
 
 
-location sirius "https://download.eclipse.org/sirius/updates/releases/6.6.0/2020-09/" {
+location sirius "https://download.eclipse.org/sirius/updates/releases/7.1.1/2021-06/" {
 
 	// Includes Odesign edit, Sirius interpreter view and Odesign reload 
 	org.eclipse.sirius.specifier.ide.ui.feature.group

diff --git a/releng/org.obeonetwork.dsl.bpmn2.parent/tpd/runtime.tpd b/releng/org.obeonetwork.dsl.bpmn2.parent/tpd/runtime.tpd
@@ -62,7 +62,7 @@ location GMF-Runtime-1.13.0 "https://download.eclipse.org/modeling/gmp/gmf-runti
 }
 
 
-location sirius "https://download.eclipse.org/sirius/updates/releases/6.6.0/2020-09/" {
+location sirius "https://download.eclipse.org/sirius/updates/releases/7.1.1/2021-06/" {
     org.eclipse.acceleo.ui.interpreter.feature.group
     org.eclipse.sirius.diagram.elk.feature.feature.group
     org.eclipse.sirius.diagram.elk.sdk.feature.feature.group

diff --git a/releng/org.obeonetwork.dsl.bpmn2.parent/tpd/sdk.target b/releng/org.obeonetwork.dsl.bpmn2.parent/tpd/sdk.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="BPMN-Designer - SDK" sequenceNumber="1709040839">
+<target name="BPMN-Designer - SDK" sequenceNumber="1710407717">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="com.google.guava" version="15.0.0.v201403281430"/>
@@ -39,26 +39,26 @@
       <repository id="eclipse" location="https://download.eclipse.org/releases/2021-09/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.sirius.specifier.ide.ui.feature.group" version="6.6.0.202111261321"/>
-      <unit id="org.eclipse.sirius.specifier.ide.ui.aql.feature.group" version="6.6.0.202111261321"/>
-      <unit id="org.eclipse.sirius.specifier.ide.ui.acceleo.feature.group" version="6.6.0.202111261321"/>
-      <unit id="org.eclipse.sirius.specifier.properties.feature.feature.group" version="6.6.0.202111261321"/>
-      <unit id="org.eclipse.sirius.diagram.elk.sdk.feature.feature.group" version="6.6.0.202111261321"/>
-      <unit id="org.eclipse.sirius.tests.support.feature.group" version="6.6.0.202111261321"/>
-      <unit id="org.eclipse.sirius.tests.feature.group" version="6.6.0.202111261321"/>
-      <unit id="org.eclipse.acceleo.ui.interpreter.feature.group" version="3.7.11.202102190929"/>
-      <unit id="org.eclipse.sirius.diagram.elk.feature.feature.group" version="6.6.0.202111261321"/>
-      <unit id="org.eclipse.sirius.doc.feature.feature.group" version="6.6.0.202111261321"/>
-      <unit id="org.eclipse.sirius.interpreter.feature.feature.group" version="6.6.0.202111261321"/>
-      <unit id="org.eclipse.sirius.properties.feature.feature.group" version="6.6.0.202111261321"/>
-      <unit id="org.eclipse.sirius.runtime.acceleo.feature.group" version="6.6.0.202111261321"/>
-      <unit id="org.eclipse.sirius.runtime.aql.feature.group" version="6.6.0.202111261321"/>
-      <unit id="org.eclipse.sirius.runtime.ide.eef.feature.group" version="6.6.0.202111261321"/>
-      <unit id="org.eclipse.sirius.runtime.ide.ui.acceleo.feature.group" version="6.6.0.202111261321"/>
-      <unit id="org.eclipse.sirius.runtime.ide.ui.feature.group" version="6.6.0.202111261321"/>
-      <unit id="org.eclipse.sirius.runtime.ide.xtext.feature.group" version="6.6.0.202111261321"/>
-      <unit id="org.eclipse.sirius.runtime.feature.group" version="6.6.0.202111261321"/>
-      <repository id="sirius" location="https://download.eclipse.org/sirius/updates/releases/6.6.0/2020-09/"/>
+      <unit id="org.eclipse.sirius.specifier.ide.ui.feature.group" version="7.1.1.202306201521"/>
+      <unit id="org.eclipse.sirius.specifier.ide.ui.aql.feature.group" version="7.1.1.202306201521"/>
+      <unit id="org.eclipse.sirius.specifier.ide.ui.acceleo.feature.group" version="7.1.1.202306201521"/>
+      <unit id="org.eclipse.sirius.specifier.properties.feature.feature.group" version="7.1.1.202306201521"/>
+      <unit id="org.eclipse.sirius.diagram.elk.sdk.feature.feature.group" version="7.1.1.202306201521"/>
+      <unit id="org.eclipse.sirius.tests.support.feature.group" version="7.1.1.202306201521"/>
+      <unit id="org.eclipse.sirius.tests.feature.group" version="7.1.1.202306201521"/>
+      <unit id="org.eclipse.acceleo.ui.interpreter.feature.group" version="3.7.12.202211151354"/>
+      <unit id="org.eclipse.sirius.diagram.elk.feature.feature.group" version="7.1.1.202306201521"/>
+      <unit id="org.eclipse.sirius.doc.feature.feature.group" version="7.1.1.202306201521"/>
+      <unit id="org.eclipse.sirius.interpreter.feature.feature.group" version="7.1.1.202306201521"/>
+      <unit id="org.eclipse.sirius.properties.feature.feature.group" version="7.1.1.202306201521"/>
+      <unit id="org.eclipse.sirius.runtime.acceleo.feature.group" version="7.1.1.202306201521"/>
+      <unit id="org.eclipse.sirius.runtime.aql.feature.group" version="7.1.1.202306201521"/>
+      <unit id="org.eclipse.sirius.runtime.ide.eef.feature.group" version="7.1.1.202306201521"/>
+      <unit id="org.eclipse.sirius.runtime.ide.ui.acceleo.feature.group" version="7.1.1.202306201521"/>
+      <unit id="org.eclipse.sirius.runtime.ide.ui.feature.group" version="7.1.1.202306201521"/>
+      <unit id="org.eclipse.sirius.runtime.ide.xtext.feature.group" version="7.1.1.202306201521"/>
+      <unit id="org.eclipse.sirius.runtime.feature.group" version="7.1.1.202306201521"/>
+      <repository id="sirius" location="https://download.eclipse.org/sirius/updates/releases/7.1.1/2021-06/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.mypsycho.emf.modit_feature.feature.group" version="1.2.0.v20231218-1557"/>

diff --git a/releng/org.obeonetwork.dsl.bpmn2.parent/tpd/test.tpd b/releng/org.obeonetwork.dsl.bpmn2.parent/tpd/test.tpd
@@ -39,7 +39,7 @@ location eclipse "https://download.eclipse.org/releases/2021-09/" {
 
 }
 
-location sirius "https://download.eclipse.org/sirius/updates/releases/6.6.0/2020-09/" {
+location sirius "https://download.eclipse.org/sirius/updates/releases/7.1.1/2021-06/" {
 	org.eclipse.sirius.tests.support.feature.group
 	org.eclipse.sirius.tests.feature.group
 }