Merge branch 'master' into sdo/interactiveMrTree

kieler · Mar 7, 2024 · df751d0 · df751d0
2 parents 78ebf90 + a60f1ab
commit df751d0
Show file tree

Hide file tree

Showing 420 changed files with 9,457 additions and 2,505 deletions.
diff --git a/.github/workflows/buildAndTest.yml b/.github/workflows/buildAndTest.yml
@@ -6,18 +6,26 @@ on:
       - '**'
     tags-ignore:
       - '**'
+  pull_request_target: # enables builds of PRs to branch 'master' from forked repos, with the workflow being taken from the target revision, i.e. the 'master' branch
+    branches:
+      - master
   workflow_dispatch: # enables manual triggering
 
 jobs:
   build:
+    # suppress triggering this job on 'synchronize' events of PR's (i.e. branch updates) within the same repo, as that is covered by 'push' already, but fire on updates of PRs coming from outside
+    if: github.event_name != 'pull_request_target' || github.event.action != 'synchronize' || github.event.pull_request.base.repo.id != github.event.pull_request.head.repo.id 
     runs-on: ubuntu-latest
     steps:
+# this provides some extremly helpful insight into the meta data of the current execution, see also https://docs.github.com/en/actions/learn-github-actions/contexts#github-context and https://stackoverflow.com/questions/70104600/complete-list-of-github-actions-contexts
+#   - name: Dump GitHub context
+#     run: echo '${{ toJSON(github) }}'
     - uses: actions/checkout@v2
     - uses: nelonoel/[email protected]
     - name: Set up JDK
       uses: actions/setup-java@v2
       with:
-        java-version: 8
+        java-version: 17
         distribution: adopt
     - name: Cache Maven packages
       uses: actions/cache@v2

diff --git a/build/de.cau.cs.kieler.klighd.repository/category.xml b/build/de.cau.cs.kieler.klighd.repository/category.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
 
-   <description name="KIELER Lightweight Diagrams" url="http://services.typefox.io/open-source/jenkins/job/KLighD/job/master/lastSuccessfulBuild/artifact/updatesite/">
+   <description name="KIELER Lightweight Diagrams" url="https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/nightly/klighd/">
       Update site for KIELER Lightweight Diagrams nightly builds.
    </description>
 
@@ -11,63 +11,63 @@
       </description>
    </category-def>
 
-   <feature url="features/de.cau.cs.kieler.klighd.feature_2.2.1.qualifier.jar" id="de.cau.cs.kieler.klighd.feature" version="2.2.1.qualifier">
+   <feature url="features/de.cau.cs.kieler.klighd.feature_2.3.1.qualifier.jar" id="de.cau.cs.kieler.klighd.feature" version="2.3.1.qualifier">
       <category name="kieler-klighd"/>
    </feature>
-   <feature url="features/de.cau.cs.kieler.klighd.feature.source_2.2.1.qualifier.jar" id="de.cau.cs.kieler.klighd.feature.source" version="2.2.1.qualifier">
+   <feature url="features/de.cau.cs.kieler.klighd.feature.source_2.3.1.qualifier.jar" id="de.cau.cs.kieler.klighd.feature.source" version="2.3.1.qualifier">
       <category name="kieler-klighd"/>
    </feature>
 
-   <feature url="features/de.cau.cs.kieler.klighd.batik.feature_2.2.1.qualifier.jar" id="de.cau.cs.kieler.klighd.batik.feature" version="2.2.1.qualifier">
+   <!-- <feature url="features/de.cau.cs.kieler.klighd.batik.feature_2.2.1.qualifier.jar" id="de.cau.cs.kieler.klighd.batik.feature" version="2.2.1.qualifier">
       <category name="kieler-klighd"/>
    </feature>
    <feature url="features/de.cau.cs.kieler.klighd.batik.feature.source_2.2.1.qualifier.jar" id="de.cau.cs.kieler.klighd.batik.feature.source" version="2.2.1.qualifier">
       <category name="kieler-klighd"/>
-   </feature>
+   </feature> -->
 
-   <feature url="features/de.cau.cs.kieler.klighd.freehep.feature_2.2.1.qualifier.jar" id="de.cau.cs.kieler.klighd.freehep.feature" version="2.2.1.qualifier">
+   <feature url="features/de.cau.cs.kieler.klighd.freehep.feature_2.3.1.qualifier.jar" id="de.cau.cs.kieler.klighd.freehep.feature" version="2.3.1.qualifier">
       <category name="kieler-klighd"/>
    </feature>
-   <feature url="features/de.cau.cs.kieler.klighd.freehep.feature.source_2.2.1.qualifier.jar" id="de.cau.cs.kieler.klighd.freehep.feature.source" version="2.2.1.qualifier">
+   <feature url="features/de.cau.cs.kieler.klighd.freehep.feature.source_2.3.1.qualifier.jar" id="de.cau.cs.kieler.klighd.freehep.feature.source" version="2.3.1.qualifier">
       <category name="kieler-klighd"/>
    </feature>
 
-   <feature url="features/de.cau.cs.kieler.klighd.draw2d.feature_2.2.1.qualifier.jar" id="de.cau.cs.kieler.klighd.draw2d.feature" version="2.2.1.qualifier">
+   <feature url="features/de.cau.cs.kieler.klighd.draw2d.feature_2.3.1.qualifier.jar" id="de.cau.cs.kieler.klighd.draw2d.feature" version="2.3.1.qualifier">
       <category name="kieler-klighd"/>
    </feature>
-   <feature url="features/de.cau.cs.kieler.klighd.draw2d.feature.source_2.2.1.qualifier.jar" id="de.cau.cs.kieler.klighd.draw2d.feature.source" version="2.2.1.qualifier">
+   <feature url="features/de.cau.cs.kieler.klighd.draw2d.feature.source_2.3.1.qualifier.jar" id="de.cau.cs.kieler.klighd.draw2d.feature.source" version="2.3.1.qualifier">
       <category name="kieler-klighd"/>
    </feature>
-   <feature url="features/de.cau.cs.kieler.klighd.ide.feature_2.2.1.qualifier.jar" id="de.cau.cs.kieler.klighd.ide.feature" version="2.2.1.qualifier">
+   <feature url="features/de.cau.cs.kieler.klighd.ide.feature_2.3.1.qualifier.jar" id="de.cau.cs.kieler.klighd.ide.feature" version="2.3.1.qualifier">
       <category name="kieler-klighd"/>
    </feature>
-   <feature url="features/de.cau.cs.kieler.klighd.ide.feature.source_2.2.1.qualifier.jar" id="de.cau.cs.kieler.klighd.ide.feature.source" version="2.2.1.qualifier">
+   <feature url="features/de.cau.cs.kieler.klighd.ide.feature.source_2.3.1.qualifier.jar" id="de.cau.cs.kieler.klighd.ide.feature.source" version="2.3.1.qualifier">
       <category name="kieler-klighd"/>
    </feature>
 
-   <feature url="features/de.cau.cs.kieler.klighd.view.feature_2.2.1.qualifier.jar" id="de.cau.cs.kieler.klighd.view.feature" version="2.2.1.qualifier">
+   <feature url="features/de.cau.cs.kieler.klighd.view.feature_2.3.1.qualifier.jar" id="de.cau.cs.kieler.klighd.view.feature" version="2.3.1.qualifier">
       <category name="kieler-klighd"/>
    </feature>
-   <feature url="features/de.cau.cs.kieler.klighd.view.feature.source_2.2.1.qualifier.jar" id="de.cau.cs.kieler.klighd.view.feature.source" version="2.2.1.qualifier">
+   <feature url="features/de.cau.cs.kieler.klighd.view.feature.source_2.3.1.qualifier.jar" id="de.cau.cs.kieler.klighd.view.feature.source" version="2.3.1.qualifier">
       <category name="kieler-klighd"/>
    </feature>
 
-   <feature url="features/de.cau.cs.kieler.klighd.sdk.feature_2.2.1.qualifier.jar" id="de.cau.cs.kieler.klighd.sdk.feature" version="2.2.1.qualifier">
+   <feature url="features/de.cau.cs.kieler.klighd.sdk.feature_2.3.1.qualifier.jar" id="de.cau.cs.kieler.klighd.sdk.feature" version="2.3.1.qualifier">
       <category name="kieler-klighd"/>
    </feature>
-   <feature url="features/de.cau.cs.kieler.klighd.sdk.feature.source_2.2.1.qualifier.jar" id="de.cau.cs.kieler.klighd.sdk.feature.source" version="2.2.1.qualifier">
+   <feature url="features/de.cau.cs.kieler.klighd.sdk.feature.source_2.3.1.qualifier.jar" id="de.cau.cs.kieler.klighd.sdk.feature.source" version="2.3.1.qualifier">
       <category name="kieler-klighd"/>
    </feature>
 
-   <bundle id="de.cau.cs.kieler.klighd.standalone" version="2.2.1.qualifier"/>
-   <bundle id="de.cau.cs.kieler.klighd.lsp" version="2.2.1.qualifier"/>
-   <bundle id="de.cau.cs.kieler.klighd.lsp.source" version="2.2.1.qualifier"/>
+   <bundle id="de.cau.cs.kieler.klighd.standalone" version="2.3.1.qualifier"/>
+   <bundle id="de.cau.cs.kieler.klighd.lsp" version="2.3.1.qualifier"/>
+   <bundle id="de.cau.cs.kieler.klighd.lsp.source" version="2.3.1.qualifier"/>
 
-   <repository-reference location="https://download.eclipse.org/releases/2020-06/" enabled="true" />
+   <repository-reference location="https://download.eclipse.org/releases/2023-12/" enabled="true" />
    <repository-reference location="https://download.eclipse.org/modeling/mdt/uml2/updates/5.4/" enabled="true" />
-   <repository-reference location="https://download.eclipse.org/elk/updates/releases/0.8.1/" enabled="true" />
-   <repository-reference location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.22.0/" enabled="true" />
+   <repository-reference location="https://download.eclipse.org/elk/updates/releases/0.9.0/" enabled="true" />
+   <repository-reference location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.33.0/" enabled="true" />
    <repository-reference location="https://xtext.github.io/download/updates/releases/2.1.1/" enabled="true" />
-   <repository-reference location="https://download.eclipse.org/tools/orbit/downloads/drops/R20200529191137/repository/" enabled="true" />
+   <repository-reference location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.30.0" enabled="true" />
    <repository-reference location="https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/sprotty/0.9.0/" enabled="true" />
 </site>
diff --git a/build/de.cau.cs.kieler.klighd.repository/pom.xml b/build/de.cau.cs.kieler.klighd.repository/pom.xml
@@ -10,7 +10,7 @@
   <parent>
     <groupId>de.cau.cs.kieler.klighd</groupId>
     <artifactId>parent</artifactId>
-    <version>2.2.1-SNAPSHOT</version>
+    <version>2.3.1-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
@@ -32,10 +32,16 @@
             which has been built meanwhile, doesn't work properly yet,
             see https://bugs.eclipse.org/bugs/show_bug.cgi?id=453708#c34
             so we have to stick to this plug-in -->
+      <!-- Update: With https://github.com/eclipse-tycho/tycho/pull/145 (Tycho v2.4.0) the aforementioned issue is fixed.
+            However, just dropping the <associateSites>...</associateSites> argument and keeping the web content
+            generation doesn't work here, as this mojo _always_ clears the existing repository references,
+            or crashes if 'content.jar' doesn't exist. Hence, just binding it to an early build phase doesn't work.
+            Therefore I submitted PR https://github.com/jbosstools/jbosstools-maven-plugins/pull/88
+            to fix that, let's see how the committers assess it. -->
       <plugin>
         <groupId>org.jboss.tools.tycho-plugins</groupId>
         <artifactId>repository-utils</artifactId>
-        <version>1.0.0</version>
+        <version>2.7.5</version>
         <executions>
           <execution>
             <id>generate-facade</id>
@@ -46,17 +52,17 @@
             <configuration>
               <associateSites>
                 <!-- Eclipse -->
-                <associateSite>https://download.eclipse.org/releases/2020-06/</associateSite>
+                <associateSite>https://download.eclipse.org/releases/2023-12/</associateSite>
                 <!-- UML2 Tools (Meta Model Implemenetation, ...) -->
                 <associateSite>https://download.eclipse.org/modeling/mdt/uml2/updates/5.4/</associateSite>
                 <!-- Eclipse Layout Kernel -->
                 <!-- associateSite>http://build.eclipse.org/modeling/elk/updates/nightly/</associateSite -->
-                <associateSite>https://download.eclipse.org/elk/updates/releases/0.8.1/</associateSite>>
+                <associateSite>https://download.eclipse.org/elk/updates/releases/0.9.0/</associateSite>>
                 <!-- Xtext -->
-                <associateSite>https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.22.0/</associateSite>>
+                <associateSite>https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.33.0/</associateSite>>
                 <associateSite>https://xtext.github.io/download/updates/releases/2.1.1/</associateSite>>
                 <!-- Eclipse Orbit for Google Guave, Apache Batik, ... -->
-                <associateSite>https://download.eclipse.org/tools/orbit/downloads/drops/R20200529191137/repository/</associateSite>
+                <associateSite>https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.30.0</associateSite>
                 <!-- Sprotty ... -->
                 <associateSite>https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/sprotty/0.9.0/</associateSite>
               </associateSites>
@@ -70,6 +76,13 @@
           </execution>
         </executions>
       </plugin>
+      <!-- do not publish this artifact to Maven repositories -->
+      <plugin>
+        <artifactId>maven-deploy-plugin</artifactId>
+          <configuration>
+            <skip>true</skip>
+          </configuration>
+      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/....cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-elkNightly.target b/....cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-elkNightly.target
@@ -8,7 +8,7 @@
       <unit id="org.eclipse.emf.ecore.xcore.sdk.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.lsp4j.sdk.feature.group" version="0.0.0"/>
       <unit id="org.apache.batik.svggen" version="0.0.0"/>
-      <repository location="https://download.eclipse.org/releases/2020-06/"/>
+      <repository location="https://download.eclipse.org/releases/2023-12/"/>
     </location>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
       <unit id="org.eclipse.uml2.uml.feature.group" version="0.0.0"/>
@@ -25,18 +25,23 @@
     </location>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
       <unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
-      <repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.22.0/"/>
+      <repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.33.0/"/>
     </location>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
       <unit id="de.itemis.xtext.antlr.sdk.feature.group" version="2.1.1.v201405091103"/>
       <repository location="https://xtext.github.io/download/updates/releases/2.1.1/"/>
     </location>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-      <unit id="javax.xml.bind" version="0.0.0"/>
+      <!-- Required for JUnit4 Tests to be able to run -->
+      <unit id="javax.annotation" version="0.0.0"/>
+      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository/"/>
+    </location>
+    <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
       <unit id="com.google.inject" version="0.0.0"/>
       <unit id="com.google.guava" version="0.0.0"/>
-      <unit id="org.hamcrest.library" version="0.0.0"/>
-      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20200529191137/repository/"/>
+      <unit id="org.hamcrest.library" version="1.3.0.v20230809-1000"/>
+      <unit id="org.hamcrest.core" version="1.3.0.v20230809-1000"/>
+      <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.30.0"/>
     </location>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
       <unit id="org.eclipse.sprotty" version="0.0.0"/>

diff --git a/...er.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo-elkNightly.target b/...er.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo-elkNightly.target
@@ -8,7 +8,7 @@
       <unit id="org.eclipse.emf.ecore.xcore.sdk.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.lsp4j.sdk.feature.group" version="0.0.0"/>
       <unit id="org.apache.batik.svggen" version="0.0.0"/>
-      <repository location="https://download.eclipse.org/releases/2020-06/"/>
+      <repository location="https://download.eclipse.org/releases/2023-12/"/>
     </location>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
       <unit id="org.eclipse.uml2.uml.feature.group" version="0.0.0"/>
@@ -25,7 +25,7 @@
     </location>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
       <unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
-      <repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.22.0/"/>
+      <repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.33.0/"/>
     </location>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
       <unit id="de.itemis.xtext.antlr.sdk.feature.group" version="2.1.1.v201405091103"/>
@@ -36,11 +36,16 @@
       <repository location="https://kieler.github.io/KLighD/v1.1.1/"/>
     </location>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-      <unit id="javax.xml.bind" version="0.0.0"/>
+      <!-- Required for JUnit4 Tests to be able to run -->
+      <unit id="javax.annotation" version="0.0.0"/>
+      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository/"/>
+    </location>
+    <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
       <unit id="com.google.inject" version="0.0.0"/>
       <unit id="com.google.guava" version="0.0.0"/>
-      <unit id="org.hamcrest.library" version="0.0.0"/>
-      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20200529191137/repository/"/>
+      <unit id="org.hamcrest.library" version="1.3.0.v20230809-1000"/>
+      <unit id="org.hamcrest.core" version="1.3.0.v20230809-1000"/>
+      <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.30.0"/>
     </location>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
       <unit id="org.eclipse.sprotty" version="0.0.0"/>