Merge branch 'master' into nre/darkTheme

.github/workflows/buildAndTest.yml

@@ -20,15 +20,15 @@ jobs:
 # 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: actions/checkout@v4
     - uses: nelonoel/[email protected]
     - name: Set up JDK
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v4
       with:
         java-version: 17
-        distribution: adopt
+        distribution: temurin
     - name: Cache Maven packages
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: .m2
         key: ${{ runner.os }}-m2-${{ hashFiles('.github/workflows/**/*.*', '**/pom.xml', '**/META-INF/MANIFEST.MF', 'build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform.target') }}
@@ -43,19 +43,28 @@ jobs:
           #print the folder structure up to depth 2 on the console as we have no other option of getting an inside into workspace folder
           find . -maxdepth 2
     - name: Archive P2 Repository
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: KLighD P2 Repository
         path: build/de.cau.cs.kieler.klighd.repository/target/repository/**/*
         retention-days: 14
         if-no-files-found: error
     - name: Archive MVN Repository
-      uses: actions/upload-artifact@v2
+      if: ${{ !contains(github.ref, 'releases-') }}
+      uses: actions/upload-artifact@v4
       with:
         name: KLighD MVN Repository
         path: klighd-snapshots/**/*
         retention-days: 14
         if-no-files-found: error
+    - name: Archive MVN Release Repository
+      if: ${{ contains(github.ref, 'releases-') }}
+      uses: actions/upload-artifact@v4
+      with:
+        name: KLighD MVN Repository
+        path: klighd/**/*
+        retention-days: 14
+        if-no-files-found: error
     - name: Publish Test Report
       id: test_report
       if: ${{ !cancelled() }}

.gitignore

@@ -3,6 +3,7 @@ xtend-gen/
 target/
 localM2/
 klighd-snapshots/
+klighd/
 .svn/
 .DS_Store
 *.class

build/de.cau.cs.kieler.klighd.repository/.settings/org.eclipse.core.resources.prefs

@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8

build/de.cau.cs.kieler.klighd.repository/category.xml

@@ -11,10 +11,10 @@
       </description>
    </category-def>
 
-   <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">
+   <feature url="features/de.cau.cs.kieler.klighd.feature_3.0.3.qualifier.jar" id="de.cau.cs.kieler.klighd.feature" version="3.0.3.qualifier">
       <category name="kieler-klighd"/>
    </feature>
-   <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">
+   <feature url="features/de.cau.cs.kieler.klighd.feature.source_3.0.3.qualifier.jar" id="de.cau.cs.kieler.klighd.feature.source" version="3.0.3.qualifier">
       <category name="kieler-klighd"/>
    </feature>
 
@@ -25,49 +25,47 @@
       <category name="kieler-klighd"/>
    </feature> -->
 
-   <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">
+   <feature url="features/de.cau.cs.kieler.klighd.freehep.feature_3.0.3.qualifier.jar" id="de.cau.cs.kieler.klighd.freehep.feature" version="3.0.3.qualifier">
       <category name="kieler-klighd"/>
    </feature>
-   <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">
+   <feature url="features/de.cau.cs.kieler.klighd.freehep.feature.source_3.0.3.qualifier.jar" id="de.cau.cs.kieler.klighd.freehep.feature.source" version="3.0.3.qualifier">
       <category name="kieler-klighd"/>
    </feature>
 
-   <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">
+   <feature url="features/de.cau.cs.kieler.klighd.draw2d.feature_3.0.3.qualifier.jar" id="de.cau.cs.kieler.klighd.draw2d.feature" version="3.0.3.qualifier">
       <category name="kieler-klighd"/>
    </feature>
-   <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">
+   <feature url="features/de.cau.cs.kieler.klighd.draw2d.feature.source_3.0.3.qualifier.jar" id="de.cau.cs.kieler.klighd.draw2d.feature.source" version="3.0.3.qualifier">
       <category name="kieler-klighd"/>
    </feature>
-   <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">
+   <feature url="features/de.cau.cs.kieler.klighd.ide.feature_3.0.3.qualifier.jar" id="de.cau.cs.kieler.klighd.ide.feature" version="3.0.3.qualifier">
       <category name="kieler-klighd"/>
    </feature>
-   <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">
+   <feature url="features/de.cau.cs.kieler.klighd.ide.feature.source_3.0.3.qualifier.jar" id="de.cau.cs.kieler.klighd.ide.feature.source" version="3.0.3.qualifier">
       <category name="kieler-klighd"/>
    </feature>
 
-   <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">
+   <feature url="features/de.cau.cs.kieler.klighd.view.feature_3.0.3.qualifier.jar" id="de.cau.cs.kieler.klighd.view.feature" version="3.0.3.qualifier">
       <category name="kieler-klighd"/>
    </feature>
-   <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">
+   <feature url="features/de.cau.cs.kieler.klighd.view.feature.source_3.0.3.qualifier.jar" id="de.cau.cs.kieler.klighd.view.feature.source" version="3.0.3.qualifier">
       <category name="kieler-klighd"/>
    </feature>
 
-   <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">
+   <feature url="features/de.cau.cs.kieler.klighd.sdk.feature_3.0.3.qualifier.jar" id="de.cau.cs.kieler.klighd.sdk.feature" version="3.0.3.qualifier">
       <category name="kieler-klighd"/>
    </feature>
-   <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">
+   <feature url="features/de.cau.cs.kieler.klighd.sdk.feature.source_3.0.3.qualifier.jar" id="de.cau.cs.kieler.klighd.sdk.feature.source" version="3.0.3.qualifier">
       <category name="kieler-klighd"/>
    </feature>
 
-   <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"/>
+   <bundle id="de.cau.cs.kieler.klighd.standalone" version="3.0.3.qualifier"/>
+   <bundle id="de.cau.cs.kieler.klighd.setup" version="3.0.3.qualifier"/>
 
-   <repository-reference location="https://download.eclipse.org/releases/2022-09/" 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.28.0/" enabled="true" />
+   <repository-reference location="https://download.eclipse.org/elk/updates/releases/0.9.1/" 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/R20220830213456/repository/" enabled="true" />
-   <repository-reference location="https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/sprotty/0.9.0/" enabled="true" />
+   <repository-reference location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.30.0" enabled="true" />
 </site>

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.3.1-SNAPSHOT</version>
+    <version>3.0.3-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
@@ -52,19 +52,17 @@
             <configuration>
               <associateSites>
                 <!-- Eclipse -->
-                <associateSite>https://download.eclipse.org/releases/2022-09/</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.1/</associateSite>>
                 <!-- Xtext -->
-                <associateSite>https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.28.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/R20220830213456/repository/</associateSite>
-                <!-- Sprotty ... -->
-                <associateSite>https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/sprotty/0.9.0/</associateSite>
+                <associateSite>https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.30.0</associateSite>
               </associateSites>
               <siteTemplateFolder>siteTemplate</siteTemplateFolder>
               <symbols>

build/de.cau.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/2022-09/"/>
+      <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,22 +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.28.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"/>
-      <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/R20220830213456/repository/"/>
+      <!-- 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="org.eclipse.sprotty" version="0.0.0"/>
-      <repository location="https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/sprotty/0.9.0/"/>
+      <unit id="com.google.inject" version="0.0.0"/>
+      <unit id="com.google.guava" version="0.0.0"/>
+      <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>
   </locations>
 </target>

build/de.cau.cs.kieler.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/2022-09/"/>
+      <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.28.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,15 +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"/>
-      <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/R20220830213456/repository/"/>
+      <!-- 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="org.eclipse.sprotty" version="0.0.0"/>
-      <repository location="https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/sprotty/0.9.0/"/>
+      <unit id="com.google.inject" version="0.0.0"/>
+      <unit id="com.google.guava" version="0.0.0"/>
+      <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>
   </locations>
 </target>

build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo.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/2022-09/"/>
+      <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"/>
@@ -21,11 +21,11 @@
       <unit id="org.eclipse.elk.sdk.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.elk.ui.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.elk.ui.feature.source.feature.group" version="0.0.0"/>
-      <repository location="https://download.eclipse.org/elk/updates/releases/0.8.1/"/>
+      <repository location="https://download.eclipse.org/elk/updates/releases/0.9.1/"/>
     </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.28.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,15 +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"/>
-      <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/R20220830213456/repository/"/>
+      <!-- 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="org.eclipse.sprotty" version="0.0.0"/>
-      <repository location="https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/sprotty/0.9.0/"/>
+      <unit id="com.google.inject" version="0.0.0"/>
+      <unit id="com.google.guava" version="0.0.0"/>
+      <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>
   </locations>
 </target>