Skip to content

Add stable JPMS module names to deployed Morphia artifacts #4255

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

Open
Copilot wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Add stable JPMS module names to deployed Morphia artifacts #4255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cb35a34
Initial plan
Copilot May 18, 2026
4fdd8a1
Add Automatic-Module-Name metadata for core and kotlin jars
Copilot May 18, 2026
dcd8874
Refine module metadata checks and centralize jar plugin version
Copilot May 19, 2026
413c833
Merge branch 'master' into copilot/modularize-jar
evanchooly May 29, 2026
12747f3
Migrate module metadata test to JUnit
Copilot May 29, 2026
6b59067
Add automatic module names to deployed modules
Copilot May 29, 2026
4db74c0
Merge branch 'master' into copilot/modularize-jar
evanchooly May 29, 2026
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
16 changes: 16 additions & 0 deletions annotations/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,22 @@
<artifactId>morphia-annotations</artifactId>
<name>Morphia Annotations</name>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifestEntries>
<Automatic-Module-Name>dev.morphia.annotations</Automatic-Module-Name>
</manifestEntries>
</archive>
</configuration>
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
<groupId>org.mongodb</groupId>
Expand Down
8 changes: 7 additions & 1 deletion core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.5.0</version>
<configuration>
<archive>
<manifestEntries>
<Automatic-Module-Name>dev.morphia.core</Automatic-Module-Name>
</manifestEntries>
</archive>
</configuration>
<executions>
<execution>
<id>test-jar</id>
Expand Down
72 changes: 72 additions & 0 deletions core/src/test/java/dev/morphia/test/ModuleMetadataTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
package dev.morphia.test;

import java.io.File;
import java.io.FileReader;
import java.util.Optional;

import org.apache.maven.model.Model;
import org.apache.maven.model.Plugin;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
import org.codehaus.plexus.util.xml.Xpp3Dom;
import org.junit.jupiter.api.Test;

import static dev.morphia.test.TestBase.GIT_ROOT;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;

public class ModuleMetadataTest {
@Test
public void coreJarDefinesAutomaticModuleName() throws Exception {
assertAutomaticModuleName("core/pom.xml", "dev.morphia.core");
}

@Test
public void kotlinJarDefinesAutomaticModuleName() throws Exception {
assertAutomaticModuleName("kotlin/pom.xml", "dev.morphia.kotlin");
}

@Test
public void annotationsJarDefinesAutomaticModuleName() throws Exception {
assertAutomaticModuleName("annotations/pom.xml", "dev.morphia.annotations");
}

@Test
public void validationJarDefinesAutomaticModuleName() throws Exception {
assertAutomaticModuleName("validation/pom.xml", "dev.morphia.validation");
}

@Test
public void rewriteJarDefinesAutomaticModuleName() throws Exception {
assertAutomaticModuleName("rewrite/pom.xml", "dev.morphia.rewrite");
}

@Test
public void critterMavenJarDefinesAutomaticModuleName() throws Exception {
assertAutomaticModuleName("critter/critter-maven/pom.xml", "dev.morphia.critter.maven");
}

private static void assertAutomaticModuleName(String path, String expectedValue) throws Exception {
MavenXpp3Reader reader = new MavenXpp3Reader();
Model model;
try (FileReader fileReader = new FileReader(new File(GIT_ROOT, path).getAbsoluteFile())) {
model = reader.read(fileReader);
}

Optional<Plugin> plugin = model.getBuild().getPlugins().stream()
.filter(p -> "maven-jar-plugin".equals(p.getArtifactId()))
.findFirst();

assertTrue(plugin.isPresent(), "Expected maven-jar-plugin in " + path);

Xpp3Dom configuration = (Xpp3Dom) plugin.get().getConfiguration();
assertNotNull(configuration, "Expected maven-jar-plugin configuration in " + path);
Xpp3Dom archive = configuration.getChild("archive");
assertNotNull(archive, "Expected archive configuration in " + path);
Xpp3Dom manifestEntries = archive.getChild("manifestEntries");
assertNotNull(manifestEntries, "Expected manifestEntries configuration in " + path);
Xpp3Dom automaticModuleName = manifestEntries.getChild("Automatic-Module-Name");
assertNotNull(automaticModuleName, "Expected Automatic-Module-Name entry in " + path);
assertEquals(automaticModuleName.getValue(), expectedValue);
Comment on lines +56 to +70
}
}
11 changes: 11 additions & 0 deletions critter/critter-maven/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,17 @@

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifestEntries>
<Automatic-Module-Name>dev.morphia.critter.maven</Automatic-Module-Name>
</manifestEntries>
</archive>
</configuration>
</plugin>
<plugin>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-maven-plugin</artifactId>
Expand Down
17 changes: 16 additions & 1 deletion kotlin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,22 @@
<artifactId>morphia-kotlin</artifactId>
<name>Morphia Kotlin</name>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifestEntries>
<Automatic-Module-Name>dev.morphia.kotlin</Automatic-Module-Name>
</manifestEntries>
</archive>
</configuration>
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
<groupId>dev.morphia.morphia</groupId>
Expand Down Expand Up @@ -48,4 +64,3 @@
</dependency>
</dependencies>
</project>

7 changes: 6 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,12 @@
<compilerArgs>
<arg>-parameters</arg>
</compilerArgs>
</configuration>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.5.0</version>
</plugin>
<plugin>
<groupId>org.revapi</groupId>
Expand Down
11 changes: 11 additions & 0 deletions rewrite/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,17 @@

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifestEntries>
<Automatic-Module-Name>dev.morphia.rewrite</Automatic-Module-Name>
</manifestEntries>
</archive>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
Expand Down
16 changes: 16 additions & 0 deletions validation/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,22 @@
<artifactId>morphia-validation</artifactId>
<name>Morphia Validation</name>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifestEntries>
<Automatic-Module-Name>dev.morphia.validation</Automatic-Module-Name>
</manifestEntries>
</archive>
</configuration>
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
<groupId>dev.morphia.morphia</groupId>
Expand Down