Master Thesis PR

.github/workflows/ci.yml

@@ -12,10 +12,9 @@ jobs:
     strategy:
       matrix:
         # We check LTS versions and the latest release
-        # 8  - LTS
         # 11 - LTS
-        # 14 - latest
-        java-version: [ 8, 11, 14 ]
+        # 17 - LTS
+        java-version: [ 11, 17 ]
 
     steps:
     # Checkout the reposity of both elk and elk-models (the latter is required for the tests)

.github/workflows/elkjs.yml

@@ -12,10 +12,10 @@ jobs:
     strategy:
       matrix:
         # We check against LTSs supported by GWT
-        # 8  - LTS 
-        # 11 - LTS
-        java-version: [ 11 ]
-        node-version: [ 12.x ]
+        # 11  - LTS 
+        # 17 - LTS
+        java-version: [ 11, 17 ]
+        node-version: [ 12.x, 18.x ]
 
     steps:
     # Checkout the repository of both elk and elkjs, place them next to each other. 

.github/workflows/nightly.yml

@@ -14,10 +14,9 @@ jobs:
     strategy:
       matrix:
         # We check LTS versions and the latest release
-        # 8  - LTS
         # 11 - LTS
-        # 14 - latest
-        java-version: [ 8, 11, 14 ]
+        # 17 - LTS
+        java-version: [ 11, 17 ]
 
     steps:
     # Checkout the reposity of both elk and elk-models (the latter is required for the tests)

NOTICE.md

@@ -37,26 +37,30 @@ ANTLR Runtime only: (3.2)
 
 * License: New BSD license
 
-Apache Commons Logging Jar (1.1.1)
+Apache Commons Logging Jar (1.2.0)
 
 * License: Apache License, 2.0
 
-Apache Log4J (1.2.8)
+Apache Log4J (1.2.24)
 
 * License: Apache License, 2.0
 
-ASM (5.0.1)
+ASM (9.5.0)
 
 * License: New BSD license
 
-Google Guava (15.0.0)
+Google Guava (30.1.0)
 
 * License: Apache License 2.0
 
-Google Guice / Inject Core API (3.0.0)
+Google Guice / Inject Core API (5.0.1)
 
 * License: Apache License, 2.0
 
+libavoid (0.3.1)
+
+* License:  GNU Lesser General Public License, 2.1
+
 Ptolemy demo models (n/a)
 
 * License: Ptolemy License (Custom)
@@ -68,4 +72,4 @@ may have restrictions on the import, possession, and use, and/or re-export to
 another country, of encryption software. BEFORE using any encryption software,
 please check the country's laws, regulations and policies concerning the import,
 possession, or use, and re-export of encryption software, to see if this is
-permitted.
+permitted.

build/Jenkinsfile

@@ -26,7 +26,7 @@ kind: Pod
 spec:
   containers:
   - name: maven
-    image: maven:3.6-openjdk-14
+    image: maven:3.6-openjdk-17
     command:
     - cat
     tty: true
@@ -296,14 +296,14 @@ spec:
       // Notify developers of regressions
       mail subject: "ELK ${currentBuild.fullDisplayName}: ${currentBuild.currentResult}",
         body: "Oh noes! The build has fallen into the hands of an evil regression! Check console output at $BUILD_URL to view the results.",
-        to: '[email protected], [email protected], [email protected]'
+        to: '[email protected], [email protected]'
     }
 
     fixed {
       // Notify that build is stable again
       mail subject: "ELK ${currentBuild.fullDisplayName}: ${currentBuild.currentResult}",
         body: "Hail to the source, the build is fixed! Check console output at $BUILD_URL to view the results.",
-        to: '[email protected], [email protected], [email protected]'
+        to: '[email protected], [email protected]'
     }
   }
 }

build/RELEASE.md

@@ -2,18 +2,18 @@
 
 ## Release Review
 
-The Eclipse release process is described in more detail in the [Eclipse Project Handbook](https://www.eclipse.org/projects/handbook/#release).
+The Eclipse release process is described in more detail in the [Eclipse Project Handbook](https://www.eclipse.org/projects/handbook/#release). The review process is tracked in an [issue such as this](https://gitlab.eclipse.org/eclipsefdn/emo-team/emo/-/issues/258).
 
 1. Add a new release on ELK's [project page](https://projects.eclipse.org/projects/modeling.elk).
 1. For major releases:
-    1. Prepare an IP log and have it approved by Eclipse Legal.
+    1. Update NOTICE.md file with relevant information regarding used third-party content.
     1. Have [PMC](mailto:[email protected]) approve the release documentation.
     1. Schedule a release review. Release reviews run for a minimum of one week and conclude on the first and third Wednesdays of each month.
 
 
 ## The Release Branch
 
-1. Ensure that all bundles to be built and released are in fact built and are part of the update site.
+1. Ensure that all bundles to be built and released are in fact built and are part of the [update site](https://download.eclipse.org/elk/updates/).
 1. Create a release branch `releases/VERSION`.
 1. Remove `-SNAPSHOT` and `.qualifier` from any version numbers. This is necessary for Maven to push the build to the proper Maven Central release staging area. Be careful not to change anything in source code; this should mainly affect `category.xml`, `pom.xml`s, `feature.xml`s and `MANIFEST.MF`s.
 1. Open `build/org.eclipse.elk.repository/category.xml` and update its description like this:
@@ -23,15 +23,16 @@ The Eclipse release process is described in more detail in the [Eclipse Project
       Update site for the Eclipse Layout Kernel, version VERSION_NUMBER.
     </description>
     ```
-1. Remove the `Website` stage's call to the `publish-website.sh` script from the release build's `Jenkinsfile` and update the build variables at the top of the `Jenkinsfile`:
+1. Remove the `Website` stage's call to the `publish-website.sh` script from the release build's `Jenkinsfile` and configure the build variables in the [Jenkins configuration](https://ci.eclipse.org/elk/job/IntegrationNightly/):
+
 
     Variable              | New value
     --------------------- | ---------------------------------------------------------------------
     `BRANCH`              | `releases/VERSION`
     `VERSION`             | Well... the version number...
     `ELK_TARGET_DIR`      | `/home/data/httpd/download.eclipse.org/elk/updates/releases/VERSION/`
 
-1. Update the _[ReleaseNightly](https://ci.eclipse.org/elk/job/ReleaseNightly/)_ build with the same default values for the build variables. Also remember to update the repository branch the build will check out. Run it.
+1. \[deprecated\] Update the _[ReleaseNightly](https://ci.eclipse.org/elk/job/ReleaseNightly/)_ build with the same default values for the build variables. Also remember to update the repository branch the build will check out. Run it.
 1. Update the version numbers on `master`. Tycho can help:
 
     ```
@@ -52,7 +53,7 @@ This is a summary of the information on [this page](https://central.sonatype.org
 
 ## Releasing to Update Site
 
-1. Run the _PromoteUpdateSite_ build with proper parameter values and run it.
+1. ~~Run the _PromoteUpdateSite_ build with proper parameter values and run it.~~
 1. While in Jenkins, disable the nightly release build.
 
 

build/org.eclipse.elk.targetplatform/org.eclipse.elk.targetplatform.target

@@ -7,13 +7,13 @@
       <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.lsp4j.sdk.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
-      <repository location="http://download.eclipse.org/releases/2019-12"/>
+      <unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
+      <repository location="http://download.eclipse.org/releases/2022-09"/>
     </location>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-      <unit id="com.google.gson" version="0.0.0"/>
-      <unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
       <unit id="org.hamcrest.library" version="0.0.0"/>
-      <repository location="http://download.eclipse.org/eclipse/updates/4.14/R-4.14-201912100610"/>
+      <unit id="com.google.gson" version="0.0.0"/>
+      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220830213456/repository/"/>
     </location>
   </locations>
 </target>

build/pom.xml

@@ -21,9 +21,9 @@
 
   <!-- Define a few properties used throughout all build profiles. -->
   <properties>
-    <targetJdk>1.8</targetJdk>
-    <tycho-version>1.6.0</tycho-version>
-    <xtext-version>2.20.0</xtext-version>
+    <targetJdk>11</targetJdk>
+    <tycho-version>2.7.3</tycho-version>
+    <xtext-version>2.28.0</xtext-version>
     <elk-version>${project.version}</elk-version>
 
     <!-- chsch: copied from https://eclipse.googlesource.com/recommenders/org.eclipse.recommenders/+/3dae4575d3370da2da25a1cbce3dfcff198f0611/features/pom.xml -->
@@ -179,6 +179,17 @@
               <arch>x86_64</arch>
             </environment>
           </environments>
+          <dependency-resolution>
+            <extraRequirements>
+              <!-- to force the same version of jdt.compiler.apt
+                and jdt.core (for xtext-maven-plugin) -->
+              <requirement>
+                <type>eclipse-plugin</type>
+                <id>org.eclipse.jdt.compiler.apt</id>
+                <versionRange>0.0.0</versionRange>
+              </requirement>
+            </extraRequirements>
+          </dependency-resolution>
         </configuration>
       </plugin>
 
@@ -344,6 +355,8 @@
                     <versionRange>${tycho-version}</versionRange>
                     <goals>
                       <goal>compile</goal>
+                      <goal>testCompile</goal>
+                      <goal>validate-classpath</goal>
                     </goals>
                   </pluginExecutionFilter>
                   <action>
@@ -379,6 +392,19 @@
                     <ignore/>
                   </action>
                 </pluginExecution>
+                <pluginExecution>
+                  <pluginExecutionFilter>
+                    <groupId>org.eclipse.tycho</groupId>
+                    <artifactId>target-platform-configuration</artifactId>
+                    <versionRange>[2.7.3,)</versionRange>
+                    <goals>
+                      <goal>target-platform</goal>
+                    </goals>
+                  </pluginExecutionFilter>
+                  <action>
+                    <ignore></ignore>
+                  </action>
+                </pluginExecution>
               </pluginExecutions>
             </lifecycleMappingMetadata>
           </configuration>

docs/content/downloads/releasenotes/release-0.9.0.md

@@ -0,0 +1,64 @@
+---
+title: "0.9.0"
+menu:
+  main:
+    parent: "ReleaseNotes"
+    weight: -90
+---
+
+* [Release log](https://projects.eclipse.org/projects/modeling.elk/releases/0.9.0)
+* [Documentation](https://download.eclipse.org/elk/updates/releases/0.9.0/elk-0.9.0-docs.zip)
+* [Update site](https://download.eclipse.org/elk/updates/releases/0.9.0/)
+* [Zipped update site](https://download.eclipse.org/elk/updates/releases/0.9.0/elk-0.9.0.zip) (for offline use)
+* [Maven central](https://repo.maven.apache.org/maven2/org/eclipse/elk/) (for building pure Java projects that use ELK)
+
+
+
+## Details
+
+This is mainly a bugfix release. See GitHub for the full [list of resolved issues](https://github.com/eclipse/elk/milestone/15?closed=1).
+
+
+### New Features and Enhancements
+
+* [#962](https://github.com/eclipse/elk/pull/962), [#914](https://github.com/eclipse/elk/pull/914): Added an experimental Depth-First and Breadth-First model order layerer.
+* [#867](https://github.com/eclipse/elk/pull/867), [#902](https://github.com/eclipse/elk/pull/902/): Added a model order layering by node promotion.
+* [#956](https://github.com/eclipse/elk/pull/956), [#942](https://github.com/eclipse/elk/pull/942), [#927](https://github.com/eclipse/elk/pull/927), [#926](https://github.com/eclipse/elk/pull/926), [#921](https://github.com/eclipse/elk/pull/921), [#893](https://github.com/eclipse/elk/pull/893), [#892](https://github.com/eclipse/elk/pull/892), [#886](https://github.com/eclipse/elk/pull/886): Added libavoid for standalone edge routing.
+* [#945](https://github.com/eclipse/elk/pull/945), [#941](https://github.com/eclipse/elk/pull/941): Added option for initial rotation of radial layout.
+* [#947](https://github.com/eclipse/elk/issues/947), [#951](https://github.com/eclipse/elk/pull/951), [#940](https://github.com/eclipse/elk/pull/940), [#936](https://github.com/eclipse/elk/pull/936), [\#932,](https://github.com/eclipse/elk/pull/932) [#843](https://github.com/eclipse/elk/pull/843): Added topdown layout and top-down rectangle packing algorithm.
+* [#939](https://github.com/eclipse/elk/pull/939), [#930](https://github.com/eclipse/elk/issues/930): Added port model order.
+* [#922](https://github.com/eclipse/elk/pull/922): KVectors now have a rotation utility method.
+* [#406](https://github.com/eclipse/elk/issues/406), [#884](https://github.com/eclipse/elk/pull/884): MrTree edge routing options + interactivity and model order.
+* [#889](https://github.com/eclipse/elk/pull/889): Added experimental bendpoints to force layout.
+* [#877:](https://github.com/eclipse/elk/pull/877) Added new model order strategy. 
+* [#834](https://github.com/eclipse/elk/pull/834), [#833](https://github.com/eclipse/elk/issues/833), [#855](https://github.com/eclipse/elk/pull/855), [#843](https://github.com/eclipse/elk/pull/843):  Support for fixed graphs for mrtree, force, stress, radial, and rectpacking.
+
+### Changes
+
+- [#973](https://github.com/eclipse/elk/pull/973), [#702](https://github.com/eclipse/elk/issues/702), [#794](https://github.com/eclipse/elk/issues/794), [#900](https://github.com/eclipse/elk/pull/900), [#807](https://github.com/eclipse/elk/issues/807): Moved from Java 8 to Java 11 while testing compliance with Java 17.
+-  [#876](https://github.com/eclipse/elk/pull/876): Renamed and reworked FORCE_MODEL_ORDER component ordering strategy to MODEL_ORDER and GROUP_MODEL_ORDER component ordering strategy.
+- [#651](https://github.com/eclipse/elk/issues/651), [#885](https://github.com/eclipse/elk/pull/885): Report invalid hierarchical cross min configuration instead of fixing it.
+- [#865](https://github.com/eclipse/elk/pull/865), [#835](https://github.com/eclipse/elk/pull/835): Restructure and improve rectpacking.
+
+
+### Bugfixes
+
+* [#957](https://github.com/eclipse/elk/pull/957): Corrected node node spacing usage for radial layout. The node node spacing is now halved and used as a padding around the nodes.
+* [#946](https://github.com/eclipse/elk/pull/946/), [#944](https://github.com/eclipse/elk/issues/944): Fix hyper edge segment splitter to actually save the best area after finding it.
+* [#850](https://github.com/eclipse/elk/issues/850), [#938](https://github.com/eclipse/elk/pull/938): Port labels no longer overlap with self loops.
+* [#918](https://github.com/eclipse/elk/issues/918), [#933](https://github.com/eclipse/elk/pull/933): Fix port model order comparator.
+* [#923](https://github.com/eclipse/elk/pull/923): Wrapping strategies do now correctly work together with model order.
+* [#906](https://github.com/eclipse/elk/pull/906), [#905](https://github.com/eclipse/elk/issues/905), [#913](https://github.com/eclipse/elk/pull/913): Fix tail edge labels.
+* [#869](https://github.com/eclipse/elk/issues/869), [#911](https://github.com/eclipse/elk/pull/911), [#868](https://github.com/eclipse/elk/issues/868):  Model order bug fixes.
+* [#870](https://github.com/eclipse/elk/issues/870): Fixed NoSuchElementException in network simplex node placer.
+* [#890](https://github.com/eclipse/elk/pull/890): Correctly check whether the layered algorithm is set.
+* [#852](https://github.com/eclipse/elk/pull/852), [#841](https://github.com/eclipse/elk/issues/841): Inline edge labels are now correctly centered (hopefully).
+* [#887](https://github.com/eclipse/elk/issues/887): Miscellaneous bug fixes.
+
+### Cleanup
+
+- [#924](https://github.com/eclipse/elk/pull/924): Corrected pom license for maven central.
+
+
+
+

features/org.eclipse.elk.feature/feature.xml

@@ -39,7 +39,6 @@ SPDX-License-Identifier: EPL-2.0
 
    <requires>
       <import plugin="com.google.guava"/>
-      <import plugin="org.eclipse.emf.ecore"/>
       <import plugin="org.eclipse.core.runtime"/>
       <import plugin="org.eclipse.emf.edit" version="2.5.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.emf.ecore" version="2.5.0" match="greaterOrEqual"/>

features/org.eclipse.elk.graphviz.feature/feature.xml

@@ -40,7 +40,6 @@ SPDX-License-Identifier: EPL-2.0
    <requires>
       <import plugin="org.eclipse.xtext" version="2.0.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.xtext.util"/>
-      <import plugin="org.eclipse.emf.ecore"/>
       <import plugin="org.eclipse.emf.common"/>
       <import plugin="org.antlr.runtime"/>
       <import plugin="org.eclipse.core.runtime" version="3.6.0" match="greaterOrEqual"/>

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

@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="src-gen"/>

plugins/org.eclipse.elk.alg.common/META-INF/MANIFEST.MF

@@ -5,7 +5,7 @@ Bundle-Name: ELK Common Algorithms
 Bundle-SymbolicName: org.eclipse.elk.alg.common;singleton:=true
 Bundle-Version: 0.9.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: com.google.guava,
  org.eclipse.elk.core,
  org.eclipse.elk.graph

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>

plugins/org.eclipse.elk.alg.disco.debug/.settings/org.eclipse.jdt.core.prefs

@@ -1,15 +1,18 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

plugins/org.eclipse.elk.alg.disco.debug/META-INF/MANIFEST.MF

@@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: ELK DisCo Debugging Utilities
 Bundle-SymbolicName: org.eclipse.elk.alg.disco.debug;singleton:=true
 Bundle-Version: 0.9.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: com.google.guava,
  org.eclipse.ui,
  org.eclipse.core.runtime,

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="src-gen"/>