Merge remote-tracking branch

'originsdo/sdo/fixModelOrderPortCalculation' into sdo/mwr-mt

.github/workflows/ci.yml

@@ -18,23 +18,24 @@ jobs:
 
     steps:
     # Checkout the reposity of both elk and elk-models (the latter is required for the tests)
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         path: elk
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         repository: eclipse/elk-models
         path: elk-models
     # Prepare and use a cache for maven
-    - uses: actions/cache@v1
+    - uses: actions/cache@v4
       with:
         path: ~/.m2/repository
         key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
         restore-keys: |
           ${{ runner.os }}-maven-
     - name: Set up Java version ${{ matrix.java-version }}
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v4
       with:
+        distribution: 'zulu'
         java-version: ${{ matrix.java-version }}
     - name: Build and verify with maven
       # Run mvn in the 'build' folder

.github/workflows/elkjs.yml

@@ -19,35 +19,36 @@ jobs:
 
     steps:
     # Checkout the repository of both elk and elkjs, place them next to each other. 
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         path: elk
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         repository: kieler/elkjs
         path: elkjs
     # Prepare and use caches for both gradle and npm.
     - name: Cache gradle packages
-      uses: actions/cache@v1
+      uses: actions/cache@v4
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
         restore-keys: ${{ runner.os }}-gradle
     - name: Cache npm 
-      uses: actions/cache@v1
+      uses: actions/cache@v4
       with:
         path: ~/.npm
         key: ${{ runner.os }}-node-${{ hashFiles('**/package.json') }}
         restore-keys: ${{ runner.os }}-node-
     # elkjs (or rather GWT) requires Java 1.8
     - name: Set up JDK ${{ matrix.java-version }}
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v4
       with:
+        distribution: 'zulu'
         java-version: ${{ matrix.java-version }}
     - name: Grant execute permission for gradlew
       run: chmod +x $GITHUB_WORKSPACE/elkjs/gradlew
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
+      uses: actions/setup-node@v4
       with:
         node-version: ${{ matrix.node-version }}
     # Finally build elkjs and run its tests

.github/workflows/nightly.yml

@@ -20,23 +20,24 @@ jobs:
 
     steps:
     # Checkout the reposity of both elk and elk-models (the latter is required for the tests)
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         path: elk
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         repository: eclipse/elk-models
         path: elk-models
     # Prepare and use a cache for maven
-    - uses: actions/cache@v1
+    - uses: actions/cache@v4
       with:
         path: ~/.m2/repository
         key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
         restore-keys: |
           ${{ runner.os }}-maven-
     - name: Set up Java version ${{ matrix.java-version }}
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v4
       with:
+        distribution: 'zulu'
         java-version: ${{ matrix.java-version }}
     - name: Build and verify with maven
       # Run mvn in the 'build' folder

.gitignore

@@ -10,6 +10,8 @@ xtend-gen/
 *.pdf
 *_trace
 *.sublime-workspace
+/**/src-gen/**/*Options.java
+/**/src-gen/**/*MetaDataProvider.java
 docs/content/reference/algorithms/
 docs/content/reference/options/
 docs/content/reference/groups/

docs/content/documentation/algorithmdevelopers/metadatalanguage.md

@@ -38,7 +38,7 @@ Follow these steps to add a metadata file to your layout algorithm project:
     See below for details on what this is doing.
 
 1. Add a folder `META-INF/services` inside one of your project's source folders (by default, we put it right inside of the `src` folder).
-1. In that folder, create a file named `ILayoutMetaDataProvider`.
+1. In that folder, create a file named `org.eclipse.elk.core.data.ILayoutMetaDataProvider` (the fully qualified name of the `ILayoutMetaDataProvider`).
 1. In that file, add a single line of text which contains the fully qualified name of the `ILayoutMetaDataProvider` that was generated for you by the ELK SDK.
 1. Save and close the editor.
 

plugins/org.eclipse.elk.alg.common/.project

@@ -41,6 +41,5 @@
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
-		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
 	</natures>
 </projectDescription>

plugins/org.eclipse.elk.alg.disco.debug/.project

@@ -35,6 +35,5 @@
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
 	</natures>
 </projectDescription>

plugins/org.eclipse.elk.alg.disco/.project

@@ -41,6 +41,5 @@
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
-		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
 	</natures>
 </projectDescription>