Skip to content

Initial draft for JPMS friendlier setup #3460

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

Draft
manovotn wants to merge 13 commits into
base: main
Choose a base branch
from
Draft

Initial draft for JPMS friendlier setup #3460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
0dfcb5e
Configure surefire to run tests on the classpath
manovotn Jul 28, 2026
c652bc8
Add module-info.java to weld-core-impl
manovotn Jul 28, 2026
8f351c7
Add module-info.java to sub-modules (ejb, web, jta, jsf, let)
manovotn Jul 28, 2026
3b1f454
Add module-info.java to environment modules (common, SE, servlet)
manovotn Jul 28, 2026
505ae2d
Add qualified exports and configure module compilation
manovotn Jul 29, 2026
d00347f
Exclude module-info.class from shaded JARs
manovotn Jul 29, 2026
aa8614d
Implement centralized JPMS module access forwarding
manovotn Jul 29, 2026
1b3e43a
Wire JPMS module access forwarding into SE and Servlet bootstrap
manovotn Jul 29, 2026
2197c84
Add JPMS integration test module
manovotn Jul 29, 2026
5f7ed25
Fix race condition in module access forwarding and apply review fixes
manovotn Jul 29, 2026
412494c
Move JPMS tests into default test profile
manovotn Jul 29, 2026
5e2e699
CI: build Weld API SNAPSHOT from fork before core build
manovotn Jul 29, 2026
1df1df2
Add SPDX license headers to new files
manovotn Jul 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
4 changes: 4 additions & 0 deletions .github/workflows/ci-actions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ jobs:
# Caching is an automated pre/post action that installs the cache if the key exists and exports the cache
# after the job is done. In this case we refresh the cache monthly (by changing key) to avoid unlimited growth.
key: q2maven-main-${{ steps.get-date.outputs.date }}
- name: Build Weld API SNAPSHOT
run: |
git clone --branch jpms-migration --depth 1 https://github.com/manovotn/api.git /tmp/weld-api
mvn -f /tmp/weld-api/pom.xml clean install -DskipTests -Dno-format -B -V
- name: Build Weld SNAPSHOT
run: mvn clean install -DskipTests -Dno-format -B -V -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120
- name: Patch WildFly
Expand Down
2 changes: 1 addition & 1 deletion bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
</developers>

<properties>
<weld.api.bom.version>7.0.Beta2</weld.api.bom.version>
<weld.api.bom.version>7.0-SNAPSHOT</weld.api.bom.version>
<gpg.plugin.version>3.2.8</gpg.plugin.version>
<nexus.staging.plugin.version>1.7.0</nexus.staging.plugin.version>
<jboss.releases.repo.url>https://repository.jboss.org/nexus/service/local/staging/deploy/maven2/
Expand Down
7 changes: 7 additions & 0 deletions bundles/osgi/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,13 @@
<include>META-INF/services/**</include>
</includes>
</filter>
<filter>
<artifact>*:*</artifact>
<excludes>
<exclude>module-info.class</exclude>
<exclude>META-INF/versions/*/module-info.class</exclude>
</excludes>
</filter>
</filters>
</configuration>
</execution>
Expand Down
26 changes: 26 additions & 0 deletions environments/common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,30 @@
</dependency>

</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<compilerArgs>
<arg>-proc:full</arg>
</compilerArgs>
<annotationProcessorPaths>
<path>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-processor</artifactId>
<version>${jboss.logging.processor.version}</version>
</path>
<path>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
<version>${jboss.logging.version}</version>
</path>
</annotationProcessorPaths>
</configuration>
</plugin>
</plugins>
</build>
</project>
25 changes: 25 additions & 0 deletions environments/common/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
/*
* Copyright The Weld Authors
* SPDX-License-Identifier: Apache-2.0
*/
module org.jboss.weld.environment.common {
requires transitive org.jboss.weld.core;
requires org.jboss.logging;
requires static org.jboss.logging.annotations;
requires static org.jboss.jandex;

opens org.jboss.weld.environment.logging to org.jboss.logging;

exports org.jboss.weld.environment to
org.jboss.weld.se, org.jboss.weld.servlet;
exports org.jboss.weld.environment.deployment to
org.jboss.weld.se, org.jboss.weld.servlet;
exports org.jboss.weld.environment.deployment.discovery to
org.jboss.weld.se, org.jboss.weld.servlet;
exports org.jboss.weld.environment.deployment.discovery.jandex to
org.jboss.weld.se, org.jboss.weld.servlet;
exports org.jboss.weld.environment.logging to
org.jboss.weld.se, org.jboss.weld.servlet;
exports org.jboss.weld.environment.util to
org.jboss.weld.se, org.jboss.weld.servlet;
}
9 changes: 9 additions & 0 deletions environments/se/build/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,15 @@
<excludes>
</excludes>
</artifactSet>
<filters>
<filter>
<artifact>*:*</artifact>
<excludes>
<exclude>module-info.class</exclude>
<exclude>META-INF/versions/*/module-info.class</exclude>
</excludes>
</filter>
</filters>
</configuration>
</plugin>
<plugin>
Expand Down
17 changes: 17 additions & 0 deletions environments/se/core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,23 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<compilerArgs>
<arg>-proc:full</arg>
</compilerArgs>
<annotationProcessorPaths>
<path>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-processor</artifactId>
<version>${jboss.logging.processor.version}</version>
</path>
<path>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
<version>${jboss.logging.version}</version>
</path>
</annotationProcessorPaths>
</configuration>
<executions>
<execution>
<id>compile</id>
Expand Down
25 changes: 25 additions & 0 deletions environments/se/core/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
/*
* Copyright The Weld Authors
* SPDX-License-Identifier: Apache-2.0
*/
module org.jboss.weld.se {
requires transitive org.jboss.weld.core;
requires org.jboss.weld.environment.common;
requires org.jboss.weld.lite.extension.translator;
requires org.jboss.logging;
requires static org.jboss.logging.annotations;

opens org.jboss.weld.environment.se.logging to org.jboss.logging;

exports org.jboss.weld.environment.se;
exports org.jboss.weld.environment.se.bindings;
exports org.jboss.weld.environment.se.contexts;
exports org.jboss.weld.environment.se.events;

provides jakarta.enterprise.inject.se.SeContainerInitializer
with org.jboss.weld.environment.se.Weld;
provides jakarta.enterprise.inject.spi.CDIProvider
with org.jboss.weld.environment.se.WeldSEProvider;
provides jakarta.enterprise.inject.spi.Extension
with org.jboss.weld.environment.se.WeldSEBeanRegistrant;
}
1 change: 1 addition & 0 deletions environments/se/core/src/main/java/org/jboss/weld/environment/se/Weld.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -831,6 +831,7 @@ public WeldContainer initialize() {
}

final WeldBootstrap bootstrap = new WeldBootstrap();
bootstrap.setModuleAccessForwarder((source, pkg, target) -> source.addOpens(pkg, target));
// load possible additional BDA
parseAdditionalBeanDefiningAnnotations();
final Deployment deployment = createDeployment(resourceLoader, bootstrap);
Expand Down
9 changes: 9 additions & 0 deletions environments/servlet/build/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,15 @@
<exclude>jakarta.el:el-api</exclude>
</excludes>
</artifactSet>
<filters>
<filter>
<artifact>*:*</artifact>
<excludes>
<exclude>module-info.class</exclude>
<exclude>META-INF/versions/*/module-info.class</exclude>
</excludes>
</filter>
</filters>
</configuration>
</execution>
</executions>
Expand Down
28 changes: 28 additions & 0 deletions environments/servlet/core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,4 +151,32 @@

</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<compilerArgs>
<arg>-proc:full</arg>
<arg>--add-reads</arg>
<arg>org.jboss.weld.servlet=ALL-UNNAMED</arg>
</compilerArgs>
<annotationProcessorPaths>
<path>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-processor</artifactId>
<version>${jboss.logging.processor.version}</version>
</path>
<path>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
<version>${jboss.logging.version}</version>
</path>
</annotationProcessorPaths>
</configuration>
</plugin>
</plugins>
</build>

</project>
22 changes: 22 additions & 0 deletions environments/servlet/core/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
/*
* Copyright The Weld Authors
* SPDX-License-Identifier: Apache-2.0
*/
module org.jboss.weld.servlet {
requires transitive org.jboss.weld.core;
requires org.jboss.weld.environment.common;
requires org.jboss.weld.lite.extension.translator;
requires org.jboss.logging;
requires static org.jboss.logging.annotations;
requires jakarta.servlet;
requires static org.apache.tomcat.catalina;

opens org.jboss.weld.environment.servlet.logging to org.jboss.logging;

exports org.jboss.weld.environment.servlet;

provides jakarta.servlet.ServletContainerInitializer
with org.jboss.weld.environment.servlet.EnhancedListener;
provides jakarta.enterprise.inject.spi.CDIProvider
with org.jboss.weld.environment.servlet.WeldProvider;
}
1 change: 1 addition & 0 deletions ...s/servlet/core/src/main/java/org/jboss/weld/environment/servlet/WeldServletLifecycle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ boolean initialize(ServletContext context) {
}

final CDI11Bootstrap bootstrap = new WeldBootstrap();
bootstrap.setModuleAccessForwarder((source, pkg, target) -> source.addOpens(pkg, target));
if (isBootstrapNeeded) {
final CDI11Deployment deployment = createDeployment(context, bootstrap);

Expand Down
9 changes: 8 additions & 1 deletion ...nts/servlet/core/src/main/java/org/jboss/weld/environment/undertow/UndertowContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,14 @@ public class UndertowContainer implements Container {

@Override
public boolean touch(ResourceLoader resourceLoader, ContainerContext context) throws Exception {
return context.getServletContext().getClass().getName().startsWith(UDT_SERVLET_PREFIX);
boolean isUndertow = context.getServletContext().getClass().getName().startsWith(UDT_SERVLET_PREFIX);
if (isUndertow) {
Module servletModule = this.getClass().getModule();
if (servletModule.isNamed()) {
servletModule.addReads(context.getServletContext().getClass().getModule());
}
}
return isUndertow;
}

@Override
Expand Down
23 changes: 23 additions & 0 deletions impl/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,29 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<compilerArgs>
<arg>-proc:full</arg>
<arg>--add-reads</arg>
<arg>org.jboss.weld.core=ALL-UNNAMED</arg>
</compilerArgs>
<annotationProcessorPaths>
<path>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-processor</artifactId>
<version>${jboss.logging.processor.version}</version>
</path>
<path>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
<version>${jboss.logging.version}</version>
</path>
</annotationProcessorPaths>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
Expand Down
Loading
Loading