From 70cfacc1f3f329ce20e0983021f9534c2dab7540 Mon Sep 17 00:00:00 2001
From: Soeren Domroes <sdo@informatik.uni-kiel.de>
Date: Fri, 31 Jan 2025 15:51:15 +0100
Subject: [PATCH] Upgrade java and version. Fails at test plugins.

---
 .../org.eclipse.elk.targetplatform.target      | 18 +++++++++++-------
 build/pom.xml                                  | 17 +++--------------
 plugins/org.eclipse.elk.alg.libavoid/pom.xml   |  2 +-
 plugins/org.eclipse.elk.core.service/pom.xml   |  4 ++--
 .../.settings/org.eclipse.jdt.core.prefs       |  6 +++---
 .../META-INF/MANIFEST.MF                       |  4 ++--
 .../META-INF/MANIFEST.MF                       | 12 ++++++------
 7 files changed, 28 insertions(+), 35 deletions(-)

diff --git a/build/org.eclipse.elk.targetplatform/org.eclipse.elk.targetplatform.target b/build/org.eclipse.elk.targetplatform/org.eclipse.elk.targetplatform.target
index 304932db5b..10d65f46c0 100644
--- a/build/org.eclipse.elk.targetplatform/org.eclipse.elk.targetplatform.target
+++ b/build/org.eclipse.elk.targetplatform/org.eclipse.elk.targetplatform.target
@@ -2,18 +2,22 @@
 <?pde version="3.8"?>
 <target name="Generated from Eclipse Layout Kernel" sequenceNumber="4">
   <locations>
-    <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-      <unit id="javax.websocket" version="0.0.0"/>
-      <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="0.0.0"/>
+    <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
       <unit id="org.eclipse.lsp4j.sdk.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
-      <repository location="http://download.eclipse.org/releases/2022-09"/>
+      <unit id="org.eclipse.emf.transaction.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.gef.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.gmf.feature.group" version="0.0.0"/>
+      <repository location="http://download.eclipse.org/releases/2024-09"/>
+    </location>
+    <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" 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.36.0/"/>
     </location>
-    <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+    <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
       <unit id="org.hamcrest.library" version="0.0.0"/>
       <unit id="com.google.gson" version="0.0.0"/>
-      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220830213456/repository/"/>
+      <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.32.0"/>
     </location>
   </locations>
 </target>
diff --git a/build/pom.xml b/build/pom.xml
index 297705ecb1..ed59e28940 100644
--- a/build/pom.xml
+++ b/build/pom.xml
@@ -21,12 +21,12 @@
 
   <!-- Define a few properties used throughout all build profiles. -->
   <properties>
-    <targetJdk>11</targetJdk>
+    <targetJdk>17</targetJdk>
     <maven.compiler.release>${targetJdk}</maven.compiler.release>
     <maven.compiler.source>${targetJdk}</maven.compiler.source>
     <maven.compiler.target>${targetJdk}</maven.compiler.target>
-    <tycho-version>2.7.3</tycho-version>
-    <xtext-version>2.28.0</xtext-version>
+    <tycho-version>2.7.5</tycho-version>
+    <xtext-version>2.36.0</xtext-version>
     <elk-version>${project.version}</elk-version>
 
     <!-- chsch: copied from https://eclipse.googlesource.com/recommenders/org.eclipse.recommenders/+/3dae4575d3370da2da25a1cbce3dfcff198f0611/features/pom.xml -->
@@ -200,17 +200,6 @@
               <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>
 
diff --git a/plugins/org.eclipse.elk.alg.libavoid/pom.xml b/plugins/org.eclipse.elk.alg.libavoid/pom.xml
index d002eb87bc..79e1fd7d38 100644
--- a/plugins/org.eclipse.elk.alg.libavoid/pom.xml
+++ b/plugins/org.eclipse.elk.alg.libavoid/pom.xml
@@ -38,7 +38,7 @@
     <dependency>
       <groupId>org.eclipse.platform</groupId>
       <artifactId>org.eclipse.core.runtime</artifactId>
-      <version>3.26.0</version>
+      <version>3.31.0</version>
     </dependency>
   </dependencies>
 
diff --git a/plugins/org.eclipse.elk.core.service/pom.xml b/plugins/org.eclipse.elk.core.service/pom.xml
index 990570be60..784c1efe70 100644
--- a/plugins/org.eclipse.elk.core.service/pom.xml
+++ b/plugins/org.eclipse.elk.core.service/pom.xml
@@ -36,7 +36,7 @@
     <dependency>
       <groupId>org.eclipse.platform</groupId>
       <artifactId>org.eclipse.core.runtime</artifactId>
-      <version>3.26.0</version>
+      <version>3.31.0</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.platform</groupId>
@@ -46,7 +46,7 @@
     <dependency>
       <groupId>org.eclipse.platform</groupId>
       <artifactId>org.eclipse.ui.workbench</artifactId>
-      <version>3.126.0</version>
+      <version>3.130.0</version>
       <exclusions>
         <!-- exclude org.eclipse.swt here, as that in turn depends on "org.eclipse.platform:org.eclipse.swt.${osgi.platform}";
                that construction is prone to result in build troubles. -->
diff --git a/plugins/org.eclipse.elk.core/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.elk.core/.settings/org.eclipse.jdt.core.prefs
index dec65fc9a4..c230b7f71c 100644
--- a/plugins/org.eclipse.elk.core/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.elk.core/.settings/org.eclipse.jdt.core.prefs
@@ -1,9 +1,9 @@
 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=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.compliance=17
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 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.compiler.source=17
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
diff --git a/test/org.eclipse.elk.alg.disco.test/META-INF/MANIFEST.MF b/test/org.eclipse.elk.alg.disco.test/META-INF/MANIFEST.MF
index 3e8ba8dadb..aca0dbb4fb 100644
--- a/test/org.eclipse.elk.alg.disco.test/META-INF/MANIFEST.MF
+++ b/test/org.eclipse.elk.alg.disco.test/META-INF/MANIFEST.MF
@@ -4,11 +4,11 @@ Bundle-Name: ELK Layout DisCo Tests
 Bundle-SymbolicName: org.eclipse.elk.alg.disco.test;singleton:=true
 Bundle-Version: 0.10.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-11
-Require-Bundle: com.google.guava;bundle-version="18.0.0",
+Require-Bundle: com.google.guava,
  org.eclipse.elk.core,
  org.eclipse.elk.graph,
  org.eclipse.elk.alg.common,
  org.eclipse.elk.alg.disco,
- org.junit;bundle-version="4.12.0"
+ org.junit
 Bundle-Vendor: Eclipse Modeling Project
 Automatic-Module-Name: org.eclipse.elk.alg.disco.test
diff --git a/test/org.eclipse.elk.alg.test/META-INF/MANIFEST.MF b/test/org.eclipse.elk.alg.test/META-INF/MANIFEST.MF
index 508cfbaac3..981a8d3573 100644
--- a/test/org.eclipse.elk.alg.test/META-INF/MANIFEST.MF
+++ b/test/org.eclipse.elk.alg.test/META-INF/MANIFEST.MF
@@ -17,12 +17,12 @@ Require-Bundle: com.google.guava,
  org.eclipse.elk.alg.radial,
  org.eclipse.elk.alg.rectpacking,
  org.eclipse.elk.alg.spore,
- org.junit;bundle-version="4.12.0",
- org.eclipse.swt;bundle-version="3.107.0",
- org.eclipse.xtext;bundle-version="2.12.0",
- org.apache.log4j;bundle-version="1.2.15",
- org.eclipse.core.runtime;bundle-version="3.14.0",
- org.eclipse.xtext.xbase;bundle-version="2.12.0"
+ org.junit,
+ org.eclipse.swt,
+ org.eclipse.xtext,
+ org.apache.log4j,
+ org.eclipse.core.runtime,
+ org.eclipse.xtext.xbase
 Bundle-Vendor: Eclipse Modeling Project
 Export-Package: org.eclipse.elk.alg.test,
  org.eclipse.elk.alg.test.framework,