Update for target 2023-12, jakarta.inject and tycho 4.0.5

opcoach · Feb 7, 2024 · aaf3339 · aaf3339
1 parent e039308
commit aaf3339
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 32 deletions.
diff --git a/build/com.opcoach.genmodeladdon.tp/com.opcoach.genmodeladdon.tp.target b/build/com.opcoach.genmodeladdon.tp/com.opcoach.genmodeladdon.tp.target
@@ -1,33 +1,36 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="GMA SimRel0623" sequenceNumber="1690820144">
+<target name="GMA SimRel1223" sequenceNumber="1707308438">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.31.0.v20230529-0659"/>
-      <unit id="org.eclipse.xtend.sdk.feature.group" version="2.31.0.v20230529-0659"/>
-      <unit id="org.eclipse.xtext.xbase.feature.group" version="2.31.0.v20230529-0659"/>
-      <repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.31.0/"/>
+      <unit id="org.eclipse.xtext.sdk.feature.group" version="2.33.0.v20231121-0955"/>
+      <unit id="org.eclipse.xtend.sdk.feature.group" version="2.33.0.v20231121-0955"/>
+      <unit id="org.eclipse.xtext.xbase.feature.group" version="2.33.0.v20231121-0955"/>
+      <repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.33.0/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.rcp.feature.group" version="4.28.0.v20230605-0440"/>
-      <unit id="org.eclipse.ant.core" version="3.7.0.v20230329-1001"/>
+      <unit id="org.eclipse.rcp.feature.group" version="4.30.0.v20231201-0512"/>
+      <unit id="org.eclipse.ant.core" version="3.7.200.v20231102-0934"/>
       <unit id="org.apache.commons.io" version="2.8.0.v20210415-0900"/>
-      <unit id="org.eclipse.pde.feature.group" version="3.15.0.v20230605-0440"/>
+      <unit id="org.eclipse.pde.feature.group" version="3.15.200.v20231201-0110"/>
       <unit id="org.eclipse.emf.ant" version="2.12.0.v20230211-1150"/>
-      <unit id="org.eclipse.emf.sdk.feature.group" version="2.34.0.v20230406-1334"/>
-      <unit id="org.eclipse.emf.codegen.ecore.feature.group" version="2.34.0.v20230406-1334"/>
-      <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.14.0.v20221117-1134"/>
+      <unit id="org.eclipse.emf.sdk.feature.group" version="2.36.0.v20231107-0612"/>
+      <unit id="org.eclipse.emf.codegen.ecore.feature.group" version="2.36.0.v20231002-1035"/>
+      <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.16.0.v20231117-0522"/>
       <unit id="org.eclipse.emf.importer.ecore" version="2.11.0.v20230211-1150"/>
       <unit id="org.eclipse.emf.importer" version="2.13.0.v20230211-1150"/>
-      <unit id="org.eclipse.ant.launching" version="1.4.0.v20230329-1001"/>
-      <unit id="org.eclipse.core.runtime" version="3.27.0.v20230515-1719"/>
-      <unit id="org.junit" version="4.13.2.v20211018-1956"/>
-      <unit id="org.eclipse.jdt.junit.runtime" version="3.7.100.v20230115-0919"/>
-      <unit id="org.eclipse.sdk.feature.group" version="4.28.0.v20230605-0440"/>
-      <unit id="com.google.guava" version="31.1.0.jre"/>
-      <unit id="javax.annotation" version="1.3.5.v20230504-0748"/>
-      <repository location="https://download.eclipse.org/releases/2023-06"/>
+      <unit id="org.eclipse.ant.launching" version="1.4.200.v20231106-1112"/>
+      <unit id="org.eclipse.core.runtime" version="3.30.0.v20231102-0719"/>
+      <unit id="org.junit" version="4.13.2.v20230809-1000"/>
+      <unit id="org.eclipse.jdt.junit.runtime" version="3.7.300.v20231106-1537"/>
+      <unit id="org.eclipse.sdk.feature.group" version="4.30.0.v20231201-0512"/>
+      <unit id="com.google.guava" version="32.1.3.jre"/>
+      <unit id="jakarta.annotation-api" version="2.1.1"/>
+      <unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
+      <unit id="org.apache.log4j" version="1.2.24.v20221221-2012"/>
+      <unit id="org.apache.commons.commons-io" version="2.15.0"/>
+      <repository location="https://download.eclipse.org/releases/2023-12"/>
     </location>
   </locations>
 </target>
diff --git a/build/com.opcoach.genmodeladdon.tp/com.opcoach.genmodeladdon.tp.tpd b/build/com.opcoach.genmodeladdon.tp/com.opcoach.genmodeladdon.tp.tpd
@@ -31,7 +31,10 @@ location "https://download.eclipse.org/releases/2023-12" {
 	org.eclipse.sdk.feature.group
 
 	com.google.guava
-	javax.annotation
+	jakarta.annotation-api
+	jakarta.inject.jakarta.inject-api
+	org.apache.log4j
+	org.apache.commons.commons-io
 
 }
 

diff --git a/com.opcoach.genmodeladdon.ui/META-INF/MANIFEST.MF b/com.opcoach.genmodeladdon.ui/META-INF/MANIFEST.MF
@@ -10,10 +10,10 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.e4.ui.services;bundle-version="1.1.0",
  org.eclipse.jface;bundle-version="3.10.2",
  org.eclipse.e4.core.di;bundle-version="1.4.0",
- org.apache.log4j,
- org.eclipse.swt
+ org.eclipse.swt,
+ org.apache.log4j;bundle-version="1.2.24"
 Bundle-RequiredExecutionEnvironment: JavaSE-11
-Import-Package: javax.annotation;version="1.2.0",
- javax.inject;version="1.0.0",
+Import-Package: jakarta.annotation;version="2.1.1",
+ jakarta.inject;version="2.0.1",
  org.eclipse.ui.handlers
 Automatic-Module-Name: com.opcoach.genmodeladdon.ui
diff --git a/...coach.genmodeladdon.ui/src/com/opcoach/genmodeladdon/handlers/GenerateAntFileHandler.java b/...coach.genmodeladdon.ui/src/com/opcoach/genmodeladdon/handlers/GenerateAntFileHandler.java
@@ -3,8 +3,6 @@
 import java.io.File;
 import java.io.IOException;
 
-import javax.inject.Named;
-
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.e4.core.di.annotations.Execute;
@@ -16,6 +14,8 @@
 import com.opcoach.genmodeladdon.core.GenerateCommon;
 import com.opcoach.genmodeladdon.core.genmodel.GMAGenModel;
 
+import jakarta.inject.Named;
+
 public class GenerateAntFileHandler extends GenerateParentHandler
 {
 

diff --git a/...pcoach.genmodeladdon.ui/src/com/opcoach/genmodeladdon/handlers/GenerateParentHandler.java b/...pcoach.genmodeladdon.ui/src/com/opcoach/genmodeladdon/handlers/GenerateParentHandler.java
@@ -1,8 +1,6 @@
 
 package com.opcoach.genmodeladdon.handlers;
 
-import javax.inject.Named;
-
 import org.eclipse.e4.core.di.annotations.CanExecute;
 import org.eclipse.e4.core.di.annotations.Execute;
 import org.eclipse.e4.ui.services.IServiceConstants;
@@ -12,6 +10,8 @@
 import com.opcoach.genmodeladdon.core.GenerateCommon;
 import com.opcoach.genmodeladdon.core.genmodel.GMAGenModel;
 
+import jakarta.inject.Named;
+
 public abstract class GenerateParentHandler {
 
 	/** With compatibility layer, must manage also IStructuredSelection ! */

diff --git a/...oach.genmodeladdon.ui/src/com/opcoach/genmodeladdon/handlers/GenerateStructureTester.java b/...oach.genmodeladdon.ui/src/com/opcoach/genmodeladdon/handlers/GenerateStructureTester.java
@@ -1,15 +1,15 @@
 
 package com.opcoach.genmodeladdon.handlers;
 
-import javax.inject.Named;
-
 import org.eclipse.e4.core.di.annotations.Evaluate;
 import org.eclipse.e4.ui.services.IServiceConstants;
 import org.eclipse.emf.codegen.ecore.genmodel.GenModel;
 import org.eclipse.jface.viewers.IStructuredSelection;
 
 import com.opcoach.genmodeladdon.core.GMAHelper;
 
+import jakarta.inject.Named;
+
 public class GenerateStructureTester
 {
 	@Evaluate

diff --git a/...genmodeladdon.ui/src/com/opcoach/genmodeladdon/handlers/GeneratedDerivedSourceFolder.java b/...genmodeladdon.ui/src/com/opcoach/genmodeladdon/handlers/GeneratedDerivedSourceFolder.java
@@ -6,8 +6,6 @@
 import java.lang.reflect.InvocationTargetException;
 import java.util.Map;
 
-import javax.inject.Named;
-
 import org.eclipse.core.runtime.ILog;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.Platform;
@@ -27,6 +25,8 @@
 import com.opcoach.genmodeladdon.ui.dialog.ConfirmFileSelectionDialog;
 import com.opcoach.genmodeladdon.ui.dialog.DerivedSourceParametersDialog;
 
+import jakarta.inject.Named;
+
 public class GeneratedDerivedSourceFolder extends GenerateParentHandler
 {