From 196dde28ed99bc5095db6b5a7bfcac1d700de731 Mon Sep 17 00:00:00 2001 From: Stephane Drapeau Date: Thu, 14 Mar 2024 10:09:23 +0100 Subject: [PATCH] Updated to Sirius 7.1.1 Change-Id: I481f5303672137cbe43a6cb23ba967b6d217a6a0 --- README.md | 8 +--- .../bpmn2/design/SiriusElementRefactor.java | 2 +- .../org.obeonetwork.dsl.bpmn2.parent/pom.xml | 4 +- .../tpd/build.target | 34 +++++++-------- .../tpd/dev.tpd | 2 +- .../tpd/runtime.tpd | 2 +- .../tpd/sdk.target | 42 +++++++++---------- .../tpd/test.tpd | 2 +- 8 files changed, 46 insertions(+), 50 deletions(-) diff --git a/README.md b/README.md index 425d34f5..5e50aa22 100644 --- 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/plugins/org.obeonetwork.dsl.bpmn2.design/src/org/obeonetwork/bpmn2/design/SiriusElementRefactor.java b/plugins/org.obeonetwork.dsl.bpmn2.design/src/org/obeonetwork/bpmn2/design/SiriusElementRefactor.java index f40dd5ae..68200172 100644 --- a/plugins/org.obeonetwork.dsl.bpmn2.design/src/org/obeonetwork/bpmn2/design/SiriusElementRefactor.java +++ b/plugins/org.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 index 4ad53748..f829e88f 100644 --- a/releng/org.obeonetwork.dsl.bpmn2.parent/pom.xml +++ b/releng/org.obeonetwork.dsl.bpmn2.parent/pom.xml @@ -28,12 +28,12 @@ eclipse p2 - http://download.eclipse.org/releases/mars/ + https://download.eclipse.org/releases/2021-09/ Sirius p2 - http://download.eclipse.org/sirius/updates/releases/3.1.9/mars + https://download.eclipse.org/sirius/updates/releases/7.1.1/2021-06/ AcceleoLegacy diff --git a/releng/org.obeonetwork.dsl.bpmn2.parent/tpd/build.target b/releng/org.obeonetwork.dsl.bpmn2.parent/tpd/build.target index 4c63fe7c..754020bb 100644 --- a/releng/org.obeonetwork.dsl.bpmn2.parent/tpd/build.target +++ b/releng/org.obeonetwork.dsl.bpmn2.parent/tpd/build.target @@ -1,7 +1,7 @@ - + @@ -38,22 +38,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/releng/org.obeonetwork.dsl.bpmn2.parent/tpd/dev.tpd b/releng/org.obeonetwork.dsl.bpmn2.parent/tpd/dev.tpd index e5b26470..239119eb 100644 --- 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 index c866459d..dacb1075 100644 --- 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 index 1f0555c7..97a6b537 100644 --- a/releng/org.obeonetwork.dsl.bpmn2.parent/tpd/sdk.target +++ b/releng/org.obeonetwork.dsl.bpmn2.parent/tpd/sdk.target @@ -1,7 +1,7 @@ - + @@ -39,26 +39,26 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/releng/org.obeonetwork.dsl.bpmn2.parent/tpd/test.tpd b/releng/org.obeonetwork.dsl.bpmn2.parent/tpd/test.tpd index 0ff58669..23fe4fb5 100644 --- 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 }