Updated target platforms.

ObeoNetwork · Apr 5, 2024 · 9608a64 · 9608a64
1 parent 2c3cbb2
commit 9608a64
Show file tree

Hide file tree

Showing 55 changed files with 1,080 additions and 39 deletions.
diff --git a/.github/workflows/matrix_includes.json b/.github/workflows/matrix_includes.json
@@ -1,7 +1,17 @@
 [
   {
     "java":"17",
-    "profile":"platform-sirius-7.4.0,tests,updatesites",
+    "profile":"platform-2024-03,tests,updatesites",
+    "tycho":"3.0.3"
+  },
+  {
+    "java":"17",
+    "profile":"platform-sirius-7.4.0,tests",
+    "tycho":"3.0.3"
+  },
+  {
+    "java":"17",
+    "profile":"platform-capella-7.0.0,tests",
     "tycho":"3.0.3"
   }
 ]
diff --git a/plugins/org.obeonetwork.m2doc.wikitext/META-INF/MANIFEST.MF b/plugins/org.obeonetwork.m2doc.wikitext/META-INF/MANIFEST.MF
@@ -12,14 +12,14 @@ Require-Bundle: org.eclipse.acceleo.annotations;bundle-version="[5.0.0,8.0.0)",
  org.obeonetwork.m2doc;bundle-version="[3.0.0,4.0.0)",
  org.apache.poi;bundle-version="[5.2.3,5.2.4)",
  org.eclipse.acceleo.query,
- org.eclipse.mylyn.wikitext;bundle-version="[3.0.0,3.1.0)",
- org.eclipse.mylyn.wikitext.asciidoc;bundle-version="[3.0.0,3.1.0)",
- org.eclipse.mylyn.wikitext.confluence;bundle-version="[3.0.0,3.1.0)",
- org.eclipse.mylyn.wikitext.html;bundle-version="[3.0.0,3.1.0)",
- org.eclipse.mylyn.wikitext.markdown;bundle-version="[3.0.0,3.1.0)",
- org.eclipse.mylyn.wikitext.mediawiki;bundle-version="[3.0.0,3.1.0)",
- org.eclipse.mylyn.wikitext.textile;bundle-version="[3.0.0,3.1.0)",
- org.eclipse.mylyn.wikitext.tracwiki;bundle-version="[3.0.0,3.1.0)",
- org.eclipse.mylyn.wikitext.twiki;bundle-version="[3.0.0,3.1.0)"
+ org.eclipse.mylyn.wikitext;bundle-version="[3.0.0,4.3.0)",
+ org.eclipse.mylyn.wikitext.asciidoc;bundle-version="[3.0.0,4.3.0)",
+ org.eclipse.mylyn.wikitext.confluence;bundle-version="[3.0.0,4.3.0)",
+ org.eclipse.mylyn.wikitext.html;bundle-version="[3.0.0,4.3.0)",
+ org.eclipse.mylyn.wikitext.markdown;bundle-version="[3.0.0,4.3.0)",
+ org.eclipse.mylyn.wikitext.mediawiki;bundle-version="[3.0.0,4.3.0)",
+ org.eclipse.mylyn.wikitext.textile;bundle-version="[3.0.0,4.3.0)",
+ org.eclipse.mylyn.wikitext.tracwiki;bundle-version="[3.0.0,4.3.0)",
+ org.eclipse.mylyn.wikitext.twiki;bundle-version="[3.0.0,4.3.0)"
 Export-Package: org.obeonetwork.m2doc.wikitext.services
 Automatic-Module-Name: org.obeonetwork.m2doc.wikitext
diff --git a/pom.xml b/pom.xml
@@ -21,8 +21,9 @@
 
   <modules>
     <!-- Eclipse -->
-    <module>releng/org.obeonetwork.m2doc.targetplatforms/2022-12</module>
-    <!--module>releng/org.obeonetwork.m2doc.targetplatforms/2021-12</module>
+    <module>releng/org.obeonetwork.m2doc.targetplatforms/2024-03</module>
+    <!--module>releng/org.obeonetwork.m2doc.targetplatforms/2022-12</module>
+    <module>releng/org.obeonetwork.m2doc.targetplatforms/2021-12</module>
     <module>releng/org.obeonetwork.m2doc.targetplatforms/2021-09</module>
     <module>releng/org.obeonetwork.m2doc.targetplatforms/2021-06</module>
     <module>releng/org.obeonetwork.m2doc.targetplatforms/2021-03</module>
@@ -40,8 +41,8 @@
     <module>releng/org.obeonetwork.m2doc.targetplatforms/oxygen</module-->
     <!-- Sirius -->
     <module>releng/org.obeonetwork.m2doc.targetplatforms/sirius-7.4.0</module>
-    <module>releng/org.obeonetwork.m2doc.targetplatforms/sirius-7.2.1</module>
-    <!--module>releng/org.obeonetwork.m2doc.targetplatforms/sirius-7.1.0</module>
+    <!--module>releng/org.obeonetwork.m2doc.targetplatforms/sirius-7.2.1</module>
+    <module>releng/org.obeonetwork.m2doc.targetplatforms/sirius-7.1.0</module>
     <module>releng/org.obeonetwork.m2doc.targetplatforms/sirius-7.0.0</module>
     <module>releng/org.obeonetwork.m2doc.targetplatforms/sirius-6.6.0</module>
     <module>releng/org.obeonetwork.m2doc.targetplatforms/sirius-6.5.1</module>
@@ -57,8 +58,9 @@
     <module>releng/org.obeonetwork.m2doc.targetplatforms/sirius-6.0.0</module>
     <module>releng/org.obeonetwork.m2doc.targetplatforms/sirius-5.1.1</module-->
     <!-- Capella -->
-    <module>releng/org.obeonetwork.m2doc.targetplatforms/capella-6.1.0</module>
-    <!--module>releng/org.obeonetwork.m2doc.targetplatforms/capella-6.0.0</module>
+    <module>releng/org.obeonetwork.m2doc.targetplatforms/capella-7.0.0</module>
+    <!--module>releng/org.obeonetwork.m2doc.targetplatforms/capella-6.1.0</module>
+    <module>releng/org.obeonetwork.m2doc.targetplatforms/capella-6.0.0</module>
     <module>releng/org.obeonetwork.m2doc.targetplatforms/capella-5.2.0</module>
     <module>releng/org.obeonetwork.m2doc.targetplatforms/capella-5.1.0</module>
     <module>releng/org.obeonetwork.m2doc.targetplatforms/capella-5.0.0</module>
@@ -406,6 +408,36 @@
     </profile>
 
     <!-- Eclipse -->
+    <profile>
+      <id>platform-2024-03</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+        <property>
+          <name>platform-version-name</name>
+          <value>2024-03</value>
+        </property>
+      </activation>
+      <properties>
+        <eclipse-rcptt-inject-site>http://download.eclipse.org/releases/2024-03</eclipse-rcptt-inject-site>
+      </properties>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.eclipse.tycho</groupId>
+            <artifactId>target-platform-configuration</artifactId>
+            <configuration>
+              <target>
+                <artifact>
+                  <groupId>org.obeonetwork.m2doc</groupId>
+                  <artifactId>m2doc-2024-03</artifactId>
+                  <version>3.3.2-SNAPSHOT</version>
+                </artifact>
+              </target>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
     <profile>
       <id>platform-2022-12</id>
       <activation>
@@ -1430,6 +1462,36 @@
     </profile>
 
     <!-- Capella -->
+    <profile>
+      <id>platform-capella-7.0.0</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+        <property>
+          <name>platform-version-name</name>
+          <value>capella-7.0.0</value>
+        </property>
+      </activation>
+      <properties>
+        <eclipse-rcptt-inject-site>https://download.eclipse.org/sirius/updates/stable/7.4.1-S20240319-042018/2023-03</eclipse-rcptt-inject-site>
+      </properties>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.eclipse.tycho</groupId>
+            <artifactId>target-platform-configuration</artifactId>
+            <configuration>
+              <target>
+                <artifact>
+                  <groupId>org.obeonetwork.m2doc</groupId>
+                  <artifactId>m2doc-capella-7.0.0</artifactId>
+                  <version>3.3.2-SNAPSHOT</version>
+                </artifact>
+              </target>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
     <profile>
       <id>platform-capella-6.1.0</id>
       <activation>
@@ -1440,7 +1502,7 @@
         </property>
       </activation>
       <properties>
-        <eclipse-rcptt-inject-site>https://download.eclipse.org/sirius/updates/stable/7.1.0-S20230210-122000/2021-06</eclipse-rcptt-inject-site>
+        <eclipse-rcptt-inject-site>https://download.eclipse.org/sirius/updates/releases/7.1.0/2021-06</eclipse-rcptt-inject-site>
       </properties>
       <build>
         <plugins>

diff --git a/releng/org.obeonetwork.m2doc.targetplatforms/2024-03/m2doc-2024-03-SDK.target b/releng/org.obeonetwork.m2doc.targetplatforms/2024-03/m2doc-2024-03-SDK.target
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
+<target name="M2Doc 2024-03 Target Platform SDK" sequenceNumber="1712330205">
+  <locations>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.license.feature.group" version="0.0.0"/>
+      <repository id="Eclipse-Shared-License" location="https://download.eclipse.org/cbi/updates/license"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.equinox.core.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.core.runtime" version="0.0.0"/>
+      <unit id="org.eclipse.ui" version="0.0.0"/>
+      <unit id="org.eclipse.ui.views.log" version="0.0.0"/>
+      <unit id="org.eclipse.epp.mpc.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
+      <unit id="org.junit" version="4.13.2.v20230809-1000"/>
+      <unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.uml2.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.sirius.runtime.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.sirius" version="0.0.0"/>
+      <unit id="org.eclipse.sirius.diagram" version="0.0.0"/>
+      <unit id="org.eclipse.sirius.diagram.ui" version="0.0.0"/>
+      <unit id="org.eclipse.sirius.table" version="0.0.0"/>
+      <unit id="org.eclipse.sirius.table.ui" version="0.0.0"/>
+      <unit id="org.eclipse.sirius.runtime.ide.ui.feature.group" version="0.0.0"/>
+      <unit id="org.apache.xerces" version="0.0.0"/>
+      <unit id="org.eclipse.acceleo.query.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.acceleo.query.source.feature.group" version="0.0.0"/>
+      <unit id="org.antlr.runtime" version="4.7.2.v20221112-0806"/>
+      <unit id="org.eclipse.mylyn.wikitext" version="4.2.0.v20240302-0923"/>
+      <unit id="org.eclipse.mylyn.wikitext.asciidoc" version="4.2.0.v20240227-1539"/>
+      <unit id="org.eclipse.mylyn.wikitext.confluence" version="4.2.0.v20240302-0923"/>
+      <unit id="org.eclipse.mylyn.wikitext.html" version="4.2.0.v20240221-1914"/>
+      <unit id="org.eclipse.mylyn.wikitext.markdown" version="4.2.0.v20240302-0923"/>
+      <unit id="org.eclipse.mylyn.wikitext.mediawiki" version="4.2.0.v20240302-0923"/>
+      <unit id="org.eclipse.mylyn.wikitext.textile" version="4.2.0.v20240302-0923"/>
+      <unit id="org.eclipse.mylyn.wikitext.tracwiki" version="4.2.0.v20240302-0923"/>
+      <unit id="org.eclipse.mylyn.wikitext.twiki" version="4.2.0.v20240302-0923"/>
+      <repository id="Eclipse" location="https://download.eclipse.org/releases/2024-03"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.w3c.dom.svg" version="0.0.0"/>
+      <unit id="org.w3c.dom.smil" version="0.0.0"/>
+      <unit id="org.w3c.css.sac" version="0.0.0"/>
+      <repository id="Eclipse2023-03" location="https://download.eclipse.org/releases/2023-03"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
+      <repository id="GMF-Notation-1.13.1" location="https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R202211151334"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.gmf.runtime.thirdparty.feature.group" version="0.0.0"/>
+      <unit id="org.apache.batik.ext" version="1.17.0.v20231215-1130"/>
+      <unit id="org.apache.batik.codec" version="1.17.0.v20231215-1130"/>
+      <unit id="org.apache.batik.bridge" version="1.17.0.v20231215-1130"/>
+      <unit id="org.apache.batik.script" version="1.17.0.v20231215-1130"/>
+      <unit id="org.apache.batik.transcoder" version="1.17.0.v20231215-1130"/>
+      <unit id="org.apache.batik.util" version="1.17.0.v20231215-1130"/>
+      <unit id="org.apache.batik.constants" version="1.17.0.v20231215-1130"/>
+      <unit id="org.apache.batik.dom" version="1.17.0.v20231215-1130"/>
+      <unit id="org.apache.batik.css" version="1.17.0.v20231215-1130"/>
+      <unit id="org.apache.batik.gvt" version="1.17.0.v20231215-1130"/>
+      <unit id="org.apache.batik.anim" version="1.17.0.v20231215-1130"/>
+      <unit id="org.apache.batik.i18n" version="1.17.0.v20231215-1130"/>
+      <unit id="org.apache.batik.dom.svg" version="1.17.0.v20231215-1130"/>
+      <unit id="org.apache.batik.xml" version="1.17.0.v20231215-1130"/>
+      <unit id="org.apache.batik.parser" version="1.17.0.v20231215-1130"/>
+      <unit id="org.apache.batik.awt.util" version="1.17.0.v20231215-1130"/>
+      <unit id="org.apache.batik.svggen" version="1.17.0.v20231215-1130"/>
+      <unit id="org.apache.xmlgraphics" version="2.9.0.v20230916-1600"/>
+      <repository id="GMF-Runtime-1.16.3" location="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones/S202401081627/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.gef.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.gef.sdk.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.draw2d.sdk.feature.group" version="0.0.0"/>
+      <repository id="GEF-Classic" location="https://download.eclipse.org/tools/gef/classic/releases/3.17.0"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.kohsuke.args4j" version="2.0.21.v201301150030"/>
+      <unit id="javax.servlet" version="3.1.0.v201410161800"/>
+      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20190827152740/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="com.google.guava" version="15.0.0.v201403281430"/>
+      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20180905201904/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.apache.poi.feature.feature.group" version="0.0.0"/>
+      <repository id="ObeoNetworkBits" location="https://obeo-networkaggregation-releases.s3.eu-west-1.amazonaws.com/bits/master/thirdparties"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.cdo.sdk.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.net4j.feature.group" version="0.0.0"/>
+      <repository id="CDO" location="https://download.eclipse.org/modeling/emf/cdo/drops/R20230307-0126/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.30.0.v20230227-1344"/>
+      <repository id="XText" location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.30.0/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.rcptt.platform.feature.group" version="0.0.0"/>
+      <repository location="https://download.eclipse.org/rcptt/release/2.5.4/repository"/>
+    </location>
+  </locations>
+</target>
diff --git a/releng/org.obeonetwork.m2doc.targetplatforms/2024-03/m2doc-2024-03-SDK.tpd b/releng/org.obeonetwork.m2doc.targetplatforms/2024-03/m2doc-2024-03-SDK.tpd
@@ -0,0 +1,5 @@
+target "M2Doc 2024-03 Target Platform SDK"
+
+with source requirements
+
+include "m2doc-2024-03.tpd"