From 1aa3ee355281dade264eb509f1af48747398c5f1 Mon Sep 17 00:00:00 2001 From: Niklas Rentz Date: Thu, 18 Apr 2024 12:25:06 +0200 Subject: [PATCH] updated to Eclipse 2023-12, KLighD 3.0.1, and related. Enforce Java 17. Fixed some generic warnings. --- .../category.xml | 9 +- ...au.cs.kieler.osgiviz.targetplatform.target | 14 +-- build/pom.xml | 94 ++++++++++++++++--- .../org.eclipse.core.resources.prefs | 2 + .../org.eclipse.core.resources.prefs | 2 + .../.classpath | 4 +- .../launch/OSGiViz Language Server.launch | 2 +- .../de.cau.cs.kieler.osgiviz.model/.classpath | 27 +++++- .../.settings/org.eclipse.jdt.core.prefs | 6 +- .../META-INF/MANIFEST.MF | 2 +- .../de.cau.cs.kieler.osgiviz.ui/.classpath | 2 +- .../org.eclipse.core.resources.prefs | 2 + .../.settings/org.eclipse.jdt.core.prefs | 9 +- .../META-INF/MANIFEST.MF | 3 +- plugins/de.cau.cs.kieler.osgiviz/.classpath | 25 ++++- .../.settings/org.eclipse.jdt.core.prefs | 6 +- .../META-INF/MANIFEST.MF | 3 +- .../de.cau.cs.kieler.osgiviz/build.properties | 1 + .../org.eclipse.core.resources.prefs | 2 + .../META-INF/MANIFEST.MF | 2 +- .../org.eclipse.core.resources.prefs | 2 + .../META-INF/MANIFEST.MF | 2 +- .../.classpath | 19 +++- .../build.properties | 2 + .../model/generate/ConfigAndExecuteMojo.java | 8 -- .../generate/OsgiModelSaveAndLoadUtility.java | 1 - .../model/generate/ReadProjectFiles.java | 3 +- .../generate/ReadProjectFilesUtility.java | 1 - .../.classpath | 18 +++- .../.settings/org.eclipse.jdt.core.prefs | 8 +- .../META-INF/MANIFEST.MF | 2 +- 31 files changed, 207 insertions(+), 76 deletions(-) create mode 100644 features/de.cau.cs.kieler.osgiviz.eclipse.feature/.settings/org.eclipse.core.resources.prefs create mode 100644 features/de.cau.cs.kieler.osgiviz.feature/.settings/org.eclipse.core.resources.prefs create mode 100644 plugins/de.cau.cs.kieler.osgiviz.ui/.settings/org.eclipse.core.resources.prefs create mode 100644 plugins/de.scheidtbachmann.osgimodel.model.edit/.settings/org.eclipse.core.resources.prefs create mode 100644 plugins/de.scheidtbachmann.osgimodel.model.editor/.settings/org.eclipse.core.resources.prefs create mode 100644 plugins/de.scheidtbachmann.osgimodel.model.generate/build.properties diff --git a/build/de.cau.cs.kieler.osgiviz.repository/category.xml b/build/de.cau.cs.kieler.osgiviz.repository/category.xml index 9d4636a..dad84e4 100644 --- a/build/de.cau.cs.kieler.osgiviz.repository/category.xml +++ b/build/de.cau.cs.kieler.osgiviz.repository/category.xml @@ -20,10 +20,9 @@ - - - - - + + + + diff --git a/build/de.cau.cs.kieler.osgiviz.targetplatform/de.cau.cs.kieler.osgiviz.targetplatform.target b/build/de.cau.cs.kieler.osgiviz.targetplatform/de.cau.cs.kieler.osgiviz.targetplatform.target index 6c9ce3e..8192411 100644 --- a/build/de.cau.cs.kieler.osgiviz.targetplatform/de.cau.cs.kieler.osgiviz.targetplatform.target +++ b/build/de.cau.cs.kieler.osgiviz.targetplatform/de.cau.cs.kieler.osgiviz.targetplatform.target @@ -11,26 +11,22 @@ - - - - - + + - + - + - - + diff --git a/build/pom.xml b/build/pom.xml index f9eeb70..3548d77 100644 --- a/build/pom.xml +++ b/build/pom.xml @@ -10,19 +10,20 @@ - 11 - 11 - 11 + 17 + 17 + 17 - 2.7.3 - 2.28.0 ${project.version} - 0.8.1 - 2.9.0 - 5.1.0 - 2.3.0.v20230606 - 0.15.0 - 2.28.0 + + 0.9.1 + 2.10.1 + 7.0.0 + 3.0.1.v20240410 + 0.22.0 + 2.7.3 + 2.33.0 + 2.33.0 @@ -201,6 +202,77 @@ + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.eclipse.tycho + tycho-compiler-plugin + ${tycho-version} + + compile + testCompile + validate-classpath + + + + + + + + + org.eclipse.tycho + tycho-packaging-plugin + ${tycho-version} + + build-qualifier + build-qualifier-aggregator + validate-id + validate-version + + + + + + + + + org.apache.maven.plugins + maven-clean-plugin + [3.0.0,) + + clean + + + + + + + + + org.eclipse.tycho + target-platform-configuration + [2.7.3,) + + target-platform + + + + + + + + + + + diff --git a/features/de.cau.cs.kieler.osgiviz.eclipse.feature/.settings/org.eclipse.core.resources.prefs b/features/de.cau.cs.kieler.osgiviz.eclipse.feature/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..99f26c0 --- /dev/null +++ b/features/de.cau.cs.kieler.osgiviz.eclipse.feature/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/features/de.cau.cs.kieler.osgiviz.feature/.settings/org.eclipse.core.resources.prefs b/features/de.cau.cs.kieler.osgiviz.feature/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..99f26c0 --- /dev/null +++ b/features/de.cau.cs.kieler.osgiviz.feature/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/plugins/de.cau.cs.kieler.osgiviz.language.server/.classpath b/plugins/de.cau.cs.kieler.osgiviz.language.server/.classpath index 3baeb41..2713a9b 100644 --- a/plugins/de.cau.cs.kieler.osgiviz.language.server/.classpath +++ b/plugins/de.cau.cs.kieler.osgiviz.language.server/.classpath @@ -1,11 +1,11 @@ - + - + diff --git a/plugins/de.cau.cs.kieler.osgiviz.language.server/launch/OSGiViz Language Server.launch b/plugins/de.cau.cs.kieler.osgiviz.language.server/launch/OSGiViz Language Server.launch index 03e25ba..4daf0e5 100644 --- a/plugins/de.cau.cs.kieler.osgiviz.language.server/launch/OSGiViz Language Server.launch +++ b/plugins/de.cau.cs.kieler.osgiviz.language.server/launch/OSGiViz Language Server.launch @@ -12,7 +12,7 @@ - + diff --git a/plugins/de.cau.cs.kieler.osgiviz.model/.classpath b/plugins/de.cau.cs.kieler.osgiviz.model/.classpath index 11ca99f..4ab2b45 100644 --- a/plugins/de.cau.cs.kieler.osgiviz.model/.classpath +++ b/plugins/de.cau.cs.kieler.osgiviz.model/.classpath @@ -1,8 +1,27 @@ - + + + + + - - - + + + + + + + + + + + + + + + + + + diff --git a/plugins/de.cau.cs.kieler.osgiviz.model/.settings/org.eclipse.jdt.core.prefs b/plugins/de.cau.cs.kieler.osgiviz.model/.settings/org.eclipse.jdt.core.prefs index c9545f0..62ef348 100644 --- a/plugins/de.cau.cs.kieler.osgiviz.model/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/de.cau.cs.kieler.osgiviz.model/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 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=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/plugins/de.cau.cs.kieler.osgiviz.model/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.osgiviz.model/META-INF/MANIFEST.MF index 5b63ae1..73b2df1 100644 --- a/plugins/de.cau.cs.kieler.osgiviz.model/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.osgiviz.model/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Version: 0.3.1.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: de.cau.cs.kieler.osgiviz.osgivizmodel, de.cau.cs.kieler.osgiviz.osgivizmodel.impl, de.cau.cs.kieler.osgiviz.osgivizmodel.util diff --git a/plugins/de.cau.cs.kieler.osgiviz.ui/.classpath b/plugins/de.cau.cs.kieler.osgiviz.ui/.classpath index 44af600..efa1b7e 100644 --- a/plugins/de.cau.cs.kieler.osgiviz.ui/.classpath +++ b/plugins/de.cau.cs.kieler.osgiviz.ui/.classpath @@ -1,7 +1,7 @@ - + diff --git a/plugins/de.cau.cs.kieler.osgiviz.ui/.settings/org.eclipse.core.resources.prefs b/plugins/de.cau.cs.kieler.osgiviz.ui/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..99f26c0 --- /dev/null +++ b/plugins/de.cau.cs.kieler.osgiviz.ui/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/plugins/de.cau.cs.kieler.osgiviz.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/de.cau.cs.kieler.osgiviz.ui/.settings/org.eclipse.jdt.core.prefs index 049e42f..8c9943d 100644 --- a/plugins/de.cau.cs.kieler.osgiviz.ui/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/de.cau.cs.kieler.osgiviz.ui/.settings/org.eclipse.jdt.core.prefs @@ -1,11 +1,14 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -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 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=11 +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=17 diff --git a/plugins/de.cau.cs.kieler.osgiviz.ui/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.osgiviz.ui/META-INF/MANIFEST.MF index 315ba80..871230f 100644 --- a/plugins/de.cau.cs.kieler.osgiviz.ui/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.osgiviz.ui/META-INF/MANIFEST.MF @@ -1,5 +1,6 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 +Automatic-Module-Name: de.cau.cs.kieler.osgiviz.ui Bundle-Name: KIELER OSGi Model Visualization UI Bundle-SymbolicName: de.cau.cs.kieler.osgiviz.ui;singleton:=true Bundle-Version: 0.3.1.qualifier @@ -17,7 +18,7 @@ Require-Bundle: com.google.inject, org.eclipse.ui.ide, org.eclipse.xtend.lib, org.eclipse.xtext.xbase.lib -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Bundle-Vendor: Kiel University Export-Package: de.cau.cs.kieler.osgiviz.ui diff --git a/plugins/de.cau.cs.kieler.osgiviz/.classpath b/plugins/de.cau.cs.kieler.osgiviz/.classpath index 11ca99f..af19b02 100644 --- a/plugins/de.cau.cs.kieler.osgiviz/.classpath +++ b/plugins/de.cau.cs.kieler.osgiviz/.classpath @@ -1,8 +1,27 @@ - + + + + + - - + + + + + + + + + + + + + + + + + diff --git a/plugins/de.cau.cs.kieler.osgiviz/.settings/org.eclipse.jdt.core.prefs b/plugins/de.cau.cs.kieler.osgiviz/.settings/org.eclipse.jdt.core.prefs index a58ebdc..9478cb1 100644 --- a/plugins/de.cau.cs.kieler.osgiviz/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/de.cau.cs.kieler.osgiviz/.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,4 +12,4 @@ 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 diff --git a/plugins/de.cau.cs.kieler.osgiviz/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.osgiviz/META-INF/MANIFEST.MF index b1c0f39..d751de6 100644 --- a/plugins/de.cau.cs.kieler.osgiviz/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.osgiviz/META-INF/MANIFEST.MF @@ -16,6 +16,7 @@ Require-Bundle: de.cau.cs.kieler.klighd, org.eclipse.xtend.lib, org.eclipse.xtext.xbase.lib, com.google.inject;bundle-version="3.0.0" -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Bundle-Vendor: Kiel University +Automatic-Module-Name: de.cau.cs.kieler.osgiviz diff --git a/plugins/de.cau.cs.kieler.osgiviz/build.properties b/plugins/de.cau.cs.kieler.osgiviz/build.properties index b59029f..0bc3a36 100644 --- a/plugins/de.cau.cs.kieler.osgiviz/build.properties +++ b/plugins/de.cau.cs.kieler.osgiviz/build.properties @@ -4,3 +4,4 @@ bin.includes = META-INF/,\ .,\ plugin.xml,\ icons/ +jre.compilation.profile = JavaSE-17 diff --git a/plugins/de.scheidtbachmann.osgimodel.model.edit/.settings/org.eclipse.core.resources.prefs b/plugins/de.scheidtbachmann.osgimodel.model.edit/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..99f26c0 --- /dev/null +++ b/plugins/de.scheidtbachmann.osgimodel.model.edit/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/plugins/de.scheidtbachmann.osgimodel.model.edit/META-INF/MANIFEST.MF b/plugins/de.scheidtbachmann.osgimodel.model.edit/META-INF/MANIFEST.MF index 64b461e..0b2befc 100644 --- a/plugins/de.scheidtbachmann.osgimodel.model.edit/META-INF/MANIFEST.MF +++ b/plugins/de.scheidtbachmann.osgimodel.model.edit/META-INF/MANIFEST.MF @@ -8,7 +8,7 @@ Bundle-ClassPath: de.scheidtbachmann.osgimodel.model.edit.jar Bundle-Activator: de.scheidtbachmann.osgimodel.provider.OsgiModelEditPlugin$Implementation$Activator Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: de.scheidtbachmann.osgimodel.provider Require-Bundle: org.eclipse.core.runtime;resolution:=optional;x-installation:=greedy, de.scheidtbachmann.osgimodel.model;visibility:=reexport, diff --git a/plugins/de.scheidtbachmann.osgimodel.model.editor/.settings/org.eclipse.core.resources.prefs b/plugins/de.scheidtbachmann.osgimodel.model.editor/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..99f26c0 --- /dev/null +++ b/plugins/de.scheidtbachmann.osgimodel.model.editor/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/plugins/de.scheidtbachmann.osgimodel.model.editor/META-INF/MANIFEST.MF b/plugins/de.scheidtbachmann.osgimodel.model.editor/META-INF/MANIFEST.MF index b64985f..6af5cfb 100644 --- a/plugins/de.scheidtbachmann.osgimodel.model.editor/META-INF/MANIFEST.MF +++ b/plugins/de.scheidtbachmann.osgimodel.model.editor/META-INF/MANIFEST.MF @@ -8,7 +8,7 @@ Bundle-ClassPath: de.scheidtbachmann.osgimodel.model.editor.jar Bundle-Activator: de.scheidtbachmann.osgimodel.presentation.OsgiModelEditorPlugin$Implementation Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: de.scheidtbachmann.osgimodel.presentation Require-Bundle: org.eclipse.core.runtime, org.eclipse.core.resources;visibility:=reexport, diff --git a/plugins/de.scheidtbachmann.osgimodel.model.generate/.classpath b/plugins/de.scheidtbachmann.osgimodel.model.generate/.classpath index 0688757..4023315 100644 --- a/plugins/de.scheidtbachmann.osgimodel.model.generate/.classpath +++ b/plugins/de.scheidtbachmann.osgimodel.model.generate/.classpath @@ -6,11 +6,6 @@ - - - - - @@ -23,5 +18,19 @@ + + + + + + + + + + + + + + diff --git a/plugins/de.scheidtbachmann.osgimodel.model.generate/build.properties b/plugins/de.scheidtbachmann.osgimodel.model.generate/build.properties new file mode 100644 index 0000000..22d1994 --- /dev/null +++ b/plugins/de.scheidtbachmann.osgimodel.model.generate/build.properties @@ -0,0 +1,2 @@ +source.. = src/main/java/ +bin.includes = . diff --git a/plugins/de.scheidtbachmann.osgimodel.model.generate/src/main/java/de/scheidtbachmann/osgimodel/model/generate/ConfigAndExecuteMojo.java b/plugins/de.scheidtbachmann.osgimodel.model.generate/src/main/java/de/scheidtbachmann/osgimodel/model/generate/ConfigAndExecuteMojo.java index f40c97a..fd78713 100644 --- a/plugins/de.scheidtbachmann.osgimodel.model.generate/src/main/java/de/scheidtbachmann/osgimodel/model/generate/ConfigAndExecuteMojo.java +++ b/plugins/de.scheidtbachmann.osgimodel.model.generate/src/main/java/de/scheidtbachmann/osgimodel/model/generate/ConfigAndExecuteMojo.java @@ -19,14 +19,8 @@ import org.apache.maven.plugin.logging.Log; import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Parameter; -import org.eclipse.xtext.generator.AbstractFileSystemAccess; -import org.eclipse.xtext.generator.JavaIoFileSystemAccess; -import org.eclipse.xtext.parser.IEncodingProvider; -import org.eclipse.xtext.resource.IResourceServiceProvider.Registry; import de.scheidtbachmann.osgimodel.OsgiProject; -import de.scheidtbachmann.osgimodel.model.generate.OsgiModelDataGenerator; -import de.scheidtbachmann.osgimodel.model.generate.ReadProjectFiles; import java.io.File; import java.net.URL; @@ -47,8 +41,6 @@ @Mojo(name = "generate-documentation") public class ConfigAndExecuteMojo extends AbstractMojo { - private static final String DEFAULT_OUTPUT = "DEFAULT_OUTPUT"; //$NON-NLS-1$ - /** * The names of all projects, that should be documented. */ diff --git a/plugins/de.scheidtbachmann.osgimodel.model.generate/src/main/java/de/scheidtbachmann/osgimodel/model/generate/OsgiModelSaveAndLoadUtility.java b/plugins/de.scheidtbachmann.osgimodel.model.generate/src/main/java/de/scheidtbachmann/osgimodel/model/generate/OsgiModelSaveAndLoadUtility.java index 4bd653a..37d6c92 100644 --- a/plugins/de.scheidtbachmann.osgimodel.model.generate/src/main/java/de/scheidtbachmann/osgimodel/model/generate/OsgiModelSaveAndLoadUtility.java +++ b/plugins/de.scheidtbachmann.osgimodel.model.generate/src/main/java/de/scheidtbachmann/osgimodel/model/generate/OsgiModelSaveAndLoadUtility.java @@ -20,7 +20,6 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; -import java.util.Optional; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.resource.Resource; diff --git a/plugins/de.scheidtbachmann.osgimodel.model.generate/src/main/java/de/scheidtbachmann/osgimodel/model/generate/ReadProjectFiles.java b/plugins/de.scheidtbachmann.osgimodel.model.generate/src/main/java/de/scheidtbachmann/osgimodel/model/generate/ReadProjectFiles.java index e76de7b..0e6a72c 100644 --- a/plugins/de.scheidtbachmann.osgimodel.model.generate/src/main/java/de/scheidtbachmann/osgimodel/model/generate/ReadProjectFiles.java +++ b/plugins/de.scheidtbachmann.osgimodel.model.generate/src/main/java/de/scheidtbachmann/osgimodel/model/generate/ReadProjectFiles.java @@ -284,7 +284,6 @@ private void extractBundleData(final Path manifestPath) { bundle.getServiceComponents().add(serviceComponent); project.getServiceComponents().add(serviceComponent); serviceComponent.setPath(FilenameUtils.separatorsToUnix(serviceComponentFile.getAbsolutePath())); - final int i = 1; } } @@ -798,7 +797,7 @@ private void parseFilesFromList() { // use ASTParse to parse string of a java file private void parseJavaFile(final String fileName, final String fileContent) { - final ASTParser parser = ASTParser.newParser(AST.JLS11); + final ASTParser parser = ASTParser.newParser(AST.getJLSLatest()); parser.setSource(fileContent.toCharArray()); parser.setKind(ASTParser.K_COMPILATION_UNIT); diff --git a/plugins/de.scheidtbachmann.osgimodel.model.generate/src/main/java/de/scheidtbachmann/osgimodel/model/generate/ReadProjectFilesUtility.java b/plugins/de.scheidtbachmann.osgimodel.model.generate/src/main/java/de/scheidtbachmann/osgimodel/model/generate/ReadProjectFilesUtility.java index ac0b0fb..dcb30ef 100644 --- a/plugins/de.scheidtbachmann.osgimodel.model.generate/src/main/java/de/scheidtbachmann/osgimodel/model/generate/ReadProjectFilesUtility.java +++ b/plugins/de.scheidtbachmann.osgimodel.model.generate/src/main/java/de/scheidtbachmann/osgimodel/model/generate/ReadProjectFilesUtility.java @@ -27,7 +27,6 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.util.Comparator; -import java.util.Optional; /** * This is a utility class for {@linkplain ReadProjectFiles} with methods for diff --git a/plugins/de.scheidtbachmann.osgimodel.model/.classpath b/plugins/de.scheidtbachmann.osgimodel.model/.classpath index 96d2680..5050774 100644 --- a/plugins/de.scheidtbachmann.osgimodel.model/.classpath +++ b/plugins/de.scheidtbachmann.osgimodel.model/.classpath @@ -1,11 +1,21 @@ - + - + - - + + + + + + + + + + + + diff --git a/plugins/de.scheidtbachmann.osgimodel.model/.settings/org.eclipse.jdt.core.prefs b/plugins/de.scheidtbachmann.osgimodel.model/.settings/org.eclipse.jdt.core.prefs index cd8d089..9478cb1 100644 --- a/plugins/de.scheidtbachmann.osgimodel.model/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/de.scheidtbachmann.osgimodel.model/.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 @@ -11,5 +11,5 @@ 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=disabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=17 diff --git a/plugins/de.scheidtbachmann.osgimodel.model/META-INF/MANIFEST.MF b/plugins/de.scheidtbachmann.osgimodel.model/META-INF/MANIFEST.MF index 347454d..084ec1d 100644 --- a/plugins/de.scheidtbachmann.osgimodel.model/META-INF/MANIFEST.MF +++ b/plugins/de.scheidtbachmann.osgimodel.model/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Version: 0.3.1.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: de.scheidtbachmann.osgimodel, de.scheidtbachmann.osgimodel.impl, de.scheidtbachmann.osgimodel.util