Skip to content

codegen plugin uses only the fennec jar #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stbischof merged 1 commit into from
Oct 8, 2026
Merged

codegen plugin uses only the fennec jar #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions emf/codegen.maven.example/ecore.annotated/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
4 changes: 2 additions & 2 deletions emf/codegen.maven.example/ecore.annotated/test.bndrun
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: \
Expand All @@ -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)',\
Expand Down
2 changes: 1 addition & 1 deletion emf/codegen.maven.example/ecore.dependencies.subpackages.consumer.subpackages/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion emf/codegen.maven.example/ecore.dependencies.subpackages/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions emf/codegen.maven.example/ecore.dependencies/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion emf/codegen.maven.example/ecore.dependencies/test.bndrun
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)',\
Expand Down
2 changes: 1 addition & 1 deletion emf/codegen.maven.example/ecore.enum.consumer/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion emf/codegen.maven.example/ecore.enum.provider/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions emf/codegen.maven.example/ecore.loadpackage/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
6 changes: 3 additions & 3 deletions emf/codegen.maven.example/ecore.loadpackage/test.bndrun
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: \
Expand All @@ -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)'
2 changes: 1 addition & 1 deletion emf/codegen.maven.example/ecore.noosgi/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion emf/codegen.maven.example/ecore.simple.subpackages/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion emf/codegen.maven.example/ecore.simple/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion emf/codegen.maven.example/ecore.simple/test.bndrun
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)',\
Expand Down
4 changes: 2 additions & 2 deletions emf/codegen.maven.example/genmodel.dependencies/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion emf/codegen.maven.example/genmodel.dependencies/test.bndrun
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)',\
Expand Down
4 changes: 2 additions & 2 deletions emf/codegen.maven.example/genmodel.simple/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion emf/codegen.maven.example/genmodel.simple/test.bndrun
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)',\
Expand Down
2 changes: 1 addition & 1 deletion emf/codegen.maven.example/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
47 changes: 14 additions & 33 deletions emf/codegen.maven/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading