From 1ee1a44297e5dd6553b654cf4a315b882d2f4d6d Mon Sep 17 00:00:00 2001 From: Huell Date: Sun, 30 Aug 2026 12:37:43 +0200 Subject: [PATCH 1/2] Upgrade to java 21 --- .github/workflows/backendUpdatesite.yml | 2 +- .../bundles/org.dataflowanalysis.standalone/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../org.dataflowanalysis.standalone/META-INF/MANIFEST.MF | 2 +- backend/analysisBackendServer/pom.xml | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/backendUpdatesite.yml b/.github/workflows/backendUpdatesite.yml index 06abf3c7..bab3a388 100644 --- a/.github/workflows/backendUpdatesite.yml +++ b/.github/workflows/backendUpdatesite.yml @@ -20,7 +20,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: 17 + java-version: 21 - name: Setup Maven uses: stCarolas/setup-maven@v5 with: diff --git a/backend/analysisBackendServer/bundles/org.dataflowanalysis.standalone/.classpath b/backend/analysisBackendServer/bundles/org.dataflowanalysis.standalone/.classpath index cef1abac..e8a183a9 100644 --- a/backend/analysisBackendServer/bundles/org.dataflowanalysis.standalone/.classpath +++ b/backend/analysisBackendServer/bundles/org.dataflowanalysis.standalone/.classpath @@ -1,6 +1,6 @@ - + diff --git a/backend/analysisBackendServer/bundles/org.dataflowanalysis.standalone/.settings/org.eclipse.jdt.core.prefs b/backend/analysisBackendServer/bundles/org.dataflowanalysis.standalone/.settings/org.eclipse.jdt.core.prefs index 62ef3488..23fa13b1 100644 --- a/backend/analysisBackendServer/bundles/org.dataflowanalysis.standalone/.settings/org.eclipse.jdt.core.prefs +++ b/backend/analysisBackendServer/bundles/org.dataflowanalysis.standalone/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.compliance=21 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.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 diff --git a/backend/analysisBackendServer/bundles/org.dataflowanalysis.standalone/META-INF/MANIFEST.MF b/backend/analysisBackendServer/bundles/org.dataflowanalysis.standalone/META-INF/MANIFEST.MF index 7dc618d1..780521c5 100644 --- a/backend/analysisBackendServer/bundles/org.dataflowanalysis.standalone/META-INF/MANIFEST.MF +++ b/backend/analysisBackendServer/bundles/org.dataflowanalysis.standalone/META-INF/MANIFEST.MF @@ -31,7 +31,7 @@ Require-Bundle: org.dataflowanalysis.dfd.datadictionary;bundle-version="2.0.0", com.fasterxml.jackson.core.jackson-databind;bundle-version="2.13.2", org.apache.log4j;bundle-version="1.2.24" Automatic-Module-Name: DataFlowAnalalysisStandalone -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Export-Package: org.dataflowanalysis.standalone diff --git a/backend/analysisBackendServer/pom.xml b/backend/analysisBackendServer/pom.xml index 336f247a..328268f5 100644 --- a/backend/analysisBackendServer/pom.xml +++ b/backend/analysisBackendServer/pom.xml @@ -68,7 +68,7 @@ ${tycho.version} - JavaSE-17 + JavaSE-21 ../../releng/org.dataflowanalysis.standalone.targetplatform/org.dataflowanalysis.standalone.targetplatform.targetplatform.target @@ -116,7 +116,7 @@ xtend-gen - 17 + 21 From 18e46f88f781c5a3952809c3286723aa9cd0c773 Mon Sep 17 00:00:00 2001 From: Huell Date: Sun, 30 Aug 2026 12:46:13 +0200 Subject: [PATCH 2/2] Fix xtend version --- backend/analysisBackendServer/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/analysisBackendServer/pom.xml b/backend/analysisBackendServer/pom.xml index 328268f5..b31ed77f 100644 --- a/backend/analysisBackendServer/pom.xml +++ b/backend/analysisBackendServer/pom.xml @@ -108,7 +108,7 @@ org.eclipse.xtend xtend-maven-plugin - 2.30.0 + 2.44.0 @@ -116,7 +116,7 @@ xtend-gen - 21 + 17