diff --git a/.github/workflows/matrix_includes.json b/.github/workflows/matrix_includes.json index 4c8e65ec0..00b116c7b 100644 --- a/.github/workflows/matrix_includes.json +++ b/.github/workflows/matrix_includes.json @@ -6,7 +6,7 @@ }, { "java":"17", - "profile":"platform-sirius-7.2.1,tests", + "profile":"platform-sirius-7.4.0,tests", "tycho":"3.0.3" }, { diff --git a/plugins/org.obeonetwork.m2doc.sirius.ui/META-INF/MANIFEST.MF b/plugins/org.obeonetwork.m2doc.sirius.ui/META-INF/MANIFEST.MF index 9d2b5994c..954ae5127 100644 --- a/plugins/org.obeonetwork.m2doc.sirius.ui/META-INF/MANIFEST.MF +++ b/plugins/org.obeonetwork.m2doc.sirius.ui/META-INF/MANIFEST.MF @@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.emf.common, org.eclipse.emf.ecore, - org.eclipse.sirius;bundle-version="[5.0.0,7.4.0)", + org.eclipse.sirius;bundle-version="[5.0.0,7.5.0)", org.obeonetwork.m2doc.genconf, org.obeonetwork.m2doc, org.obeonetwork.m2doc.ide diff --git a/plugins/org.obeonetwork.m2doc.sirius/META-INF/MANIFEST.MF b/plugins/org.obeonetwork.m2doc.sirius/META-INF/MANIFEST.MF index 7db109e05..b33b4b9ed 100644 --- a/plugins/org.obeonetwork.m2doc.sirius/META-INF/MANIFEST.MF +++ b/plugins/org.obeonetwork.m2doc.sirius/META-INF/MANIFEST.MF @@ -4,16 +4,16 @@ Bundle-Name: %pluginName Bundle-SymbolicName: org.obeonetwork.m2doc.sirius;singleton:=true Bundle-Version: 3.3.2.qualifier Require-Bundle: org.eclipse.core.runtime, - org.eclipse.sirius;bundle-version="[5.0.0,7.4.0)", - org.eclipse.sirius.diagram;bundle-version="[5.0.0,7.4.0)", + org.eclipse.sirius;bundle-version="[5.0.0,7.5.0)", + org.eclipse.sirius.diagram;bundle-version="[5.0.0,7.5.0)", org.eclipse.gmf.runtime.diagram.ui, org.eclipse.gmf.runtime.diagram.ui.render, - org.eclipse.sirius.diagram.ui;bundle-version="[5.0.0,7.4.0)", - org.eclipse.sirius.ext.base;bundle-version="[5.0.0,7.4.0)", - org.eclipse.sirius.table;bundle-version="[5.0.0,7.4.0)", + org.eclipse.sirius.diagram.ui;bundle-version="[5.0.0,7.5.0)", + org.eclipse.sirius.ext.base;bundle-version="[5.0.0,7.5.0)", + org.eclipse.sirius.table;bundle-version="[5.0.0,7.5.0)", org.obeonetwork.m2doc;bundle-version="[3.0.0,4.0.0)", org.obeonetwork.m2doc.genconf;bundle-version="[3.0.0,4.0.0)", - org.eclipse.sirius.common;bundle-version="[5.0.0,7.4.0)", + org.eclipse.sirius.common;bundle-version="[5.0.0,7.5.0)", org.eclipse.acceleo.query;bundle-version="[6.0.1,8.0.0)", org.obeonetwork.m2doc.ide;bundle-version="[3.0.0,4.0.0)", org.eclipse.acceleo.annotations;bundle-version="[5.0.0,8.0.0)", diff --git a/plugins/org.obeonetwork.m2doc/META-INF/MANIFEST.MF b/plugins/org.obeonetwork.m2doc/META-INF/MANIFEST.MF index 13ef32556..cd56c0317 100644 --- a/plugins/org.obeonetwork.m2doc/META-INF/MANIFEST.MF +++ b/plugins/org.obeonetwork.m2doc/META-INF/MANIFEST.MF @@ -13,27 +13,27 @@ Require-Bundle: org.eclipse.emf.ecore;visibility:=reexport, org.antlr.runtime;bundle-version="4.3.0", org.apache.poi;bundle-version="[5.2.3,5.2.4)", org.eclipse.acceleo.annotations;bundle-version="[5.0.0,8.0.0)", - org.apache.batik.transcoder;bundle-version="[1.16.0,1.16.1)", - org.apache.batik.util;bundle-version="[1.16.0,1.16.1)", - org.apache.batik.constants;bundle-version="[1.16.0,1.16.1)", - org.apache.batik.dom;bundle-version="[1.16.0,1.16.1)", - org.apache.batik.css;bundle-version="[1.16.0,1.16.1)", - org.apache.batik.gvt;bundle-version="[1.16.0,1.16.1)", - org.apache.batik.anim;bundle-version="[1.16.0,1.16.1)", - org.apache.batik.i18n;bundle-version="[1.16.0,1.16.1)", - org.apache.batik.dom.svg;bundle-version="[1.16.0,1.16.1)", - org.apache.batik.xml;bundle-version="[1.16.0,1.16.1)", - org.apache.batik.parser;bundle-version="[1.16.0,1.16.1)", - org.apache.batik.awt.util;bundle-version="1.16.0", + org.apache.batik.transcoder;bundle-version="[1.17.0,1.17.1)", + org.apache.batik.util;bundle-version="[1.17.0,1.17.1)", + org.apache.batik.constants;bundle-version="[1.17.0,1.17.1)", + org.apache.batik.dom;bundle-version="[1.17.0,1.17.1)", + org.apache.batik.css;bundle-version="[1.17.0,1.17.1)", + org.apache.batik.gvt;bundle-version="[1.17.0,1.17.1)", + org.apache.batik.anim;bundle-version="[1.17.0,1.17.1)", + org.apache.batik.i18n;bundle-version="[1.17.0,1.17.1)", + org.apache.batik.dom.svg;bundle-version="[1.17.0,1.17.1)", + org.apache.batik.xml;bundle-version="[1.17.0,1.17.1)", + org.apache.batik.parser;bundle-version="[1.17.0,1.17.1)", + org.apache.batik.awt.util;bundle-version="[1.17.0,1.17.1)", org.w3c.dom.svg;bundle-version="1.1.0", org.w3c.dom.smil;bundle-version="1.0.1", org.w3c.css.sac;bundle-version="1.3.1", - org.apache.xmlgraphics;bundle-version="[2.7.0,2.7.1)", - org.apache.batik.ext;bundle-version="[1.16.0,1.16.1)", - org.apache.batik.codec;bundle-version="[1.16.0,1.16.1)", - org.apache.batik.bridge;bundle-version="[1.16.0,1.16.1)", - org.apache.batik.script;bundle-version="[1.16.0,1.16.1)", - org.apache.batik.svggen;bundle-version="[1.16.0,1.16.1)" + org.apache.xmlgraphics;bundle-version="[2.9.0,2.9.1)", + org.apache.batik.ext;bundle-version="[1.17.0,1.17.1)", + org.apache.batik.codec;bundle-version="[1.17.0,1.17.1)", + org.apache.batik.bridge;bundle-version="[1.17.0,1.17.1)", + org.apache.batik.script;bundle-version="[1.17.0,1.17.1)", + org.apache.batik.svggen;bundle-version="[1.17.0,1.17.1)" Export-Package: org.obeonetwork.m2doc, org.obeonetwork.m2doc.element, org.obeonetwork.m2doc.element.impl, diff --git a/pom.xml b/pom.xml index 31f3fcde6..4737e1be5 100644 --- a/pom.xml +++ b/pom.xml @@ -39,6 +39,7 @@ releng/org.obeonetwork.m2doc.targetplatforms/photon releng/org.obeonetwork.m2doc.targetplatforms/oxygen + releng/org.obeonetwork.m2doc.targetplatforms/sirius-7.4.0 releng/org.obeonetwork.m2doc.targetplatforms/sirius-7.2.1 + + platform-sirius-7.4.0 + + false + + platform-version-name + sirius-7.4.0 + + + + https://download.eclipse.org/sirius/updates/stable/7.4.0-S20240124-123506/2023-03/ + + + + + org.eclipse.tycho + target-platform-configuration + + + + org.obeonetwork.m2doc + m2doc-sirius-7.4.0 + 3.3.2-SNAPSHOT + + + + + + + platform-sirius-7.2.1 diff --git a/releng/org.obeonetwork.m2doc.targetplatforms/sirius-7.4.0/m2doc-sirius-7.4.0-SDK.target b/releng/org.obeonetwork.m2doc.targetplatforms/sirius-7.4.0/m2doc-sirius-7.4.0-SDK.target new file mode 100644 index 000000000..eb385edce --- /dev/null +++ b/releng/org.obeonetwork.m2doc.targetplatforms/sirius-7.4.0/m2doc-sirius-7.4.0-SDK.target @@ -0,0 +1,111 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/releng/org.obeonetwork.m2doc.targetplatforms/sirius-7.4.0/m2doc-sirius-7.4.0-SDK.tpd b/releng/org.obeonetwork.m2doc.targetplatforms/sirius-7.4.0/m2doc-sirius-7.4.0-SDK.tpd new file mode 100644 index 000000000..c5b7514a9 --- /dev/null +++ b/releng/org.obeonetwork.m2doc.targetplatforms/sirius-7.4.0/m2doc-sirius-7.4.0-SDK.tpd @@ -0,0 +1,5 @@ +target "M2Doc Sirius 7.4.0 Target Platform SDK" + +with source requirements + +include "m2doc-sirius-7.4.0.tpd" diff --git a/releng/org.obeonetwork.m2doc.targetplatforms/sirius-7.4.0/m2doc-sirius-7.4.0.target b/releng/org.obeonetwork.m2doc.targetplatforms/sirius-7.4.0/m2doc-sirius-7.4.0.target new file mode 100644 index 000000000..7c4d94f3a --- /dev/null +++ b/releng/org.obeonetwork.m2doc.targetplatforms/sirius-7.4.0/m2doc-sirius-7.4.0.target @@ -0,0 +1,111 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/releng/org.obeonetwork.m2doc.targetplatforms/sirius-7.4.0/m2doc-sirius-7.4.0.tpd b/releng/org.obeonetwork.m2doc.targetplatforms/sirius-7.4.0/m2doc-sirius-7.4.0.tpd new file mode 100644 index 000000000..54048e970 --- /dev/null +++ b/releng/org.obeonetwork.m2doc.targetplatforms/sirius-7.4.0/m2doc-sirius-7.4.0.tpd @@ -0,0 +1,120 @@ +target "M2Doc Sirius 7.4.0 Target Platform" + +with requirements + +location Eclipse-Shared-License "https://download.eclipse.org/cbi/updates/license" { + org.eclipse.license.feature.group lazy +} + +location Eclipse "https://download.eclipse.org/releases/2023-03" { + org.eclipse.platform.sdk lazy + org.eclipse.equinox.core.feature.feature.group lazy + org.eclipse.equinox.executable.feature.group lazy + org.eclipse.core.runtime lazy + org.eclipse.ui lazy + org.eclipse.ui.views.log lazy + org.eclipse.epp.mpc.feature.group lazy + + org.eclipse.emf.sdk.feature.group lazy + org.junit [4.0.0,5.0.0) + org.eclipse.jdt.feature.group lazy + org.w3c.dom.svg lazy + org.w3c.dom.smil lazy + org.w3c.css.sac lazy + + // for testing purpose only + org.eclipse.uml2.feature.group lazy + org.eclipse.pde.feature.group lazy + + org.apache.xerces lazy + + // AQL + org.antlr.runtime [4.7.2,4.7.3) + + // wikitext + org.eclipse.mylyn.wikitext [3.0.0,3.1.0) + org.eclipse.mylyn.wikitext.asciidoc [3.0.0,3.1.0) + org.eclipse.mylyn.wikitext.confluence [3.0.0,3.1.0) + org.eclipse.mylyn.wikitext.html [3.0.0,3.1.0) + org.eclipse.mylyn.wikitext.markdown [3.0.0,3.1.0) + org.eclipse.mylyn.wikitext.mediawiki [3.0.0,3.1.0) + org.eclipse.mylyn.wikitext.textile [3.0.0,3.1.0) + org.eclipse.mylyn.wikitext.tracwiki [3.0.0,3.1.0) + org.eclipse.mylyn.wikitext.twiki [3.0.0,3.1.0) +} + +location GMF-Notation-1.13.1 "https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R202211151334" { + org.eclipse.gmf.runtime.notation.sdk.feature.group lazy +} + +location GMF-Runtime-1.16.3 "https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones/S202401081627/" { + org.eclipse.gmf.runtime.sdk.feature.group lazy + org.eclipse.gmf.runtime.thirdparty.feature.group lazy + + org.apache.batik.ext [1.17.0,1.17.1) + org.apache.batik.codec [1.17.0,1.17.1) + org.apache.batik.bridge [1.17.0,1.17.1) + org.apache.batik.script [1.17.0,1.17.1) + + org.apache.batik.transcoder [1.17.0,1.17.1) + org.apache.batik.util [1.17.0,1.17.1) + org.apache.batik.constants [1.17.0,1.17.1) + org.apache.batik.dom [1.17.0,1.17.1) + org.apache.batik.css [1.17.0,1.17.1) + org.apache.batik.gvt [1.17.0,1.17.1) + org.apache.batik.anim [1.17.0,1.17.1) + org.apache.batik.i18n [1.17.0,1.17.1) + org.apache.batik.dom.svg [1.17.0,1.17.1) + org.apache.batik.xml [1.17.0,1.17.1) + org.apache.batik.parser [1.17.0,1.17.1) + org.apache.batik.awt.util [1.17.0,1.17.1) + org.apache.batik.svggen [1.17.0,1.17.1) + org.apache.xmlgraphics [2.9.0,2.9.1) +} + +location GEF-Classic "https://download.eclipse.org/tools/gef/classic/releases/3.17.0" { + org.eclipse.gef.feature.group lazy + org.eclipse.gef.sdk.feature.group lazy + org.eclipse.draw2d.sdk.feature.group lazy +} + +location "https://download.eclipse.org/sirius/updates/stable/7.4.0-S20240124-123506/2023-03/" { + org.eclipse.sirius.runtime.feature.group lazy + org.eclipse.sirius lazy + org.eclipse.sirius.diagram lazy + org.eclipse.sirius.diagram.ui lazy + org.eclipse.sirius.table lazy + org.eclipse.sirius.table.ui lazy + org.eclipse.sirius.runtime.ide.ui.feature.group lazy + + // AQL + org.eclipse.acceleo.query.feature.group lazy + org.eclipse.acceleo.query.source.feature.group lazy +} + +location "https://download.eclipse.org/tools/orbit/downloads/drops/R20190827152740/repository/" { + org.kohsuke.args4j [2.0.21,2.1.0) + javax.servlet [3.1.0,3.2.0) +} + +location "https://download.eclipse.org/tools/orbit/downloads/drops/R20180905201904/repository/" { + com.google.guava [15.0.0,16.0.0) +} + +location ObeoNetworkBits "https://obeo-networkaggregation-releases.s3.eu-west-1.amazonaws.com/bits/master/thirdparties" { + org.apache.poi.feature.feature.group lazy +} + +location CDO "https://download.eclipse.org/modeling/emf/cdo/updates/releases/4.7/" { + org.eclipse.emf.cdo.sdk.feature.group lazy + org.eclipse.net4j.feature.group lazy +} + +location XText "https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.29.0/" { + // for testing purpose only + org.eclipse.xtext.sdk.feature.group [2.29.0,2.30.0) +} + +location "https://download.eclipse.org/rcptt/release/2.5.4/repository" { + org.eclipse.rcptt.platform.feature.group lazy +} \ No newline at end of file diff --git a/releng/org.obeonetwork.m2doc.targetplatforms/sirius-7.4.0/pom.xml b/releng/org.obeonetwork.m2doc.targetplatforms/sirius-7.4.0/pom.xml new file mode 100644 index 000000000..497f91029 --- /dev/null +++ b/releng/org.obeonetwork.m2doc.targetplatforms/sirius-7.4.0/pom.xml @@ -0,0 +1,18 @@ + + 4.0.0 + + + org.obeonetwork.m2doc + org.obeonetwork.m2doc.parent + 3.3.2-SNAPSHOT + ../../.. + + + org.obeonetwork.m2doc + m2doc-sirius-7.4.0 + 3.3.2-SNAPSHOT + eclipse-target-definition + + diff --git a/releng/org.obeonetwork.m2doc.update/category.xml b/releng/org.obeonetwork.m2doc.update/category.xml index 6a4ad7649..3e15f8937 100644 --- a/releng/org.obeonetwork.m2doc.update/category.xml +++ b/releng/org.obeonetwork.m2doc.update/category.xml @@ -81,23 +81,23 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/tests/org.obeonetwork.m2doc.sirius.tests/META-INF/MANIFEST.MF b/tests/org.obeonetwork.m2doc.sirius.tests/META-INF/MANIFEST.MF index dafe4c3d2..39c659f65 100644 --- a/tests/org.obeonetwork.m2doc.sirius.tests/META-INF/MANIFEST.MF +++ b/tests/org.obeonetwork.m2doc.sirius.tests/META-INF/MANIFEST.MF @@ -11,9 +11,9 @@ Require-Bundle: org.junit, org.obeonetwork.m2doc;bundle-version="[3.0.0,4.0.0)", org.eclipse.core.runtime, org.obeonetwork.m2doc.genconf;bundle-version="[3.0.0,4.0.0)", - org.eclipse.sirius;bundle-version="[5.0.0,7.4.0)", - org.eclipse.sirius.table;bundle-version="[5.0.0,7.4.0)", - org.eclipse.sirius.common;bundle-version="[5.0.0,7.4.0)", + org.eclipse.sirius;bundle-version="[5.0.0,7.5.0)", + org.eclipse.sirius.table;bundle-version="[5.0.0,7.5.0)", + org.eclipse.sirius.common;bundle-version="[5.0.0,7.5.0)", org.obeonetwork.m2doc.tests;bundle-version="[3.0.0,4.0.0)", org.apache.poi;bundle-version="[5.2.3,5.2.4)", org.eclipse.emf.transaction, diff --git a/tests/org.obeonetwork.m2doc.tests/META-INF/MANIFEST.MF b/tests/org.obeonetwork.m2doc.tests/META-INF/MANIFEST.MF index f585f2dde..2985b0625 100644 --- a/tests/org.obeonetwork.m2doc.tests/META-INF/MANIFEST.MF +++ b/tests/org.obeonetwork.m2doc.tests/META-INF/MANIFEST.MF @@ -8,7 +8,7 @@ Require-Bundle: org.eclipse.core.runtime, org.obeonetwork.m2doc;bundle-version="[3.0.0,4.0.0)", org.junit;bundle-version="4.11.0", org.obeonetwork.m2doc.sirius;bundle-version="[3.0.0,4.0.0)", - org.eclipse.sirius.diagram;bundle-version="[5.0.0,7.4.0)", + org.eclipse.sirius.diagram;bundle-version="[5.0.0,7.5.0)", org.eclipse.core.resources, org.obeonetwork.m2doc.genconf;bundle-version="[3.0.0,4.0.0)", org.eclipse.acceleo.query;bundle-version="[6.0.1,8.0.0)",