cd-inject-weld module-info

Signed-off-by: jansupol <[email protected]>

Author: jansupol

core-client/src/main/java/module-info.java

@@ -30,6 +30,7 @@
     exports org.glassfish.jersey.client.inject;
     exports org.glassfish.jersey.client.spi;
     exports org.glassfish.jersey.client.internal;
+    exports org.glassfish.jersey.client.internal.inject to org.glassfish.jersey.incubator.cdi.inject.weld;
 
     exports org.glassfish.jersey.client.innate to
             org.glassfish.jersey.apache5.connector,

core-common/src/main/java/module-info.java

@@ -61,7 +61,8 @@
                                            org.glassfish.jersey.container.servlet,
                                            org.glassfish.jersey.container.jetty.http,
                                            org.glassfish.jersey.netty.connector,
-                                           org.glassfish.jersey.ext.mp.rest.client;
+                                           org.glassfish.jersey.ext.mp.rest.client,
+                                           org.glassfish.jersey.incubator.cdi.inject.weld;
 
     exports org.glassfish.jersey.innate.inject to org.glassfish.jersey.inject.hk2,
                                                   org.glassfish.jersey.inject.cdi2.se,
@@ -80,6 +81,7 @@
                                                   org.glassfish.jersey.ext.entity.filtering,
                                                   org.glassfish.jersey.ext.metainf.services,
                                                   org.glassfish.jersey.ext.mvc,
+                                                  org.glassfish.jersey.incubator.cdi.inject.weld,
                                                   org.glassfish.jersey.gf.ejb,
                                                   org.glassfish.jersey.security.oauth1.signature;
     exports org.glassfish.jersey.innate.virtual to org.glassfish.jersey.container.grizzly2.http,
@@ -104,14 +106,14 @@
 
     opens org.glassfish.jersey.innate.spi to org.glassfish.jersey.media.multipart;
     opens org.glassfish.jersey.internal;
+    opens org.glassfish.jersey.internal.util.collection;
     opens org.glassfish.jersey.message.internal;
     opens org.glassfish.jersey.spi;
 
     uses jakarta.ws.rs.core.Feature;
     uses jakarta.ws.rs.container.DynamicFeature;
     uses jakarta.ws.rs.ext.RuntimeDelegate;
 
-    uses org.glassfish.jersey.innate.BootstrapPreinitialization;
     uses org.glassfish.jersey.innate.spi.EntityPartBuilderProvider;
     uses org.glassfish.jersey.internal.ServiceFinder;
     uses org.glassfish.jersey.internal.inject.InjectionManagerFactory;

core-server/src/main/java/module-info.java

@@ -47,7 +47,10 @@
     exports org.glassfish.jersey.server.wadl.internal.generators.resourcedoc;
     exports org.glassfish.jersey.server.wadl.internal.generators.resourcedoc.model;
     exports org.glassfish.jersey.server.filter;
-    exports org.glassfish.jersey.server.filter.internal to org.glassfish.hk2.locator, org.glassfish.hk2.utilities;
+    exports org.glassfish.jersey.server.filter.internal to
+            org.glassfish.hk2.locator,
+            org.glassfish.hk2.utilities,
+            org.glassfish.jersey.incubator.cdi.inject.weld;
 
     exports org.glassfish.jersey.server.monitoring;
     exports org.glassfish.jersey.server.internal;
@@ -76,11 +79,18 @@
 
     opens org.glassfish.jersey.server;
     opens org.glassfish.jersey.server.filter;
-    opens org.glassfish.jersey.server.internal to org.glassfish.hk2.utilities;
+    opens org.glassfish.jersey.server.filter.internal to
+            org.glassfish.hk2.locator,
+            org.glassfish.hk2.utilities,
+            weld.core.impl;
+    opens org.glassfish.jersey.server.internal to org.glassfish.hk2.utilities, weld.core.impl;
     opens org.glassfish.jersey.server.internal.inject;
     opens org.glassfish.jersey.server.internal.monitoring to org.glassfish.hk2.utilities;
     opens org.glassfish.jersey.server.internal.monitoring.jmx to org.glassfish.hk2.utilities;
-    opens org.glassfish.jersey.server.internal.process to org.glassfish.hk2.locator, org.glassfish.hk2.utilities;
+    opens org.glassfish.jersey.server.internal.process to
+            org.glassfish.hk2.locator,
+            org.glassfish.hk2.utilities,
+            weld.core.impl;
     opens org.glassfish.jersey.server.internal.routing to org.glassfish.hk2.utilities;
     opens org.glassfish.jersey.server.model;
     opens org.glassfish.jersey.server.wadl.processor;

incubator/cdi-inject-weld/pom.xml

@@ -32,6 +32,18 @@
 
     <description>CDI InjectionManager implementation</description>
 
+    <properties>
+        <surefire.security.argline>
+            --add-reads org.jboss.logging=weld.core.impl
+            --add-reads org.jboss.logging=ALL-UNNAMED
+            --add-reads org.jboss.logging=weld.se.core
+            --add-exports org.glassfish.jersey.incubator.cdi.inject.weld/org.glassfish.jersey.inject.weld=ALL-UNNAMED
+            --add-exports org.glassfish.jersey.incubator.cdi.inject.weld/org.glassfish.jersey.inject.weld.binder.client=org.glassfish.jersey.core.common
+            --add-exports org.glassfish.jersey.incubator.cdi.inject.weld/org.glassfish.jersey.inject.weld.binder.client=weld.core.impl
+            --add-opens org.glassfish.jersey.incubator.cdi.inject.weld/org.glassfish.jersey.inject.weld.binder.client=weld.core.impl
+        </surefire.security.argline>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.glassfish.jersey.core</groupId>
@@ -84,9 +96,8 @@
         <dependency>
             <groupId>org.jboss.weld.se</groupId>
             <artifactId>weld-se-core</artifactId>
-            <scope>provided</scope>
+            <optional>true</optional>
         </dependency>
-
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
@@ -168,4 +179,24 @@
             </plugin>
         </plugins>
     </build>
+    <profiles>
+        <profile>
+            <id>skip.modules.on.win</id>
+            <activation>
+                <!-- Scan on c: and on C:, resulting in two identical jars, hence fails with validation -->
+                <os><family>Windows</family></os>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <useModulePath>false</useModulePath>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>

…nject-weld/src/main/java/module-info.txt …ject-weld/src/main/java/module-info.javaincubator/cdi-inject-weld/src/main/java/module-info.txt renamed to incubator/cdi-inject-weld/src/main/java/module-info.java incubator/cdi-inject-weld/src/main/java/module-info.txt renamed to incubator/cdi-inject-weld/src/main/java/module-info.java

@@ -19,39 +19,43 @@
     requires jakarta.cdi;
     requires jakarta.inject;
     requires jakarta.interceptor;
-    requires jakarta.servlet;
-//  requires jakarta.persistence;
     requires jakarta.ws.rs;
 
     requires java.logging;
+    requires org.jboss.logging;
 
     requires weld.api;
     requires weld.spi;
     requires weld.core.impl;
     requires weld.se.core;
-    requires weld.probe.core;
     requires org.glassfish.grizzly.http.server;
 
     requires org.glassfish.jersey.core.common;
     requires org.glassfish.jersey.core.client;
     requires org.glassfish.jersey.core.server;
-    requires org.glassfish.jersey.container.servlet;
 
     opens org.glassfish.jersey.inject.weld.internal.data;
     opens org.glassfish.jersey.inject.weld.internal.bean;
     opens org.glassfish.jersey.inject.weld.internal.inject;
     opens org.glassfish.jersey.inject.weld.internal.managed;
     opens org.glassfish.jersey.inject.weld.internal.scope;
     opens org.glassfish.jersey.inject.weld.internal.type;
-    opens org.glassfish.jersey.inject.weld.spi;
     opens org.glassfish.jersey.inject.weld.managed;
+    opens org.glassfish.jersey.inject.weld.internal.injector to weld.core.impl;
 
     exports org.glassfish.jersey.inject.weld.internal.data;
     exports org.glassfish.jersey.inject.weld.internal.bean;
     exports org.glassfish.jersey.inject.weld.internal.inject;
     exports org.glassfish.jersey.inject.weld.internal.managed;
     exports org.glassfish.jersey.inject.weld.internal.scope;
     exports org.glassfish.jersey.inject.weld.internal.type;
-    exports org.glassfish.jersey.inject.weld.spi;
     exports org.glassfish.jersey.inject.weld.managed;
+
+    uses org.glassfish.jersey.innate.BootstrapPreinitialization;
+
+    provides jakarta.enterprise.inject.spi.Extension with
+            org.glassfish.jersey.inject.weld.internal.managed.BinderRegisterExtension;
+
+    provides org.glassfish.jersey.internal.inject.InjectionManagerFactory with
+            org.glassfish.jersey.inject.weld.managed.CdiInjectionManagerFactory;
 }

incubator/cdi-inject-weld/src/main/java/org/glassfish/jersey/inject/weld/internal/managed/BinderRegisterExtension.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2024 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -33,6 +33,7 @@
 import java.util.TreeMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Supplier;
+import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
 import jakarta.annotation.Priority;
@@ -105,7 +106,9 @@
  * CDI extension that handles CDI bootstrap events and registers Jersey's internally used components and components registered
  * using {@link Application}.
  */
-class BinderRegisterExtension implements Extension {
+public class BinderRegisterExtension implements Extension {
+
+    private static final Logger LOGGER = Logger.getLogger(BinderRegisterExtension.class.getName());
 
     private final AtomicBoolean registrationDone = new AtomicBoolean(false);
     private Supplier<BeanManager> beanManagerSupplier;
@@ -679,6 +682,7 @@ public <T> T createAndInitialize(Class<T> createMe) {
                 Constructor<T> constructor = createMe.getConstructor();
                 return constructor.newInstance();
             } catch (NoSuchMethodException | IllegalAccessException | InstantiationException | InvocationTargetException e) {
+                LOGGER.warning(e.getMessage());
                 return null;
             }
         }

…nject-weld/src/test/java/module-info.txt …-weld/src/test/java/module-info.java.txtincubator/cdi-inject-weld/src/test/java/module-info.txt renamed to incubator/cdi-inject-weld/src/test/java/module-info.java.txt incubator/cdi-inject-weld/src/test/java/module-info.txt renamed to incubator/cdi-inject-weld/src/test/java/module-info.java.txt

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -14,18 +14,23 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-open module org.glassfish.jersey.incubator.cdi.inject.weld {
+open module org.glassfish.jersey.incubator.cdi.inject.weld.test {
     requires jakarta.annotation;
     requires jakarta.cdi;
+    requires jakarta.cdi.el;
+    requires jakarta.el;
     requires jakarta.inject;
     requires jakarta.ws.rs;
 
     requires java.logging;
-
-    requires junit;
+    requires org.jboss.logging;
+    requires org.junit.jupiter.api;
 
     requires org.glassfish.jersey.core.common;
     requires org.glassfish.jersey.core.client;
     requires org.glassfish.jersey.core.server;
+    requires org.glassfish.jersey.incubator.cdi.inject.weld;
     requires org.hamcrest;
+
+    exports org.glassfish.jersey.inject.weld.binder.client to org.glassfish.jersey.core.common;
 }

incubator/cdi-inject-weld/src/test/resources/META-INF/beans.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2021, 2025 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -16,5 +16,9 @@
     SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
 
 -->
-
-<beans  bean-discovery-mode="annotated" />
+<beans xmlns="https://jakarta.ee/xml/ns/jakartaee"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_4_0.xsd"
+       version="4.0"
+       bean-discovery-mode="annotated">
+</beans>

tests/e2e-inject/cdi-inject-weld/pom.xml

@@ -32,6 +32,14 @@
 
     <description>Jersey E2E Inject CDI SE tests</description>
 
+    <properties>
+        <surefire.security.argline>
+            --add-reads org.jboss.logging=weld.core.impl
+            --add-reads org.jboss.logging=weld.se.core
+            --add-reads org.jboss.logging=weld.environment.common
+        </surefire.security.argline>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>jakarta.enterprise</groupId>
@@ -40,7 +48,8 @@
         <dependency>
             <groupId>org.jboss.weld.se</groupId>
             <artifactId>weld-se-core</artifactId>
-            <scope>test</scope>
+<!--            <scope>test</scope>-->
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.incubator</groupId>

tests/e2e-inject/cdi-inject-weld/src/main/java/module-info.java

@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2025 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+module org.glassfish.jersey.tests.e2e.inject.cdi.inject.weld.main {
+    requires jakarta.annotation;
+    requires jakarta.cdi;
+    requires jakarta.inject;
+    requires jakarta.interceptor;
+    requires jakarta.ws.rs;
+    requires org.glassfish.jersey.core.common;
+    requires org.glassfish.jersey.core.server;
+    requires weld.se.core;
+
+    exports org.glassfish.jersey.tests.e2e.inject.cdi.weld;
+    exports org.glassfish.jersey.tests.e2e.inject.cdi.weld.scopes;
+    exports org.glassfish.jersey.tests.e2e.inject.cdi.weld.subresources;
+
+    opens org.glassfish.jersey.tests.e2e.inject.cdi.weld to
+            org.glassfish.jersey.incubator.cdi.inject.weld,
+            weld.core.impl;
+    opens org.glassfish.jersey.tests.e2e.inject.cdi.weld.scopes to
+            org.glassfish.jersey.incubator.cdi.inject.weld,
+            weld.core.impl;
+    opens org.glassfish.jersey.tests.e2e.inject.cdi.weld.subresources to weld.core.impl;
+}