Skip to content

Fix cross-module EPackage state leak in EmfGenerateMojo #41

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
May 11, 2026
Merged

Fix cross-module EPackage state leak in EmfGenerateMojo #41

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
47 changes: 47 additions & 0 deletions ...en.maven.example/ecore.dependencies.subpackages.consumer.subpackages/model/consumer.ecore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
<?xml version="1.0" encoding="UTF-8"?>
<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="consumer"
nsURI="http://daanse.eclipse.org/example/consumer.subpackages" nsPrefix="consumer">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="basePackage" value="org.eclipse.daanse.example.consumer"/>
<details key="prefix" value="Consumer"/>
</eAnnotations>
<eSubpackages name="processing" nsURI="http://daanse.eclipse.org/example/consumer.subpackages/processing"
nsPrefix="processing">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="basePackage" value="org.eclipse.daanse.example.consumer"/>
<details key="prefix" value="Processing"/>
</eAnnotations>
<eClassifiers xsi:type="ecore:EClass" name="ProcessingRecord">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name"
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<!-- Reference into nested.ecore's a/Alpha (one subpackage deep).
URI part = root nsURI; fragment is the path FROM the resource root
(nested EPackage), navigating into subpackages. -->
<eStructuralFeatures xsi:type="ecore:EReference" name="seedAlpha"
eType="ecore:EClass http://daanse.eclipse.org/example/nested#//a/Alpha"/>
<!-- Reference into nested.ecore's a/b/Beta (two subpackages deep) -->
<eStructuralFeatures xsi:type="ecore:EReference" name="seedBeta"
eType="ecore:EClass http://daanse.eclipse.org/example/nested#//a/b/Beta"
containment="true"/>
</eClassifiers>
</eSubpackages>
<eSubpackages name="assessment" nsURI="http://daanse.eclipse.org/example/consumer.subpackages/assessment"
nsPrefix="assessment">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="basePackage" value="org.eclipse.daanse.example.consumer"/>
<details key="prefix" value="Assessment"/>
</eAnnotations>
<eClassifiers xsi:type="ecore:EClass" name="Assessment">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="title"
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<!-- Sibling-subpackage cross-ref into our own processing/ProcessingRecord
(mirrors gdpr's processing<->assessment cross-references) -->
<eStructuralFeatures xsi:type="ecore:EReference" name="record"
eType="#//processing/ProcessingRecord"/>
<!-- Also reference an external nested type to mirror gdpr's mixed pattern -->
<eStructuralFeatures xsi:type="ecore:EReference" name="dependency"
eType="ecore:EClass http://daanse.eclipse.org/example/nested#//a/b/Beta"/>
</eClassifiers>
</eSubpackages>
</ecore:EPackage>
111 changes: 111 additions & 0 deletions 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
@@ -0,0 +1,111 @@
<?xml version="1.0"?>
<!--
/*********************************************************************
* Copyright (c) 2026 Contributors to the Eclipse Foundation.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
**********************************************************************/
-->
<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.eclipse.daanse</groupId>
<artifactId>org.eclipse.daanse.tooling.emf.codegen.maven.example</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>

<artifactId>
org.eclipse.daanse.tooling.emf.codegen.maven.example.ecore.dependencies.subpackages.consumer.subpackages</artifactId>
<packaging>jar</packaging>

<name>Daanse EMF Codegen Example - Consumer with Subpackages and Cross-Module
Nested Reference</name>
<description>Regression test for the case where the consumer ecore has its
own sub-packages AND references classifiers in nested sub-packages of an
external dependency, with sibling-subpackage cross-references inside the
consumer (mirrors the cwm.governance.gdpr structure).</description>

<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>
<!-- Provides nested/a/Alpha and nested/a/b/Beta -->
<dependency>
<groupId>org.eclipse.daanse</groupId>
<artifactId>
org.eclipse.daanse.tooling.emf.codegen.maven.example.ecore.simple.subpackages</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.fennec.emf</groupId>
<artifactId>org.eclipse.fennec.emf.osgi.api</artifactId>
<version>0.1.1</version>
</dependency>
<dependency>
<groupId>org.eclipse.fennec.emf</groupId>
<artifactId>org.eclipse.fennec.emf.osgi.component</artifactId>
<scope>runtime</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.eclipse.daanse</groupId>
<artifactId>org.eclipse.daanse.tooling.emf.codegen.maven</artifactId>
<version>${project.version}</version>
<executions>
<execution>
<goals>
<goal>generate</goal>
</goals>
<configuration>
<ecoreFile>model/consumer.ecore</ecoreFile>
<basePackage>org.eclipse.daanse.example.consumer</basePackage>
<outputDirectory>target/generated-sources/emf</outputDirectory>
</configuration>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>biz.aQute.bnd</groupId>
<artifactId>biz.aQute.bndlib</artifactId>
<version>7.1.0</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.6.0</version>
<executions>
<execution>
<phase>generate-sources</phase>
<goals>
<goal>add-source</goal>
</goals>
<configuration>
<sources>
<source>target/generated-sources/emf</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

</project>
1 change: 1 addition & 0 deletions emf/codegen.maven.example/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
<!-- Modules with dependencies (must be built after their dependencies) -->
<module>ecore.dependencies</module>
<module>ecore.dependencies.subpackages</module>
<module>ecore.dependencies.subpackages.consumer.subpackages</module>
<module>genmodel.dependencies</module>
</modules>

Expand Down
Loading
Loading