Update example code to jakarta namespace and Tycho 4.0.8

vogellacompany · Jun 6, 2024 · b86af1e · b86af1e
1 parent 6e7ac7b
commit b86af1e
Show file tree

Hide file tree

Showing 31 changed files with 389 additions and 352 deletions.
diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
@@ -1 +1,19 @@
-distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.3.9/apache-maven-3.3.9-bin.zip
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+wrapperVersion=3.3.2
+distributionType=only-script
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip
diff --git a/com.example.e4.product/com.example.e4.product b/com.example.e4.product/com.example.e4.product
@@ -19,7 +19,7 @@
       <plugin id="com.example.e4.rcp"/>
       <plugin id="com.sun.jna"/>
       <plugin id="com.sun.jna.platform"/>
-      <plugin id="javax.annotation"/>
+      <plugin id="jakarta.annotation"/>
       <plugin id="javax.inject"/>
       <plugin id="org.apache.batik.constants"/>
       <plugin id="org.apache.batik.css"/>

diff --git a/com.example.e4.rcp/META-INF/MANIFEST.MF b/com.example.e4.rcp/META-INF/MANIFEST.MF
@@ -14,6 +14,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="0.0.0",
  org.eclipse.e4.ui.di;bundle-version="0.0.0",
  org.eclipse.e4.core.contexts;bundle-version="0.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-17
-Import-Package: javax.annotation;version="0.0.0",
- javax.inject
+Import-Package: jakarta.annotation;version="0.0.0",
+ jakarta.inject
 Automatic-Module-Name: com.example.e4.rcp
diff --git a/com.example.e4.rcp/src/com/example/e4/rcp/parts/SamplePart.java b/com.example.e4.rcp/src/com/example/e4/rcp/parts/SamplePart.java
@@ -3,8 +3,8 @@
 import java.util.Arrays;
 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.e4.ui.di.Persist;

diff --git a/com.vogella.contribute.parts/META-INF/MANIFEST.MF b/com.vogella.contribute.parts/META-INF/MANIFEST.MF
@@ -13,5 +13,5 @@ Require-Bundle: org.eclipse.core.runtime,
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Automatic-Module-Name: com.vogella.contribute.parts
 Model-Fragment: parts.e4xmi
-Import-Package: javax.annotation
+Import-Package: jakarta.annotation
 Bundle-ActivationPolicy: lazy
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
@@ -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.nattable/META-INF/MANIFEST.MF b/com.vogella.nattable/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: Nattable
 Bundle-SymbolicName: com.vogella.nattable;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: VOGELLA
-Require-Bundle: javax.inject;bundle-version="0.0.0",
+Require-Bundle: jakarta.inject;bundle-version="0.0.0",
  org.eclipse.core.runtime;bundle-version="0.0.0",
  org.eclipse.swt;bundle-version="0.0.0",
  org.eclipse.e4.ui.model.workbench;bundle-version="0.0.0",
@@ -20,5 +20,5 @@ Require-Bundle: javax.inject;bundle-version="0.0.0",
  org.eclipse.nebula.widgets.nattable.extension.e4;bundle-version="1.2.0",
  com.vogella.tasks.model;bundle-version="1.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-14
-Import-Package: javax.annotation;version="1.3.5"
+Import-Package: jakarta.annotation;version="1.3.5"
 Automatic-Module-Name: com.vogella.nattable
diff --git a/com.vogella.nattable/com.vogella.nattable.product b/com.vogella.nattable/com.vogella.nattable.product
@@ -26,7 +26,7 @@
       <plugin id="com.vogella.tasks.events"/>
       <plugin id="com.vogella.tasks.model"/>
       <plugin id="com.vogella.tasks.services"/>
-      <plugin id="javax.annotation"/>
+      <plugin id="jakarta.annotation"/>
       <plugin id="javax.inject"/>
       <plugin id="org.apache.batik.constants"/>
       <plugin id="org.apache.batik.css"/>

diff --git a/com.vogella.nattable/src/com/vogella/nattable/parts/NatTableAdvancedExample.java b/com.vogella.nattable/src/com/vogella/nattable/parts/NatTableAdvancedExample.java
@@ -3,7 +3,7 @@
 
 import java.util.List;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 import org.eclipse.nebula.widgets.nattable.NatTable;
 import org.eclipse.nebula.widgets.nattable.config.DefaultNatTableStyleConfiguration;

diff --git a/com.vogella.nattable/src/com/vogella/nattable/parts/NatTableEditorExample.java b/com.vogella.nattable/src/com/vogella/nattable/parts/NatTableEditorExample.java
@@ -3,7 +3,7 @@
 
 import java.util.List;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 import org.eclipse.nebula.widgets.nattable.NatTable;
 import org.eclipse.nebula.widgets.nattable.config.AbstractRegistryConfiguration;

diff --git a/com.vogella.nattable/src/com/vogella/nattable/parts/NattableExample.java b/com.vogella.nattable/src/com/vogella/nattable/parts/NattableExample.java
@@ -4,7 +4,7 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 import org.eclipse.jface.layout.GridDataFactory;
 import org.eclipse.nebula.widgets.nattable.NatTable;

diff --git a/com.vogella.nattable/src/com/vogella/nattable/parts/SamplePart.java b/com.vogella.nattable/src/com/vogella/nattable/parts/SamplePart.java
@@ -2,8 +2,8 @@
 
 import java.util.Arrays;
 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.e4.ui.di.Persist;

diff --git a/com.vogella.tasks.services/META-INF/MANIFEST.MF b/com.vogella.tasks.services/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-Vendor: VOGELLA
 Automatic-Module-Name: com.vogella.tasks.services
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Import-Package: com.vogella.tasks.model,
- javax.inject;version="1.0.0",
+ jakarta.inject;version="[2.0.0,3.0.0)",
  org.osgi.service.component.annotations;resolution:=optional
 Bundle-ActivationPolicy: lazy
 Provide-Capability: osgi.service; objectClass=com.vogella.tasks.model.TaskService

diff --git a/...ella.tasks.services/src/com/vogella/tasks/services/internal/TransientTaskServiceImpl.java b/...ella.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/...lla.tasks.services/src/com/vogella/tasks/services/internal/TransientTaskServiceImpl2.java b/...lla.tasks.services/src/com/vogella/tasks/services/internal/TransientTaskServiceImpl2.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;
 import org.osgi.service.component.annotations.Component;

diff --git a/com.vogella.tasks.ui/META-INF/MANIFEST.MF b/com.vogella.tasks.ui/META-INF/MANIFEST.MF
@@ -25,6 +25,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.18.0",
  org.eclipse.jface
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Automatic-Module-Name: com.vogella.tasks.ui
-Import-Package: javax.annotation;version="1.3.5",
- javax.inject;version="1.0.0"
+Import-Package: jakarta.annotation,
+ jakarta.inject
 Require-Capability: osgi.service;filter:="(objectClass=com.vogella.tasks.model.TaskService)"
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
@@ -2,7 +2,7 @@
 
 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/RemoveTaskHandler.java b/com.vogella.tasks.ui/src/com/vogella/tasks/ui/handlers/RemoveTaskHandler.java
@@ -3,7 +3,7 @@
 
 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/SwitchPerspectiveHandler.java b/com.vogella.tasks.ui/src/com/vogella/tasks/ui/handlers/SwitchPerspectiveHandler.java
@@ -1,7 +1,7 @@
 
 package com.vogella.tasks.ui.handlers;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 import org.eclipse.e4.core.di.annotations.Execute;
 import org.eclipse.e4.ui.workbench.modeling.EPartService;

diff --git a/com.vogella.tasks.ui/src/com/vogella/tasks/ui/handlers/TasksCopyHandler.java b/com.vogella.tasks.ui/src/com/vogella/tasks/ui/handlers/TasksCopyHandler.java
@@ -3,7 +3,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-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/parts/AutoCompleteFieldPart.java b/com.vogella.tasks.ui/src/com/vogella/tasks/ui/parts/AutoCompleteFieldPart.java
@@ -12,7 +12,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 import org.eclipse.jface.bindings.keys.KeyStroke;
 import org.eclipse.jface.fieldassist.ContentProposalAdapter;

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
@@ -1,7 +1,7 @@
 package com.vogella.tasks.ui.parts;
 
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
+import jakarta.annotation.PostConstruct;
+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/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
@@ -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.core.databinding.beans.typed.BeanProperties;
 import org.eclipse.core.databinding.observable.list.WritableList;

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
@@ -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
@@ -4,8 +4,8 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
 import javax.swing.event.ListSelectionEvent;
 
 import org.eclipse.core.databinding.beans.typed.BeanProperties;

diff --git a/com.vogella.tasks.ui/src/com/vogella/tasks/ui/toolcontrols/SearchToolControl.java b/com.vogella.tasks.ui/src/com/vogella/tasks/ui/toolcontrols/SearchToolControl.java
@@ -1,6 +1,6 @@
 package com.vogella.tasks.ui.toolcontrols;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;