Updated RCPTT tests.

ObeoNetwork · Apr 11, 2024 · eb9fc40 · eb9fc40
1 parent 9e2f9a9
commit eb9fc40
Show file tree

Hide file tree

Showing 24 changed files with 411 additions and 48 deletions.
diff --git a/pom.xml b/pom.xml
@@ -378,13 +378,55 @@
       </activation>
       <modules>
         <module>releng/org.obeonetwork.m2doc.update</module>
-        <!--module>tests/org.obeonetwork.m2doc.rcptt.a</module>
+      </modules>
+    </profile>
+    <profile>
+      <id>rcptt</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+      </activation>
+      <modules>
+        <module>releng/org.obeonetwork.m2doc.targetplatforms/rcptt</module>
+        <module>tests/org.obeonetwork.m2doc.rcptt.a</module>
         <module>tests/org.obeonetwork.m2doc.rcptt.b</module>
         <module>tests/org.obeonetwork.m2doc.rcptt.ui</module>
         <module>releng/org.obeonetwork.m2doc.rcpttproduct</module>
         <module>tests/org.obeonetwork.m2doc.rcptt</module>
-        <module>features/org.obeonetwork.m2doc.rcptt.feature</module-->
+        <module>features/org.obeonetwork.m2doc.rcptt.feature</module>
+
+        <module>tests/org.obeonetwork.m2doc.tests</module>
+        <module>tests/org.obeonetwork.m2doc.ide.tests</module>
+        <module>tests/org.obeonetwork.m2doc.sirius.tests</module>
+        <module>tests/org.obeonetwork.m2doc.genconf.tests</module>
+        <module>tests/org.obeonetwork.m2doc.genconf.edit.tests</module>
+        <module>tests/org.obeonetwork.m2doc.cdo.tests</module>
+        <module>tests/org.obeonetwork.m2doc.html.tests</module>
+        <module>tests/org.obeonetwork.m2doc.wikitext.tests</module>
+
+        <module>tests/org.xtext.example.mydsl</module>
+        <module>tests/org.xtext.example.mydsl.ide</module>
+        <module>tests/org.xtext.example.mydsl.ui</module>
       </modules>
+      <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-rcptt</artifactId>
+                  <version>3.3.3-SNAPSHOT</version>
+                </artifact>
+              </target>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
     </profile>
     <profile>
       <id>tests</id>

diff --git a/releng/org.obeonetwork.m2doc.rcpttproduct/m2doc.product b/releng/org.obeonetwork.m2doc.rcpttproduct/m2doc.product
@@ -7,7 +7,7 @@
       <text>
          M2Doc
 
-Version  3.3.2
+Version  3.3.3
 
 
 Visit https://github.com/ObeoNetwork/M2Doc

diff --git a/releng/org.obeonetwork.m2doc.rcpttproduct/pom.xml b/releng/org.obeonetwork.m2doc.rcpttproduct/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright (c) 2017, 2020 Obeo.
+Copyright (c) 2017, 2024 Obeo.
 All rights reserved. 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
@@ -17,7 +17,7 @@ Contributors:
     <groupId>org.obeonetwork.m2doc</groupId>
     <artifactId>org.obeonetwork.m2doc.parent</artifactId>
     <relativePath>../..</relativePath>
-    <version>3.3.2-SNAPSHOT</version>
+    <version>3.3.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.obeonetwork.m2doc.rcpttproduct</artifactId>

diff --git a/releng/org.obeonetwork.m2doc.targetplatforms/2022-12/m2doc-2022-12.tpd b/releng/org.obeonetwork.m2doc.targetplatforms/2022-12/m2doc-2022-12.tpd
@@ -25,7 +25,7 @@ location Eclipse "https://download.eclipse.org/releases/2022-12" {
 	org.w3c.dom.smil lazy
 	org.w3c.css.sac lazy
 
-    // for testing purpose only
+	// for testing purpose only
 	org.eclipse.uml2.feature.group lazy
 	org.eclipse.pde.feature.group lazy
 
@@ -103,4 +103,4 @@ location XText "https://download.eclipse.org/modeling/tmf/xtext/updates/releases
 
 location "https://download.eclipse.org/rcptt/release/2.5.4/repository" {
 	org.eclipse.rcptt.platform.feature.group lazy
-}
+}
diff --git a/releng/org.obeonetwork.m2doc.targetplatforms/2022-12/pom.xml b/releng/org.obeonetwork.m2doc.targetplatforms/2022-12/pom.xml
@@ -6,13 +6,13 @@
   <parent>
 	<groupId>org.obeonetwork.m2doc</groupId>
 	<artifactId>org.obeonetwork.m2doc.parent</artifactId>
-	<version>3.3.2-SNAPSHOT</version>
+	<version>3.3.3-SNAPSHOT</version>
     <relativePath>../../..</relativePath>
   </parent>
 
   <groupId>org.obeonetwork.m2doc</groupId>
   <artifactId>m2doc-2022-12</artifactId>
-  <version>3.3.2-SNAPSHOT</version>
+  <version>3.3.3-SNAPSHOT</version>
   <packaging>eclipse-target-definition</packaging>
 
 </project>
diff --git a/releng/org.obeonetwork.m2doc.targetplatforms/rcptt/m2doc-rcptt-SDK.target b/releng/org.obeonetwork.m2doc.targetplatforms/rcptt/m2doc-rcptt-SDK.target
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
+<target name="M2Doc RCPTT Target Platform SDK" sequenceNumber="1712839763">
+  <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.platform.sdk" 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.v20211018-1956"/>
+      <unit id="org.eclipse.gmf" version="0.0.0"/>
+      <unit id="org.eclipse.gmf.runtime.diagram.ui" version="0.0.0"/>
+      <unit id="org.eclipse.gmf.runtime.diagram.ui.render" version="0.0.0"/>
+      <unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
+      <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"/>
+      <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="3.0.42.20220107230029"/>
+      <unit id="org.eclipse.mylyn.wikitext.asciidoc" version="3.0.42.20220107230029"/>
+      <unit id="org.eclipse.mylyn.wikitext.confluence" version="3.0.42.20220107230029"/>
+      <unit id="org.eclipse.mylyn.wikitext.html" version="3.0.42.20220107230029"/>
+      <unit id="org.eclipse.mylyn.wikitext.markdown" version="3.0.42.20220107230029"/>
+      <unit id="org.eclipse.mylyn.wikitext.mediawiki" version="3.0.42.20220107230029"/>
+      <unit id="org.eclipse.mylyn.wikitext.textile" version="3.0.42.20220107230029"/>
+      <unit id="org.eclipse.mylyn.wikitext.tracwiki" version="3.0.42.20220107230029"/>
+      <unit id="org.eclipse.mylyn.wikitext.twiki" version="3.0.42.20220107230029"/>
+      <repository id="Eclipse" location="https://download.eclipse.org/releases/2022-12"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <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.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.29.0.v20221121-1054"/>
+      <repository id="XText" location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.29.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/rcptt/m2doc-rcptt-SDK.tpd b/releng/org.obeonetwork.m2doc.targetplatforms/rcptt/m2doc-rcptt-SDK.tpd
@@ -0,0 +1,5 @@
+target "M2Doc RCPTT Target Platform SDK"
+
+with source requirements
+
+include "m2doc-rcptt.tpd"
diff --git a/releng/org.obeonetwork.m2doc.targetplatforms/rcptt/m2doc-rcptt.target b/releng/org.obeonetwork.m2doc.targetplatforms/rcptt/m2doc-rcptt.target
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
+<target name="M2Doc RCPTT Target Platform" sequenceNumber="1712839763">
+  <locations>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="false" 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="false" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.platform.sdk" 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.v20211018-1956"/>
+      <unit id="org.eclipse.gmf" version="0.0.0"/>
+      <unit id="org.eclipse.gmf.runtime.diagram.ui" version="0.0.0"/>
+      <unit id="org.eclipse.gmf.runtime.diagram.ui.render" version="0.0.0"/>
+      <unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
+      <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"/>
+      <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="3.0.42.20220107230029"/>
+      <unit id="org.eclipse.mylyn.wikitext.asciidoc" version="3.0.42.20220107230029"/>
+      <unit id="org.eclipse.mylyn.wikitext.confluence" version="3.0.42.20220107230029"/>
+      <unit id="org.eclipse.mylyn.wikitext.html" version="3.0.42.20220107230029"/>
+      <unit id="org.eclipse.mylyn.wikitext.markdown" version="3.0.42.20220107230029"/>
+      <unit id="org.eclipse.mylyn.wikitext.mediawiki" version="3.0.42.20220107230029"/>
+      <unit id="org.eclipse.mylyn.wikitext.textile" version="3.0.42.20220107230029"/>
+      <unit id="org.eclipse.mylyn.wikitext.tracwiki" version="3.0.42.20220107230029"/>
+      <unit id="org.eclipse.mylyn.wikitext.twiki" version="3.0.42.20220107230029"/>
+      <repository id="Eclipse" location="https://download.eclipse.org/releases/2022-12"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
+      <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="false" 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="false" 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="false" 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="false" 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="false" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.29.0.v20221121-1054"/>
+      <repository id="XText" location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.29.0/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="false" 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>
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,7 @@ @@
           <text>
              M2Doc
-    Version  3.3.2
+    Version  3.3.3
     Visit https://github.com/ObeoNetwork/M2Doc
@@ Expand Down @@