From abfe42186923adf7390e55f24a85900343179f22 Mon Sep 17 00:00:00 2001
From: dbulahov <bulahovdenis@gmail.com>
Date: Thu, 8 Oct 2026 15:59:19 +0300
Subject: [PATCH] codegen plugin uses only the fennec jar Signed-off-by:
 dbulahov <bulahovdenis@gmail.com>

---
 .../ecore.annotated/pom.xml                   |  4 +-
 .../ecore.annotated/test.bndrun               |  4 +-
 .../pom.xml                                   |  2 +-
 .../ecore.dependencies.subpackages/pom.xml    |  2 +-
 .../ecore.dependencies/pom.xml                |  4 +-
 .../ecore.dependencies/test.bndrun            |  2 +-
 .../ecore.enum.consumer/pom.xml               |  2 +-
 .../ecore.enum.provider/pom.xml               |  2 +-
 .../ecore.loadpackage/pom.xml                 |  4 +-
 .../ecore.loadpackage/test.bndrun             |  6 +--
 .../ecore.noosgi/pom.xml                      |  2 +-
 .../ecore.simple.subpackages/pom.xml          |  2 +-
 .../ecore.simple/pom.xml                      |  2 +-
 .../ecore.simple/test.bndrun                  |  2 +-
 .../genmodel.dependencies/pom.xml             |  4 +-
 .../genmodel.dependencies/test.bndrun         |  2 +-
 .../genmodel.simple/pom.xml                   |  4 +-
 .../genmodel.simple/test.bndrun               |  2 +-
 emf/codegen.maven.example/pom.xml             |  2 +-
 emf/codegen.maven/pom.xml                     | 47 ++++++-------------
 20 files changed, 41 insertions(+), 60 deletions(-)

diff --git a/emf/codegen.maven.example/ecore.annotated/pom.xml b/emf/codegen.maven.example/ecore.annotated/pom.xml
index e0a6000..de90ccf 100644
--- a/emf/codegen.maven.example/ecore.annotated/pom.xml
+++ b/emf/codegen.maven.example/ecore.annotated/pom.xml
@@ -43,13 +43,13 @@
     <dependency>
       <groupId>org.eclipse.fennec.emf</groupId>
       <artifactId>org.eclipse.fennec.emf.osgi.api</artifactId>
-      <version>0.1.1</version>
+      <version>1.0.2</version>
     </dependency>
     <!-- Fennec EMF OSGi implementation (for OSGi runtime tests) -->
     <dependency>
       <groupId>org.eclipse.fennec.emf</groupId>
       <artifactId>org.eclipse.fennec.emf.osgi.component</artifactId>
-      <version>0.1.1</version>
+      <version>1.0.2</version>
       <scope>runtime</scope>
     </dependency>
 
diff --git a/emf/codegen.maven.example/ecore.annotated/test.bndrun b/emf/codegen.maven.example/ecore.annotated/test.bndrun
index b5006e7..498201a 100644
--- a/emf/codegen.maven.example/ecore.annotated/test.bndrun
+++ b/emf/codegen.maven.example/ecore.annotated/test.bndrun
@@ -35,7 +35,7 @@
 	bnd.identity;id='${project.artifactId}'
 
 -runbundles+: \
-    org.eclipse.fennec.emf.osgi.component;startlevel=10
+	org.eclipse.fennec.emf.osgi.component;startlevel=10
 
 # -runbundles is calculated by the bnd-resolver-maven-plugin
 -runbundles: \
@@ -54,7 +54,7 @@
 	org.eclipse.emf.common;version='[2.44.0,2.44.1)',\
 	org.eclipse.emf.ecore;version='[2.41.0,2.41.1)',\
 	org.eclipse.emf.ecore.xmi;version='[2.39.0,2.39.1)',\
-	org.eclipse.fennec.emf.osgi.component;version='[0.1.1,0.1.2)';startlevel=10,\
+	org.eclipse.fennec.emf.osgi.component;version='[1.0.2,1.0.3)';startlevel=10,\
 	org.opentest4j;version='[1.3.0,1.3.1)',\
 	org.osgi.service.component;version='[1.5.1,1.5.2)',\
 	org.osgi.test.common;version='[1.3.0,1.3.1)',\
diff --git a/emf/codegen.maven.example/ecore.dependencies.subpackages.consumer.subpackages/pom.xml b/emf/codegen.maven.example/ecore.dependencies.subpackages.consumer.subpackages/pom.xml
index e279cc6..b83da0a 100644
--- a/emf/codegen.maven.example/ecore.dependencies.subpackages.consumer.subpackages/pom.xml
+++ b/emf/codegen.maven.example/ecore.dependencies.subpackages.consumer.subpackages/pom.xml
@@ -52,7 +52,7 @@
     <dependency>
       <groupId>org.eclipse.fennec.emf</groupId>
       <artifactId>org.eclipse.fennec.emf.osgi.api</artifactId>
-      <version>0.1.1</version>
+      <version>1.0.2</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.fennec.emf</groupId>
diff --git a/emf/codegen.maven.example/ecore.dependencies.subpackages/pom.xml b/emf/codegen.maven.example/ecore.dependencies.subpackages/pom.xml
index e342726..1a22264 100644
--- a/emf/codegen.maven.example/ecore.dependencies.subpackages/pom.xml
+++ b/emf/codegen.maven.example/ecore.dependencies.subpackages/pom.xml
@@ -54,7 +54,7 @@
     <dependency>
       <groupId>org.eclipse.fennec.emf</groupId>
       <artifactId>org.eclipse.fennec.emf.osgi.api</artifactId>
-      <version>0.1.1</version>
+      <version>1.0.2</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.fennec.emf</groupId>
diff --git a/emf/codegen.maven.example/ecore.dependencies/pom.xml b/emf/codegen.maven.example/ecore.dependencies/pom.xml
index d3f4586..85447dd 100644
--- a/emf/codegen.maven.example/ecore.dependencies/pom.xml
+++ b/emf/codegen.maven.example/ecore.dependencies/pom.xml
@@ -52,13 +52,13 @@
     <dependency>
       <groupId>org.eclipse.fennec.emf</groupId>
       <artifactId>org.eclipse.fennec.emf.osgi.api</artifactId>
-      <version>0.1.1</version>
+      <version>1.0.2</version>
     </dependency>
     <!-- Fennec EMF OSGi implementation (for OSGi runtime tests) -->
     <dependency>
       <groupId>org.eclipse.fennec.emf</groupId>
       <artifactId>org.eclipse.fennec.emf.osgi.component</artifactId>
-      <version>0.1.1</version>
+      <version>1.0.2</version>
       <scope>runtime</scope>
     </dependency>
   </dependencies>
diff --git a/emf/codegen.maven.example/ecore.dependencies/test.bndrun b/emf/codegen.maven.example/ecore.dependencies/test.bndrun
index 570f757..5549d19 100644
--- a/emf/codegen.maven.example/ecore.dependencies/test.bndrun
+++ b/emf/codegen.maven.example/ecore.dependencies/test.bndrun
@@ -55,7 +55,7 @@
 	org.eclipse.emf.common;version='[2.44.0,2.44.1)',\
 	org.eclipse.emf.ecore;version='[2.41.0,2.41.1)',\
 	org.eclipse.emf.ecore.xmi;version='[2.39.0,2.39.1)',\
-	org.eclipse.fennec.emf.osgi.component;version='[0.1.1,0.1.2)';startlevel=10,\
+	org.eclipse.fennec.emf.osgi.component;version='[1.0.2,1.0.3)';startlevel=10,\
 	org.opentest4j;version='[1.3.0,1.3.1)',\
 	org.osgi.service.component;version='[1.5.1,1.5.2)',\
 	org.osgi.test.common;version='[1.3.0,1.3.1)',\
diff --git a/emf/codegen.maven.example/ecore.enum.consumer/pom.xml b/emf/codegen.maven.example/ecore.enum.consumer/pom.xml
index 3d06c20..5f55671 100644
--- a/emf/codegen.maven.example/ecore.enum.consumer/pom.xml
+++ b/emf/codegen.maven.example/ecore.enum.consumer/pom.xml
@@ -51,7 +51,7 @@
     <dependency>
       <groupId>org.eclipse.fennec.emf</groupId>
       <artifactId>org.eclipse.fennec.emf.osgi.api</artifactId>
-      <version>0.1.1</version>
+      <version>1.0.2</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.fennec.emf</groupId>
diff --git a/emf/codegen.maven.example/ecore.enum.provider/pom.xml b/emf/codegen.maven.example/ecore.enum.provider/pom.xml
index 15c7b54..337489f 100644
--- a/emf/codegen.maven.example/ecore.enum.provider/pom.xml
+++ b/emf/codegen.maven.example/ecore.enum.provider/pom.xml
@@ -44,7 +44,7 @@
     <dependency>
       <groupId>org.eclipse.fennec.emf</groupId>
       <artifactId>org.eclipse.fennec.emf.osgi.api</artifactId>
-      <version>0.1.1</version>
+      <version>1.0.2</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.fennec.emf</groupId>
diff --git a/emf/codegen.maven.example/ecore.loadpackage/pom.xml b/emf/codegen.maven.example/ecore.loadpackage/pom.xml
index b612f80..feffcec 100644
--- a/emf/codegen.maven.example/ecore.loadpackage/pom.xml
+++ b/emf/codegen.maven.example/ecore.loadpackage/pom.xml
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>org.eclipse.fennec.emf</groupId>
       <artifactId>org.eclipse.fennec.emf.osgi.api</artifactId>
-      <version>0.1.1</version>
+      <version>1.0.2</version>
     </dependency>
     <!-- Fennec EMF OSGi implementation (for OSGi runtime tests) -->
     <dependency>
       <groupId>org.eclipse.fennec.emf</groupId>
       <artifactId>org.eclipse.fennec.emf.osgi.component</artifactId>
-      <version>0.1.1</version>
+      <version>1.0.2</version>
       <scope>runtime</scope>
     </dependency>
 
diff --git a/emf/codegen.maven.example/ecore.loadpackage/test.bndrun b/emf/codegen.maven.example/ecore.loadpackage/test.bndrun
index c437f86..88010d8 100644
--- a/emf/codegen.maven.example/ecore.loadpackage/test.bndrun
+++ b/emf/codegen.maven.example/ecore.loadpackage/test.bndrun
@@ -35,7 +35,7 @@
 	bnd.identity;id='${project.artifactId}'
 
 -runbundles+: \
-    org.eclipse.fennec.emf.osgi.component;startlevel=10
+	org.eclipse.fennec.emf.osgi.component;startlevel=10
 
 # -runbundles is calculated by the bnd-resolver-maven-plugin
 -runbundles: \
@@ -51,9 +51,9 @@
 	org.eclipse.emf.common;version='[2.44.0,2.44.1)',\
 	org.eclipse.emf.ecore;version='[2.41.0,2.41.1)',\
 	org.eclipse.emf.ecore.xmi;version='[2.39.0,2.39.1)',\
-	org.eclipse.fennec.emf.osgi.component;version='[0.1.1,0.1.2)';startlevel=10,\
+	org.eclipse.fennec.emf.osgi.component;version='[1.0.2,1.0.3)';startlevel=10,\
 	org.opentest4j;version='[1.3.0,1.3.1)',\
 	org.osgi.service.component;version='[1.5.1,1.5.2)',\
 	org.osgi.util.converter;version='[1.0.9,1.0.10)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
-	org.osgi.util.promise;version='[1.3.0,1.3.1)'
+	org.osgi.util.promise;version='[1.3.0,1.3.1)'
\ No newline at end of file
diff --git a/emf/codegen.maven.example/ecore.noosgi/pom.xml b/emf/codegen.maven.example/ecore.noosgi/pom.xml
index 510c447..5581e0b 100644
--- a/emf/codegen.maven.example/ecore.noosgi/pom.xml
+++ b/emf/codegen.maven.example/ecore.noosgi/pom.xml
@@ -49,7 +49,7 @@
     <dependency>
       <groupId>org.eclipse.fennec.emf</groupId>
       <artifactId>org.eclipse.fennec.emf.osgi.api</artifactId>
-      <version>0.1.1</version>
+      <version>1.0.2</version>
     </dependency>
   </dependencies>
 
diff --git a/emf/codegen.maven.example/ecore.simple.subpackages/pom.xml b/emf/codegen.maven.example/ecore.simple.subpackages/pom.xml
index 89781f6..a309299 100644
--- a/emf/codegen.maven.example/ecore.simple.subpackages/pom.xml
+++ b/emf/codegen.maven.example/ecore.simple.subpackages/pom.xml
@@ -45,7 +45,7 @@
     <dependency>
       <groupId>org.eclipse.fennec.emf</groupId>
       <artifactId>org.eclipse.fennec.emf.osgi.api</artifactId>
-      <version>0.1.1</version>
+      <version>1.0.2</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.fennec.emf</groupId>
diff --git a/emf/codegen.maven.example/ecore.simple/pom.xml b/emf/codegen.maven.example/ecore.simple/pom.xml
index 2f92bc2..0de5b06 100644
--- a/emf/codegen.maven.example/ecore.simple/pom.xml
+++ b/emf/codegen.maven.example/ecore.simple/pom.xml
@@ -41,7 +41,7 @@
     <dependency>
       <groupId>org.eclipse.fennec.emf</groupId>
       <artifactId>org.eclipse.fennec.emf.osgi.api</artifactId>
-      <version>0.1.1</version>
+      <version>1.0.2</version>
     </dependency>
     <!-- Fennec EMF OSGi implementation (for OSGi runtime tests) -->
     <dependency>
diff --git a/emf/codegen.maven.example/ecore.simple/test.bndrun b/emf/codegen.maven.example/ecore.simple/test.bndrun
index aad7107..5561aa8 100644
--- a/emf/codegen.maven.example/ecore.simple/test.bndrun
+++ b/emf/codegen.maven.example/ecore.simple/test.bndrun
@@ -57,7 +57,7 @@
 	org.eclipse.emf.common;version='[2.44.0,2.44.1)',\
 	org.eclipse.emf.ecore;version='[2.41.0,2.41.1)',\
 	org.eclipse.emf.ecore.xmi;version='[2.39.0,2.39.1)',\
-	org.eclipse.fennec.emf.osgi.component;version='[0.1.1,0.1.2)';startlevel=10,\
+	org.eclipse.fennec.emf.osgi.component;version='[1.0.2,1.0.3)';startlevel=10,\
 	org.opentest4j;version='[1.3.0,1.3.1)',\
 	org.osgi.service.component;version='[1.5.1,1.5.2)',\
 	org.osgi.test.common;version='[1.3.0,1.3.1)',\
diff --git a/emf/codegen.maven.example/genmodel.dependencies/pom.xml b/emf/codegen.maven.example/genmodel.dependencies/pom.xml
index d0205f4..4a20856 100644
--- a/emf/codegen.maven.example/genmodel.dependencies/pom.xml
+++ b/emf/codegen.maven.example/genmodel.dependencies/pom.xml
@@ -51,13 +51,13 @@
     <dependency>
       <groupId>org.eclipse.fennec.emf</groupId>
       <artifactId>org.eclipse.fennec.emf.osgi.api</artifactId>
-      <version>0.1.1</version>
+      <version>1.0.2</version>
     </dependency>
     <!-- Fennec EMF OSGi implementation (for OSGi runtime tests) -->
     <dependency>
       <groupId>org.eclipse.fennec.emf</groupId>
       <artifactId>org.eclipse.fennec.emf.osgi.component</artifactId>
-      <version>0.1.1</version>
+      <version>1.0.2</version>
       <scope>runtime</scope>
     </dependency>
 
diff --git a/emf/codegen.maven.example/genmodel.dependencies/test.bndrun b/emf/codegen.maven.example/genmodel.dependencies/test.bndrun
index a940dba..1a48306 100644
--- a/emf/codegen.maven.example/genmodel.dependencies/test.bndrun
+++ b/emf/codegen.maven.example/genmodel.dependencies/test.bndrun
@@ -55,7 +55,7 @@
 	org.eclipse.emf.common;version='[2.44.0,2.44.1)',\
 	org.eclipse.emf.ecore;version='[2.41.0,2.41.1)',\
 	org.eclipse.emf.ecore.xmi;version='[2.39.0,2.39.1)',\
-	org.eclipse.fennec.emf.osgi.component;version='[0.1.1,0.1.2)';startlevel=10,\
+	org.eclipse.fennec.emf.osgi.component;version='[1.0.2,1.0.3)';startlevel=10,\
 	org.opentest4j;version='[1.3.0,1.3.1)',\
 	org.osgi.service.component;version='[1.5.1,1.5.2)',\
 	org.osgi.test.common;version='[1.3.0,1.3.1)',\
diff --git a/emf/codegen.maven.example/genmodel.simple/pom.xml b/emf/codegen.maven.example/genmodel.simple/pom.xml
index 1e07d90..63a5b02 100644
--- a/emf/codegen.maven.example/genmodel.simple/pom.xml
+++ b/emf/codegen.maven.example/genmodel.simple/pom.xml
@@ -44,13 +44,13 @@
     <dependency>
       <groupId>org.eclipse.fennec.emf</groupId>
       <artifactId>org.eclipse.fennec.emf.osgi.api</artifactId>
-      <version>0.1.1</version>
+      <version>1.0.2</version>
     </dependency>
     <!-- Fennec EMF OSGi implementation (for OSGi runtime tests) -->
     <dependency>
       <groupId>org.eclipse.fennec.emf</groupId>
       <artifactId>org.eclipse.fennec.emf.osgi.component</artifactId>
-      <version>0.1.1</version>
+      <version>1.0.2</version>
       <scope>runtime</scope>
     </dependency>
 
diff --git a/emf/codegen.maven.example/genmodel.simple/test.bndrun b/emf/codegen.maven.example/genmodel.simple/test.bndrun
index 6623bfa..88c14b7 100644
--- a/emf/codegen.maven.example/genmodel.simple/test.bndrun
+++ b/emf/codegen.maven.example/genmodel.simple/test.bndrun
@@ -54,7 +54,7 @@
 	org.eclipse.emf.common;version='[2.44.0,2.44.1)',\
 	org.eclipse.emf.ecore;version='[2.41.0,2.41.1)',\
 	org.eclipse.emf.ecore.xmi;version='[2.39.0,2.39.1)',\
-	org.eclipse.fennec.emf.osgi.component;version='[0.1.1,0.1.2)';startlevel=10,\
+	org.eclipse.fennec.emf.osgi.component;version='[1.0.2,1.0.3)';startlevel=10,\
 	org.opentest4j;version='[1.3.0,1.3.1)',\
 	org.osgi.service.component;version='[1.5.1,1.5.2)',\
 	org.osgi.test.common;version='[1.3.0,1.3.1)',\
diff --git a/emf/codegen.maven.example/pom.xml b/emf/codegen.maven.example/pom.xml
index a64474e..caa2da3 100644
--- a/emf/codegen.maven.example/pom.xml
+++ b/emf/codegen.maven.example/pom.xml
@@ -52,7 +52,7 @@
       <dependency>
         <groupId>org.eclipse.fennec.emf</groupId>
         <artifactId>org.eclipse.fennec.emf.osgi.component</artifactId>
-        <version>0.1.1</version>
+        <version>1.0.2</version>
         <scope>runtime</scope>
       </dependency>
     </dependencies>
diff --git a/emf/codegen.maven/pom.xml b/emf/codegen.maven/pom.xml
index e103b16..d982dc5 100644
--- a/emf/codegen.maven/pom.xml
+++ b/emf/codegen.maven/pom.xml
@@ -55,44 +55,25 @@
       <scope>provided</scope>
     </dependency>
 
-    <!-- EMF Dependencies -->
-    <dependency>
-      <groupId>org.eclipse.emf</groupId>
-      <artifactId>org.eclipse.emf.common</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.emf</groupId>
-      <artifactId>org.eclipse.emf.ecore</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.emf</groupId>
-      <artifactId>org.eclipse.emf.ecore.xmi</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.emf</groupId>
-      <artifactId>org.eclipse.emf.codegen</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.emf</groupId>
-      <artifactId>org.eclipse.emf.codegen.ecore</artifactId>
-    </dependency>
-
-    <!-- Eclipse Core Runtime (for IProgressMonitor) -->
-    <dependency>
-      <groupId>org.eclipse.platform</groupId>
-      <artifactId>org.eclipse.core.runtime</artifactId>
-      <version>3.34.100</version>
-    </dependency>
-
-    <!-- Fennec EMF OSGi Codegen (for templates and adapters) -->
+    <!--
+      Fennec EMF OSGi Codegen is a self-contained jar: it embeds EMF (common,
+      ecore, xmi, codegen, codegen.ecore), the Eclipse runtime (core.runtime,
+      equinox.common, registry, jobs, resources, ...), Equinox OSGi, JDT and
+      UML2 codegen as unsigned copies. Its POM nevertheless declares all of
+      those as compile dependencies. Pulling them in puts the signed Eclipse
+      jars next to the unsigned copies, and depending on the classpath order
+      (Maven 3.10 changed it) the JVM rejects the mix with
+      "signer information does not match signer information of other classes
+      in the same package". So we use only the fennec jar itself.
+    -->
     <dependency>
       <groupId>org.eclipse.fennec.emf</groupId>
       <artifactId>org.eclipse.fennec.emf.osgi.codegen</artifactId>
-      <version>0.1.1</version>
+      <version>1.0.2</version>
       <exclusions>
         <exclusion>
-          <groupId>org.eclipse.uml2</groupId>
-          <artifactId>org.eclipse.uml2.codegen.ecore</artifactId>
+          <groupId>*</groupId>
+          <artifactId>*</artifactId>
         </exclusion>
       </exclusions>
     </dependency>