From eb9d2236976249e01a3c1570afa7e450a646e349 Mon Sep 17 00:00:00 2001 From: Lars Vogel Date: Mon, 18 Nov 2024 15:18:44 +0100 Subject: [PATCH 1/7] Tycho update --- .mvn/extensions.xml | 2 +- pom.xml | 15 +++++---------- target-platform/pom.xml | 13 ------------- 3 files changed, 6 insertions(+), 24 deletions(-) delete mode 100644 target-platform/pom.xml diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml index 5ab984a..1512cb6 100644 --- a/.mvn/extensions.xml +++ b/.mvn/extensions.xml @@ -2,6 +2,6 @@ org.eclipse.tycho tycho-build - 4.0.4 + 4.0.10 \ No newline at end of file diff --git a/pom.xml b/pom.xml index 795439a..c270cf9 100644 --- a/pom.xml +++ b/pom.xml @@ -6,9 +6,8 @@ pom - 4.0.4 + 4.0.10 UTF-8 - http://download.eclipse.org/releases/latest @@ -49,15 +48,11 @@ target-platform-configuration ${tycho.version} - - - com.vogella.tycho - target-platform - 1.0.0-SNAPSHOT - - + + ../target-platform/target-platform.target + - JavaSE-17 + JavaSE-21 linux diff --git a/target-platform/pom.xml b/target-platform/pom.xml deleted file mode 100644 index bb0150d..0000000 --- a/target-platform/pom.xml +++ /dev/null @@ -1,13 +0,0 @@ - - 4.0.0 - - com.vogella.tycho - releng - 1.0.0-SNAPSHOT - - com.vogella.tycho - target-platform - 1.0.0-SNAPSHOT - eclipse-target-definition - - \ No newline at end of file From 3602bc554974cf51684cda80f0235a14e1f1fa05 Mon Sep 17 00:00:00 2001 From: Lars Vogel Date: Wed, 20 Nov 2024 13:55:19 +0100 Subject: [PATCH 2/7] Update GH action to use Java 21 and latest Maven --- .github/workflows/maven.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml index 5f3d998..4e285fd 100644 --- a/.github/workflows/maven.yaml +++ b/.github/workflows/maven.yaml @@ -17,15 +17,15 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v2 with: distribution: 'temurin' - java-version: '17' + java-version: '21' cache: 'maven' - name: Set up Maven - uses: stCarolas/setup-maven@v4.5 + uses: stCarolas/setup-maven@v5 with: - maven-version: 3.9.5 + maven-version: 3.9.9 - name: Build with Maven run: mvn clean verify -ntp \ No newline at end of file From db988ac4dcdb039e5c5f7133bb33e61f41d2edef Mon Sep 17 00:00:00 2001 From: Lars Vogel Date: Mon, 18 Nov 2024 15:19:22 +0100 Subject: [PATCH 3/7] Adding .polyglot.target-platform.target to .gitignore --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 095922a..371234e 100644 --- a/.gitignore +++ b/.gitignore @@ -14,4 +14,5 @@ Snap.* .polyglot.ide.product .polyglot.feature.xml .tycho-consumer-pom.xml -.polyglot.category.xml \ No newline at end of file +.polyglot.category.xml +.polyglot.target-platform.target \ No newline at end of file From 5c07a8692772e7d20b7554d2f8d86ba62e6081ad Mon Sep 17 00:00:00 2001 From: Lars Vogel Date: Mon, 18 Nov 2024 15:19:48 +0100 Subject: [PATCH 4/7] Remove outdated attributes from feature --- com.vogella.ide.feature/feature.xml | 70 ++++++----------------------- 1 file changed, 14 insertions(+), 56 deletions(-) diff --git a/com.vogella.ide.feature/feature.xml b/com.vogella.ide.feature/feature.xml index 8add038..fd622c3 100644 --- a/com.vogella.ide.feature/feature.xml +++ b/com.vogella.ide.feature/feature.xml @@ -19,100 +19,58 @@ + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> + version="0.0.0"/> From 642ebdd377286c4bf11f4aef7dc3ec276972734d Mon Sep 17 00:00:00 2001 From: Lars Vogel Date: Mon, 18 Nov 2024 15:21:00 +0100 Subject: [PATCH 5/7] Update to jakarta.* imports and Java 21 --- com.vogella.adapters/.classpath | 2 +- com.vogella.adapters/.settings/org.eclipse.jdt.core.prefs | 6 +++--- com.vogella.adapters/META-INF/MANIFEST.MF | 4 ++-- .../src/com/vogella/adapters/AdapterOverviewPart.java | 2 +- com.vogella.contribute.parts/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- com.vogella.contribute.parts/META-INF/MANIFEST.MF | 4 ++-- .../contribute/parts/AdditionalInformationPart.java | 2 +- com.vogella.eclipse.css/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- com.vogella.eclipse.css/META-INF/MANIFEST.MF | 2 +- com.vogella.ide.editor.gradle/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- com.vogella.ide.editor.gradle/META-INF/MANIFEST.MF | 2 +- com.vogella.ide.editor.tasks/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- com.vogella.ide.editor.tasks/META-INF/MANIFEST.MF | 2 +- com.vogella.ide.first/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- com.vogella.ide.first/META-INF/MANIFEST.MF | 6 +++--- com.vogella.ide.first/plugin.xml | 8 -------- .../src/com/vogella/ide/first/parts/SampleView.java | 6 +++--- com.vogella.preferences.page/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- com.vogella.preferences.page/META-INF/MANIFEST.MF | 2 +- com.vogella.resources/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- com.vogella.resources/META-INF/MANIFEST.MF | 2 +- com.vogella.swt.widgets/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- com.vogella.swt.widgets/META-INF/MANIFEST.MF | 2 +- com.vogella.tasks.events/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- com.vogella.tasks.events/META-INF/MANIFEST.MF | 2 +- com.vogella.tasks.extendedsupplier/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- com.vogella.tasks.extendedsupplier/META-INF/MANIFEST.MF | 4 ++-- .../com/vogella/tasks/extendedsupplier/DirectTask.java | 2 +- .../internal/DirectTaskObjectSupplier.java | 2 +- com.vogella.tasks.model/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- com.vogella.tasks.model/META-INF/MANIFEST.MF | 2 +- com.vogella.tasks.services/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- com.vogella.tasks.services/META-INF/MANIFEST.MF | 4 ++-- .../tasks/services/internal/TransientTaskServiceImpl.java | 2 +- com.vogella.tasks.ui/.classpath | 2 +- com.vogella.tasks.ui/.settings/org.eclipse.jdt.core.prefs | 6 +++--- com.vogella.tasks.ui/META-INF/MANIFEST.MF | 6 +++--- .../tasks/ui/addon/AddViewsToPerspectiveAddon.java | 4 ++-- .../vogella/tasks/ui/addon/PerspectiveSwitchAddon.java | 2 +- .../com/vogella/tasks/ui/handlers/OpenEditorHandler.java | 2 +- .../com/vogella/tasks/ui/handlers/RemoveTodoHandler.java | 2 +- .../com/vogella/tasks/ui/parts/AutoCompleteFieldPart.java | 4 ++-- .../src/com/vogella/tasks/ui/parts/PlaygroundPart.java | 2 +- .../src/com/vogella/tasks/ui/parts/PlaygroundPart2.java | 2 +- .../src/com/vogella/tasks/ui/parts/TaskEditorPart.java | 6 +++--- .../src/com/vogella/tasks/ui/parts/TodoDeletionPart.java | 4 ++-- .../src/com/vogella/tasks/ui/parts/TodoDetailsPart.java | 8 ++++---- .../src/com/vogella/tasks/ui/parts/TodoOverviewPart.java | 4 ++-- target-platform/target-platform.target | 8 ++++++-- 61 files changed, 112 insertions(+), 116 deletions(-) diff --git a/com.vogella.adapters/.classpath b/com.vogella.adapters/.classpath index 81fe078..375961e 100644 --- a/com.vogella.adapters/.classpath +++ b/com.vogella.adapters/.classpath @@ -1,6 +1,6 @@ - + diff --git a/com.vogella.adapters/.settings/org.eclipse.jdt.core.prefs b/com.vogella.adapters/.settings/org.eclipse.jdt.core.prefs index 62ef348..23fa13b 100644 --- a/com.vogella.adapters/.settings/org.eclipse.jdt.core.prefs +++ b/com.vogella.adapters/.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/com.vogella.adapters/META-INF/MANIFEST.MF b/com.vogella.adapters/META-INF/MANIFEST.MF index 869874b..6ed20fb 100644 --- a/com.vogella.adapters/META-INF/MANIFEST.MF +++ b/com.vogella.adapters/META-INF/MANIFEST.MF @@ -14,6 +14,6 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.ui.ide, org.eclipse.core.resources, org.eclipse.e4.ui.workbench -Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: javax.annotation;version="1.3.5" +Bundle-RequiredExecutionEnvironment: JavaSE-21 +Import-Package: jakarta.annotation;version="[2.1.0,3.0.0)" Automatic-Module-Name: com.vogella.adapters diff --git a/com.vogella.adapters/src/com/vogella/adapters/AdapterOverviewPart.java b/com.vogella.adapters/src/com/vogella/adapters/AdapterOverviewPart.java index c744110..d586850 100644 --- a/com.vogella.adapters/src/com/vogella/adapters/AdapterOverviewPart.java +++ b/com.vogella.adapters/src/com/vogella/adapters/AdapterOverviewPart.java @@ -1,6 +1,6 @@ package com.vogella.adapters; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import org.eclipse.e4.ui.di.Focus; import org.eclipse.e4.ui.dialogs.filteredtree.FilteredTree; diff --git a/com.vogella.contribute.parts/.classpath b/com.vogella.contribute.parts/.classpath index 81fe078..375961e 100644 --- a/com.vogella.contribute.parts/.classpath +++ b/com.vogella.contribute.parts/.classpath @@ -1,6 +1,6 @@ - + diff --git a/com.vogella.contribute.parts/.settings/org.eclipse.jdt.core.prefs b/com.vogella.contribute.parts/.settings/org.eclipse.jdt.core.prefs index 62ef348..23fa13b 100644 --- a/com.vogella.contribute.parts/.settings/org.eclipse.jdt.core.prefs +++ b/com.vogella.contribute.parts/.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/com.vogella.contribute.parts/META-INF/MANIFEST.MF b/com.vogella.contribute.parts/META-INF/MANIFEST.MF index 38511b2..e9ec7ed 100644 --- a/com.vogella.contribute.parts/META-INF/MANIFEST.MF +++ b/com.vogella.contribute.parts/META-INF/MANIFEST.MF @@ -15,6 +15,6 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.core.databinding.observable;bundle-version="1.10.0", org.eclipse.core.databinding.property;bundle-version="1.8.100", org.eclipse.jface.databinding;bundle-version="1.12.0" -Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: javax.annotation +Bundle-RequiredExecutionEnvironment: JavaSE-21 +Import-Package: jakarta.annotation;version="[2.1.0,3.0.0)" Automatic-Module-Name: com.vogella.contribute.parts diff --git a/com.vogella.contribute.parts/src/com/vogella/contribute/parts/AdditionalInformationPart.java b/com.vogella.contribute.parts/src/com/vogella/contribute/parts/AdditionalInformationPart.java index 7ae69d5..5c19063 100644 --- a/com.vogella.contribute.parts/src/com/vogella/contribute/parts/AdditionalInformationPart.java +++ b/com.vogella.contribute.parts/src/com/vogella/contribute/parts/AdditionalInformationPart.java @@ -1,6 +1,6 @@ package com.vogella.contribute.parts; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import org.eclipse.jface.widgets.TextFactory; import org.eclipse.swt.SWT; diff --git a/com.vogella.eclipse.css/.classpath b/com.vogella.eclipse.css/.classpath index 81fe078..375961e 100644 --- a/com.vogella.eclipse.css/.classpath +++ b/com.vogella.eclipse.css/.classpath @@ -1,6 +1,6 @@ - + diff --git a/com.vogella.eclipse.css/.settings/org.eclipse.jdt.core.prefs b/com.vogella.eclipse.css/.settings/org.eclipse.jdt.core.prefs index 62ef348..23fa13b 100644 --- a/com.vogella.eclipse.css/.settings/org.eclipse.jdt.core.prefs +++ b/com.vogella.eclipse.css/.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/com.vogella.eclipse.css/META-INF/MANIFEST.MF b/com.vogella.eclipse.css/META-INF/MANIFEST.MF index 4ba2563..660b9e8 100644 --- a/com.vogella.eclipse.css/META-INF/MANIFEST.MF +++ b/com.vogella.eclipse.css/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: com.vogella.eclipse.css;singleton:=true Bundle-Version: 1.0.0.qualifier Bundle-Vendor: VOGELLA Automatic-Module-Name: com.vogella.eclipse.css -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.e4.ui.css.swt.theme;bundle-version="0.12.700", org.eclipse.e4.ui.css.core;bundle-version="0.12.1300", org.eclipse.e4.ui.css.swt;bundle-version="0.13.1100", diff --git a/com.vogella.ide.editor.gradle/.classpath b/com.vogella.ide.editor.gradle/.classpath index 81fe078..375961e 100644 --- a/com.vogella.ide.editor.gradle/.classpath +++ b/com.vogella.ide.editor.gradle/.classpath @@ -1,6 +1,6 @@ - + diff --git a/com.vogella.ide.editor.gradle/.settings/org.eclipse.jdt.core.prefs b/com.vogella.ide.editor.gradle/.settings/org.eclipse.jdt.core.prefs index 62ef348..23fa13b 100644 --- a/com.vogella.ide.editor.gradle/.settings/org.eclipse.jdt.core.prefs +++ b/com.vogella.ide.editor.gradle/.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/com.vogella.ide.editor.gradle/META-INF/MANIFEST.MF b/com.vogella.ide.editor.gradle/META-INF/MANIFEST.MF index fe6c963..ab3440d 100644 --- a/com.vogella.ide.editor.gradle/META-INF/MANIFEST.MF +++ b/com.vogella.ide.editor.gradle/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: com.vogella.ide.editor.gradle;singleton:=true Bundle-Version: 1.0.0.qualifier Bundle-Vendor: VOGELLA Automatic-Module-Name: com.vogella.ide.editor.gradle -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.text, org.eclipse.ui, org.eclipse.ui.editors, diff --git a/com.vogella.ide.editor.tasks/.classpath b/com.vogella.ide.editor.tasks/.classpath index 81fe078..375961e 100644 --- a/com.vogella.ide.editor.tasks/.classpath +++ b/com.vogella.ide.editor.tasks/.classpath @@ -1,6 +1,6 @@ - + diff --git a/com.vogella.ide.editor.tasks/.settings/org.eclipse.jdt.core.prefs b/com.vogella.ide.editor.tasks/.settings/org.eclipse.jdt.core.prefs index 62ef348..23fa13b 100644 --- a/com.vogella.ide.editor.tasks/.settings/org.eclipse.jdt.core.prefs +++ b/com.vogella.ide.editor.tasks/.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/com.vogella.ide.editor.tasks/META-INF/MANIFEST.MF b/com.vogella.ide.editor.tasks/META-INF/MANIFEST.MF index 35ba656..2b34426 100644 --- a/com.vogella.ide.editor.tasks/META-INF/MANIFEST.MF +++ b/com.vogella.ide.editor.tasks/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: com.vogella.ide.editor.tasks;singleton:=true Bundle-Version: 1.0.0.qualifier Bundle-Vendor: VOGELLA Automatic-Module-Name: com.vogella.ide.editor.tasks -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.text, org.eclipse.ui, org.eclipse.ui.editors, diff --git a/com.vogella.ide.first/.classpath b/com.vogella.ide.first/.classpath index 81fe078..375961e 100644 --- a/com.vogella.ide.first/.classpath +++ b/com.vogella.ide.first/.classpath @@ -1,6 +1,6 @@ - + diff --git a/com.vogella.ide.first/.settings/org.eclipse.jdt.core.prefs b/com.vogella.ide.first/.settings/org.eclipse.jdt.core.prefs index 62ef348..23fa13b 100644 --- a/com.vogella.ide.first/.settings/org.eclipse.jdt.core.prefs +++ b/com.vogella.ide.first/.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/com.vogella.ide.first/META-INF/MANIFEST.MF b/com.vogella.ide.first/META-INF/MANIFEST.MF index cfef8da..b8acc9f 100644 --- a/com.vogella.ide.first/META-INF/MANIFEST.MF +++ b/com.vogella.ide.first/META-INF/MANIFEST.MF @@ -10,8 +10,8 @@ Require-Bundle: org.eclipse.osgi, org.eclipse.e4.ui.di, org.eclipse.e4.ui.services, org.eclipse.e4.core.di.annotations -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Import-Package: com.vogella.tasks.model, - javax.annotation;version="1.2.0", - javax.inject;version="1.0.0" + jakarta.annotation;version="[2.1.0,3.0.0)", + jakarta.inject;version="[2.0.0,3.0.0)" Automatic-Module-Name: com.vogella.ide.first diff --git a/com.vogella.ide.first/plugin.xml b/com.vogella.ide.first/plugin.xml index 7fe94c5..ed423cb 100644 --- a/com.vogella.ide.first/plugin.xml +++ b/com.vogella.ide.first/plugin.xml @@ -13,14 +13,6 @@ - - - - diff --git a/com.vogella.ide.first/src/com/vogella/ide/first/parts/SampleView.java b/com.vogella.ide.first/src/com/vogella/ide/first/parts/SampleView.java index 8c3d7c0..53770a5 100644 --- a/com.vogella.ide.first/src/com/vogella/ide/first/parts/SampleView.java +++ b/com.vogella.ide.first/src/com/vogella/ide/first/parts/SampleView.java @@ -1,8 +1,8 @@ package com.vogella.ide.first.parts; -import javax.annotation.PostConstruct; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.eclipse.e4.core.di.annotations.Optional; import org.eclipse.e4.ui.di.Focus; diff --git a/com.vogella.preferences.page/.classpath b/com.vogella.preferences.page/.classpath index 81fe078..375961e 100644 --- a/com.vogella.preferences.page/.classpath +++ b/com.vogella.preferences.page/.classpath @@ -1,6 +1,6 @@ - + diff --git a/com.vogella.preferences.page/.settings/org.eclipse.jdt.core.prefs b/com.vogella.preferences.page/.settings/org.eclipse.jdt.core.prefs index 62ef348..23fa13b 100644 --- a/com.vogella.preferences.page/.settings/org.eclipse.jdt.core.prefs +++ b/com.vogella.preferences.page/.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/com.vogella.preferences.page/META-INF/MANIFEST.MF b/com.vogella.preferences.page/META-INF/MANIFEST.MF index ae8b0c5..32d655b 100644 --- a/com.vogella.preferences.page/META-INF/MANIFEST.MF +++ b/com.vogella.preferences.page/META-INF/MANIFEST.MF @@ -5,6 +5,6 @@ Bundle-SymbolicName: com.vogella.preferences.page;singleton:=true Bundle-Version: 1.0.0.qualifier Bundle-Vendor: VOGELLA Automatic-Module-Name: com.vogella.preferences.page -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.ui;bundle-version="3.118.0", org.eclipse.core.runtime;bundle-version="3.19.0" diff --git a/com.vogella.resources/.classpath b/com.vogella.resources/.classpath index 81fe078..375961e 100644 --- a/com.vogella.resources/.classpath +++ b/com.vogella.resources/.classpath @@ -1,6 +1,6 @@ - + diff --git a/com.vogella.resources/.settings/org.eclipse.jdt.core.prefs b/com.vogella.resources/.settings/org.eclipse.jdt.core.prefs index 62ef348..23fa13b 100644 --- a/com.vogella.resources/.settings/org.eclipse.jdt.core.prefs +++ b/com.vogella.resources/.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/com.vogella.resources/META-INF/MANIFEST.MF b/com.vogella.resources/META-INF/MANIFEST.MF index a02c668..a890b27 100644 --- a/com.vogella.resources/META-INF/MANIFEST.MF +++ b/com.vogella.resources/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: com.vogella.resources;singleton:=true Bundle-Version: 1.0.0.qualifier Bundle-Vendor: VOGELLA Automatic-Module-Name: com.vogella.resources -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.jface, org.eclipse.core.runtime, org.eclipse.core.resources, diff --git a/com.vogella.swt.widgets/.classpath b/com.vogella.swt.widgets/.classpath index 81fe078..375961e 100644 --- a/com.vogella.swt.widgets/.classpath +++ b/com.vogella.swt.widgets/.classpath @@ -1,6 +1,6 @@ - + diff --git a/com.vogella.swt.widgets/.settings/org.eclipse.jdt.core.prefs b/com.vogella.swt.widgets/.settings/org.eclipse.jdt.core.prefs index 62ef348..23fa13b 100644 --- a/com.vogella.swt.widgets/.settings/org.eclipse.jdt.core.prefs +++ b/com.vogella.swt.widgets/.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/com.vogella.swt.widgets/META-INF/MANIFEST.MF b/com.vogella.swt.widgets/META-INF/MANIFEST.MF index 4649fea..d2c734c 100644 --- a/com.vogella.swt.widgets/META-INF/MANIFEST.MF +++ b/com.vogella.swt.widgets/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: com.vogella.swt.widgets Bundle-Version: 1.0.0.qualifier Bundle-Vendor: VOGELLA Automatic-Module-Name: com.vogella.swt.widgets -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.jface, org.eclipse.core.runtime Export-Package: com.vogella.swt.widgets diff --git a/com.vogella.tasks.events/.classpath b/com.vogella.tasks.events/.classpath index 81fe078..375961e 100644 --- a/com.vogella.tasks.events/.classpath +++ b/com.vogella.tasks.events/.classpath @@ -1,6 +1,6 @@ - + diff --git a/com.vogella.tasks.events/.settings/org.eclipse.jdt.core.prefs b/com.vogella.tasks.events/.settings/org.eclipse.jdt.core.prefs index 62ef348..23fa13b 100644 --- a/com.vogella.tasks.events/.settings/org.eclipse.jdt.core.prefs +++ b/com.vogella.tasks.events/.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/com.vogella.tasks.events/META-INF/MANIFEST.MF b/com.vogella.tasks.events/META-INF/MANIFEST.MF index be2077b..272a098 100644 --- a/com.vogella.tasks.events/META-INF/MANIFEST.MF +++ b/com.vogella.tasks.events/META-INF/MANIFEST.MF @@ -5,5 +5,5 @@ Bundle-SymbolicName: com.vogella.tasks.events Bundle-Version: 1.0.0.qualifier Bundle-Vendor: VOGELLA Automatic-Module-Name: com.vogella.tasks.events -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Export-Package: com.vogella.tasks.events diff --git a/com.vogella.tasks.extendedsupplier/.classpath b/com.vogella.tasks.extendedsupplier/.classpath index 81fe078..375961e 100644 --- a/com.vogella.tasks.extendedsupplier/.classpath +++ b/com.vogella.tasks.extendedsupplier/.classpath @@ -1,6 +1,6 @@ - + diff --git a/com.vogella.tasks.extendedsupplier/.settings/org.eclipse.jdt.core.prefs b/com.vogella.tasks.extendedsupplier/.settings/org.eclipse.jdt.core.prefs index 62ef348..23fa13b 100644 --- a/com.vogella.tasks.extendedsupplier/.settings/org.eclipse.jdt.core.prefs +++ b/com.vogella.tasks.extendedsupplier/.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/com.vogella.tasks.extendedsupplier/META-INF/MANIFEST.MF b/com.vogella.tasks.extendedsupplier/META-INF/MANIFEST.MF index bae032a..a7e610c 100644 --- a/com.vogella.tasks.extendedsupplier/META-INF/MANIFEST.MF +++ b/com.vogella.tasks.extendedsupplier/META-INF/MANIFEST.MF @@ -5,11 +5,11 @@ Bundle-SymbolicName: com.vogella.tasks.extendedsupplier Bundle-Version: 1.0.0.qualifier Bundle-Vendor: VOGELLA Automatic-Module-Name: com.vogella.tasks.extendedsupplier -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.e4.core.di;bundle-version="1.7.600", com.vogella.tasks.model;bundle-version="1.0.0", org.eclipse.osgi.services;bundle-version="3.9.0" -Import-Package: javax.inject;version="1.0.0" +Import-Package: jakarta.inject;version="[2.0.0,3.0.0)" Bundle-ActivationPolicy: lazy Export-Package: com.vogella.tasks.extendedsupplier Service-Component: OSGI-INF/com.vogella.tasks.extendedsupplier.internal.DirectTaskObjectSupplier.xml diff --git a/com.vogella.tasks.extendedsupplier/src/com/vogella/tasks/extendedsupplier/DirectTask.java b/com.vogella.tasks.extendedsupplier/src/com/vogella/tasks/extendedsupplier/DirectTask.java index eaee34c..acd38f3 100644 --- a/com.vogella.tasks.extendedsupplier/src/com/vogella/tasks/extendedsupplier/DirectTask.java +++ b/com.vogella.tasks.extendedsupplier/src/com/vogella/tasks/extendedsupplier/DirectTask.java @@ -6,7 +6,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -@javax.inject.Qualifier +@jakarta.inject.Qualifier @Documented @Target({ ElementType.PARAMETER, ElementType.FIELD }) @Retention(RetentionPolicy.RUNTIME) diff --git a/com.vogella.tasks.extendedsupplier/src/com/vogella/tasks/extendedsupplier/internal/DirectTaskObjectSupplier.java b/com.vogella.tasks.extendedsupplier/src/com/vogella/tasks/extendedsupplier/internal/DirectTaskObjectSupplier.java index 1f17b39..00c0eb2 100644 --- a/com.vogella.tasks.extendedsupplier/src/com/vogella/tasks/extendedsupplier/internal/DirectTaskObjectSupplier.java +++ b/com.vogella.tasks.extendedsupplier/src/com/vogella/tasks/extendedsupplier/internal/DirectTaskObjectSupplier.java @@ -1,6 +1,6 @@ package com.vogella.tasks.extendedsupplier.internal; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.e4.core.di.suppliers.ExtendedObjectSupplier; import org.eclipse.e4.core.di.suppliers.IObjectDescriptor; diff --git a/com.vogella.tasks.model/.classpath b/com.vogella.tasks.model/.classpath index 81fe078..375961e 100644 --- a/com.vogella.tasks.model/.classpath +++ b/com.vogella.tasks.model/.classpath @@ -1,6 +1,6 @@ - + diff --git a/com.vogella.tasks.model/.settings/org.eclipse.jdt.core.prefs b/com.vogella.tasks.model/.settings/org.eclipse.jdt.core.prefs index d4540a5..3a79233 100644 --- a/com.vogella.tasks.model/.settings/org.eclipse.jdt.core.prefs +++ b/com.vogella.tasks.model/.settings/org.eclipse.jdt.core.prefs @@ -1,10 +1,10 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -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/com.vogella.tasks.model/META-INF/MANIFEST.MF b/com.vogella.tasks.model/META-INF/MANIFEST.MF index 6ceac24..54a1586 100644 --- a/com.vogella.tasks.model/META-INF/MANIFEST.MF +++ b/com.vogella.tasks.model/META-INF/MANIFEST.MF @@ -5,5 +5,5 @@ Bundle-SymbolicName: com.vogella.tasks.model Bundle-Version: 1.0.0.qualifier Bundle-Vendor: VOGELLA Automatic-Module-Name: com.vogella.tasks.model -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Export-Package: com.vogella.tasks.model diff --git a/com.vogella.tasks.services/.classpath b/com.vogella.tasks.services/.classpath index 81fe078..375961e 100644 --- a/com.vogella.tasks.services/.classpath +++ b/com.vogella.tasks.services/.classpath @@ -1,6 +1,6 @@ - + diff --git a/com.vogella.tasks.services/.settings/org.eclipse.jdt.core.prefs b/com.vogella.tasks.services/.settings/org.eclipse.jdt.core.prefs index d4540a5..3a79233 100644 --- a/com.vogella.tasks.services/.settings/org.eclipse.jdt.core.prefs +++ b/com.vogella.tasks.services/.settings/org.eclipse.jdt.core.prefs @@ -1,10 +1,10 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -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/com.vogella.tasks.services/META-INF/MANIFEST.MF b/com.vogella.tasks.services/META-INF/MANIFEST.MF index 31d8ebf..069f613 100644 --- a/com.vogella.tasks.services/META-INF/MANIFEST.MF +++ b/com.vogella.tasks.services/META-INF/MANIFEST.MF @@ -4,11 +4,11 @@ Bundle-Name: Services Bundle-SymbolicName: com.vogella.tasks.services Bundle-Version: 1.0.0.qualifier Bundle-Vendor: VOGELLA -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Automatic-Module-Name: com.vogella.tasks.services Import-Package: com.vogella.tasks.events, com.vogella.tasks.model, - javax.inject;version="1.0.0" + jakarta.inject;version="[2.0.0,3.0.0)" Require-Bundle: org.eclipse.core.runtime, org.eclipse.e4.core.services, org.eclipse.e4.core.contexts, diff --git a/com.vogella.tasks.services/src/com/vogella/tasks/services/internal/TransientTaskServiceImpl.java b/com.vogella.tasks.services/src/com/vogella/tasks/services/internal/TransientTaskServiceImpl.java index f0933c8..320a16c 100644 --- a/com.vogella.tasks.services/src/com/vogella/tasks/services/internal/TransientTaskServiceImpl.java +++ b/com.vogella.tasks.services/src/com/vogella/tasks/services/internal/TransientTaskServiceImpl.java @@ -9,7 +9,7 @@ import java.util.function.Consumer; import java.util.stream.Collectors; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.e4.core.services.events.IEventBroker; diff --git a/com.vogella.tasks.ui/.classpath b/com.vogella.tasks.ui/.classpath index 81fe078..375961e 100644 --- a/com.vogella.tasks.ui/.classpath +++ b/com.vogella.tasks.ui/.classpath @@ -1,6 +1,6 @@ - + diff --git a/com.vogella.tasks.ui/.settings/org.eclipse.jdt.core.prefs b/com.vogella.tasks.ui/.settings/org.eclipse.jdt.core.prefs index 62ef348..23fa13b 100644 --- a/com.vogella.tasks.ui/.settings/org.eclipse.jdt.core.prefs +++ b/com.vogella.tasks.ui/.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/com.vogella.tasks.ui/META-INF/MANIFEST.MF b/com.vogella.tasks.ui/META-INF/MANIFEST.MF index ba38168..b71c9af 100644 --- a/com.vogella.tasks.ui/META-INF/MANIFEST.MF +++ b/com.vogella.tasks.ui/META-INF/MANIFEST.MF @@ -21,11 +21,11 @@ Require-Bundle: org.eclipse.core.runtime, com.vogella.swt.widgets;bundle-version="1.0.0", org.eclipse.ui;bundle-version="3.118.0", org.eclipse.e4.core.contexts;bundle-version="1.12.100" -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Import-Package: com.vogella.tasks.events, com.vogella.tasks.model, - javax.annotation;version="1.2.0", - javax.inject;version="1.0.0" + jakarta.annotation;version="[2.1.0,3.0.0)", + jakarta.inject;version="[2.0.0,3.0.0)" Automatic-Module-Name: com.vogella.tasks.ui Bundle-ActivationPolicy: lazy Service-Component: OSGI-INF/com.vogella.tasks.ui.parts.MeinServerConnection.xml, diff --git a/com.vogella.tasks.ui/src/com/vogella/tasks/ui/addon/AddViewsToPerspectiveAddon.java b/com.vogella.tasks.ui/src/com/vogella/tasks/ui/addon/AddViewsToPerspectiveAddon.java index dc1d5f0..36d59d3 100644 --- a/com.vogella.tasks.ui/src/com/vogella/tasks/ui/addon/AddViewsToPerspectiveAddon.java +++ b/com.vogella.tasks.ui/src/com/vogella/tasks/ui/addon/AddViewsToPerspectiveAddon.java @@ -2,8 +2,8 @@ import java.util.List; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.eclipse.e4.core.di.annotations.Optional; import org.eclipse.e4.ui.di.UIEventTopic; diff --git a/com.vogella.tasks.ui/src/com/vogella/tasks/ui/addon/PerspectiveSwitchAddon.java b/com.vogella.tasks.ui/src/com/vogella/tasks/ui/addon/PerspectiveSwitchAddon.java index 488e48d..38c9ef1 100644 --- a/com.vogella.tasks.ui/src/com/vogella/tasks/ui/addon/PerspectiveSwitchAddon.java +++ b/com.vogella.tasks.ui/src/com/vogella/tasks/ui/addon/PerspectiveSwitchAddon.java @@ -1,6 +1,6 @@ package com.vogella.tasks.ui.addon; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.e4.core.di.annotations.Optional; import org.eclipse.e4.core.di.extensions.EventTopic; diff --git a/com.vogella.tasks.ui/src/com/vogella/tasks/ui/handlers/OpenEditorHandler.java b/com.vogella.tasks.ui/src/com/vogella/tasks/ui/handlers/OpenEditorHandler.java index bda4902..716d9fe 100644 --- a/com.vogella.tasks.ui/src/com/vogella/tasks/ui/handlers/OpenEditorHandler.java +++ b/com.vogella.tasks.ui/src/com/vogella/tasks/ui/handlers/OpenEditorHandler.java @@ -3,7 +3,7 @@ import java.util.Collection; import java.util.List; -import javax.inject.Named; +import jakarta.inject.Named; import org.eclipse.e4.core.di.annotations.CanExecute; import org.eclipse.e4.core.di.annotations.Execute; diff --git a/com.vogella.tasks.ui/src/com/vogella/tasks/ui/handlers/RemoveTodoHandler.java b/com.vogella.tasks.ui/src/com/vogella/tasks/ui/handlers/RemoveTodoHandler.java index 0a531ec..483de2c 100644 --- a/com.vogella.tasks.ui/src/com/vogella/tasks/ui/handlers/RemoveTodoHandler.java +++ b/com.vogella.tasks.ui/src/com/vogella/tasks/ui/handlers/RemoveTodoHandler.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.inject.Named; +import jakarta.inject.Named; import org.eclipse.e4.core.di.annotations.Execute; import org.eclipse.e4.core.di.annotations.Optional; diff --git a/com.vogella.tasks.ui/src/com/vogella/tasks/ui/parts/AutoCompleteFieldPart.java b/com.vogella.tasks.ui/src/com/vogella/tasks/ui/parts/AutoCompleteFieldPart.java index f154f4c..3052ee1 100644 --- a/com.vogella.tasks.ui/src/com/vogella/tasks/ui/parts/AutoCompleteFieldPart.java +++ b/com.vogella.tasks.ui/src/com/vogella/tasks/ui/parts/AutoCompleteFieldPart.java @@ -11,8 +11,8 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.eclipse.jface.fieldassist.AutoCompleteField; import org.eclipse.jface.fieldassist.ComboContentAdapter; diff --git a/com.vogella.tasks.ui/src/com/vogella/tasks/ui/parts/PlaygroundPart.java b/com.vogella.tasks.ui/src/com/vogella/tasks/ui/parts/PlaygroundPart.java index c538800..8f8e60c 100644 --- a/com.vogella.tasks.ui/src/com/vogella/tasks/ui/parts/PlaygroundPart.java +++ b/com.vogella.tasks.ui/src/com/vogella/tasks/ui/parts/PlaygroundPart.java @@ -1,6 +1,6 @@ package com.vogella.tasks.ui.parts; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import org.eclipse.core.databinding.DataBindingContext; import org.eclipse.jface.databinding.swt.ISWTObservableValue; diff --git a/com.vogella.tasks.ui/src/com/vogella/tasks/ui/parts/PlaygroundPart2.java b/com.vogella.tasks.ui/src/com/vogella/tasks/ui/parts/PlaygroundPart2.java index 8c30486..1acf681 100644 --- a/com.vogella.tasks.ui/src/com/vogella/tasks/ui/parts/PlaygroundPart2.java +++ b/com.vogella.tasks.ui/src/com/vogella/tasks/ui/parts/PlaygroundPart2.java @@ -1,6 +1,6 @@ package com.vogella.tasks.ui.parts; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import org.eclipse.e4.ui.di.Persist; import org.eclipse.e4.ui.model.application.ui.basic.MPart; diff --git a/com.vogella.tasks.ui/src/com/vogella/tasks/ui/parts/TaskEditorPart.java b/com.vogella.tasks.ui/src/com/vogella/tasks/ui/parts/TaskEditorPart.java index 0c14e7b..c736421 100644 --- a/com.vogella.tasks.ui/src/com/vogella/tasks/ui/parts/TaskEditorPart.java +++ b/com.vogella.tasks.ui/src/com/vogella/tasks/ui/parts/TaskEditorPart.java @@ -3,9 +3,9 @@ import java.util.HashMap; import java.util.Map; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.inject.Inject; import org.eclipse.core.databinding.Binding; import org.eclipse.core.databinding.DataBindingContext; diff --git a/com.vogella.tasks.ui/src/com/vogella/tasks/ui/parts/TodoDeletionPart.java b/com.vogella.tasks.ui/src/com/vogella/tasks/ui/parts/TodoDeletionPart.java index 3aedfe5..581f671 100644 --- a/com.vogella.tasks.ui/src/com/vogella/tasks/ui/parts/TodoDeletionPart.java +++ b/com.vogella.tasks.ui/src/com/vogella/tasks/ui/parts/TodoDeletionPart.java @@ -2,8 +2,8 @@ import java.util.List; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.eclipse.e4.ui.di.Focus; import org.eclipse.jface.viewers.ArrayContentProvider; diff --git a/com.vogella.tasks.ui/src/com/vogella/tasks/ui/parts/TodoDetailsPart.java b/com.vogella.tasks.ui/src/com/vogella/tasks/ui/parts/TodoDetailsPart.java index 8302685..2f207a8 100644 --- a/com.vogella.tasks.ui/src/com/vogella/tasks/ui/parts/TodoDetailsPart.java +++ b/com.vogella.tasks.ui/src/com/vogella/tasks/ui/parts/TodoDetailsPart.java @@ -4,10 +4,10 @@ import java.util.List; import java.util.Map; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.eclipse.core.databinding.Binding; import org.eclipse.core.databinding.DataBindingContext; diff --git a/com.vogella.tasks.ui/src/com/vogella/tasks/ui/parts/TodoOverviewPart.java b/com.vogella.tasks.ui/src/com/vogella/tasks/ui/parts/TodoOverviewPart.java index 757dd07..cd186b5 100644 --- a/com.vogella.tasks.ui/src/com/vogella/tasks/ui/parts/TodoOverviewPart.java +++ b/com.vogella.tasks.ui/src/com/vogella/tasks/ui/parts/TodoOverviewPart.java @@ -7,8 +7,8 @@ import java.util.List; import java.util.Map; -import javax.annotation.PostConstruct; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; import org.eclipse.core.databinding.beans.typed.BeanProperties; import org.eclipse.core.databinding.observable.list.WritableList; diff --git a/target-platform/target-platform.target b/target-platform/target-platform.target index 8b96ed4..99228f1 100644 --- a/target-platform/target-platform.target +++ b/target-platform/target-platform.target @@ -3,11 +3,15 @@ - + - + + + + + \ No newline at end of file From 3917322a122b717ffcd694d5d8b81745e186a72e Mon Sep 17 00:00:00 2001 From: Lars Vogel Date: Wed, 20 Nov 2024 13:52:14 +0100 Subject: [PATCH 6/7] Adding a first test for OSGi service implementation --- com.vogella.tasks.services.tests/.classpath | 11 +++++++ com.vogella.tasks.services.tests/.project | 28 +++++++++++++++++ .../org.eclipse.core.resources.prefs | 2 ++ .../.settings/org.eclipse.jdt.core.prefs | 9 ++++++ .../META-INF/MANIFEST.MF | 10 +++++++ .../build.properties | 4 +++ .../TransientTaskServiceImplMoreTests.java | 29 ++++++++++++++++++ .../tests/TransientTaskServiceImplTests.java | 30 +++++++++++++++++++ pom.xml | 25 +++++++++++++--- target-platform/target-platform.target | 1 + 10 files changed, 145 insertions(+), 4 deletions(-) create mode 100644 com.vogella.tasks.services.tests/.classpath create mode 100644 com.vogella.tasks.services.tests/.project create mode 100644 com.vogella.tasks.services.tests/.settings/org.eclipse.core.resources.prefs create mode 100644 com.vogella.tasks.services.tests/.settings/org.eclipse.jdt.core.prefs create mode 100644 com.vogella.tasks.services.tests/META-INF/MANIFEST.MF create mode 100644 com.vogella.tasks.services.tests/build.properties create mode 100644 com.vogella.tasks.services.tests/src/com/vogella/tasks/services/tests/TransientTaskServiceImplMoreTests.java create mode 100644 com.vogella.tasks.services.tests/src/com/vogella/tasks/services/tests/TransientTaskServiceImplTests.java diff --git a/com.vogella.tasks.services.tests/.classpath b/com.vogella.tasks.services.tests/.classpath new file mode 100644 index 0000000..1aa9eca --- /dev/null +++ b/com.vogella.tasks.services.tests/.classpath @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/com.vogella.tasks.services.tests/.project b/com.vogella.tasks.services.tests/.project new file mode 100644 index 0000000..f0f4c12 --- /dev/null +++ b/com.vogella.tasks.services.tests/.project @@ -0,0 +1,28 @@ + + + com.vogella.tasks.services.tests + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + diff --git a/com.vogella.tasks.services.tests/.settings/org.eclipse.core.resources.prefs b/com.vogella.tasks.services.tests/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..99f26c0 --- /dev/null +++ b/com.vogella.tasks.services.tests/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/com.vogella.tasks.services.tests/.settings/org.eclipse.jdt.core.prefs b/com.vogella.tasks.services.tests/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000..23fa13b --- /dev/null +++ b/com.vogella.tasks.services.tests/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,9 @@ +eclipse.preferences.version=1 +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=21 diff --git a/com.vogella.tasks.services.tests/META-INF/MANIFEST.MF b/com.vogella.tasks.services.tests/META-INF/MANIFEST.MF new file mode 100644 index 0000000..ec5301f --- /dev/null +++ b/com.vogella.tasks.services.tests/META-INF/MANIFEST.MF @@ -0,0 +1,10 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Tests for OSGi services +Bundle-SymbolicName: com.vogella.tasks.services.tests +Bundle-Version: 1.0.0.qualifier +Bundle-Vendor: VOGELLA +Fragment-Host: com.vogella.tasks.services;bundle-version="1.0.0" +Require-Bundle: junit-jupiter-api;bundle-version="5.11.0" +Automatic-Module-Name: com.vogella.tasks.services.tests +Bundle-RequiredExecutionEnvironment: JavaSE-21 diff --git a/com.vogella.tasks.services.tests/build.properties b/com.vogella.tasks.services.tests/build.properties new file mode 100644 index 0000000..34d2e4d --- /dev/null +++ b/com.vogella.tasks.services.tests/build.properties @@ -0,0 +1,4 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + . diff --git a/com.vogella.tasks.services.tests/src/com/vogella/tasks/services/tests/TransientTaskServiceImplMoreTests.java b/com.vogella.tasks.services.tests/src/com/vogella/tasks/services/tests/TransientTaskServiceImplMoreTests.java new file mode 100644 index 0000000..9f3b51f --- /dev/null +++ b/com.vogella.tasks.services.tests/src/com/vogella/tasks/services/tests/TransientTaskServiceImplMoreTests.java @@ -0,0 +1,29 @@ +package com.vogella.tasks.services.tests; + +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import com.vogella.tasks.services.internal.TransientTaskServiceImpl; + +class TransientTaskServiceImplMoreTests { + + @Test + @DisplayName("TransientTaskServiceImpl can be initialized") + void assertThatTaskServiceCanBeInitialized() { + TransientTaskServiceImpl service = new TransientTaskServiceImpl(); + assertNotNull(service); + assertTrue(service.getAll().size()>0); + } + + + @Test + @DisplayName("TransientTaskServiceImpl provides at least one task ") + void assertThatTaskServiceProvidesData() { + TransientTaskServiceImpl service = new TransientTaskServiceImpl(); + assertTrue(service.getAll().size()>0); + } + +} \ No newline at end of file diff --git a/com.vogella.tasks.services.tests/src/com/vogella/tasks/services/tests/TransientTaskServiceImplTests.java b/com.vogella.tasks.services.tests/src/com/vogella/tasks/services/tests/TransientTaskServiceImplTests.java new file mode 100644 index 0000000..8922575 --- /dev/null +++ b/com.vogella.tasks.services.tests/src/com/vogella/tasks/services/tests/TransientTaskServiceImplTests.java @@ -0,0 +1,30 @@ +package com.vogella.tasks.services.tests; + +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import com.vogella.tasks.services.internal.TransientTaskServiceImpl; + +class TransientTaskServiceImplTests { + + @Test + @DisplayName("TransientTaskServiceImpl can be initialized") + void assertThatTaskServiceCanBeInitialized() { + TransientTaskServiceImpl service = new TransientTaskServiceImpl(); + assertNotNull(service); + assertTrue(service.getAll().size()>0); + } + + + @Test + @DisplayName("TransientTaskServiceImpl provides at least one task ") + void assertThatTaskServiceProvidesData() { + TransientTaskServiceImpl service = new TransientTaskServiceImpl(); + assertTrue(service.getAll().size()>0); + } + +} \ No newline at end of file diff --git a/pom.xml b/pom.xml index c270cf9..4928e6c 100644 --- a/pom.xml +++ b/pom.xml @@ -43,6 +43,20 @@ + + org.apache.maven.plugins + maven-surefire-report-plugin + 3.0.0-M9 + + + + verify + + report + + + + org.eclipse.tycho target-platform-configuration @@ -77,7 +91,6 @@ com.vogella.ide.first com.vogella.ide.feature - com.vogella.ide.product com.vogella.tasks.model com.vogella.tasks.services com.vogella.tasks.ui @@ -91,10 +104,14 @@ com.vogella.adapters com.vogella.tasks.extendedsupplier com.vogella.preferences.page - com.vogella.ide.editor.gradle - target-platform + com.vogella.ide.editor.gradle + + + com.vogella.tasks.services.tests updatesite + + com.vogella.ide.product - + \ No newline at end of file diff --git a/target-platform/target-platform.target b/target-platform/target-platform.target index 99228f1..fe50995 100644 --- a/target-platform/target-platform.target +++ b/target-platform/target-platform.target @@ -7,6 +7,7 @@ + From fb23dffc57f4e82c13323501ffe30f893d82ed89 Mon Sep 17 00:00:00 2001 From: Lars Vogel Date: Wed, 20 Nov 2024 13:52:27 +0100 Subject: [PATCH 7/7] Remove unnecessary import --- .../tasks/services/tests/TransientTaskServiceImplTests.java | 1 - 1 file changed, 1 deletion(-) diff --git a/com.vogella.tasks.services.tests/src/com/vogella/tasks/services/tests/TransientTaskServiceImplTests.java b/com.vogella.tasks.services.tests/src/com/vogella/tasks/services/tests/TransientTaskServiceImplTests.java index 8922575..aee5d7f 100644 --- a/com.vogella.tasks.services.tests/src/com/vogella/tasks/services/tests/TransientTaskServiceImplTests.java +++ b/com.vogella.tasks.services.tests/src/com/vogella/tasks/services/tests/TransientTaskServiceImplTests.java @@ -1,6 +1,5 @@ package com.vogella.tasks.services.tests; -import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue;