JPMS for 3 modules Signed-off-by: Maxim Nesen <maxim.nesen@oracle.com>
diff --git a/ext/cdi/jersey-cdi-rs-inject/pom.xml b/ext/cdi/jersey-cdi-rs-inject/pom.xml index b8a75e3..8a3ed0f 100644 --- a/ext/cdi/jersey-cdi-rs-inject/pom.xml +++ b/ext/cdi/jersey-cdi-rs-inject/pom.xml
@@ -73,7 +73,9 @@ <artifactId>maven-javadoc-plugin</artifactId> <configuration> <show>package</show> - <detectJavaApiLink>false</detectJavaApiLink> + <detectJavaApiLink>false</detectJavaApiLink> + <detectLinks>false</detectLinks> + <detectOfflineLinks>false</detectOfflineLinks> </configuration> </plugin> <plugin>
diff --git a/ext/cdi/jersey-cdi-rs-inject/src/main/java/module-info.txt b/ext/cdi/jersey-cdi-rs-inject/src/main/java/module-info.java similarity index 100% rename from ext/cdi/jersey-cdi-rs-inject/src/main/java/module-info.txt rename to ext/cdi/jersey-cdi-rs-inject/src/main/java/module-info.java
diff --git a/ext/cdi/jersey-cdi1x-transaction/src/main/java/module-info.txt b/ext/cdi/jersey-cdi1x-transaction/src/main/java/module-info.java similarity index 100% rename from ext/cdi/jersey-cdi1x-transaction/src/main/java/module-info.txt rename to ext/cdi/jersey-cdi1x-transaction/src/main/java/module-info.java
diff --git a/ext/microprofile/mp-rest-client/src/main/java/module-info.txt b/ext/microprofile/mp-rest-client/src/main/java/module-info.java similarity index 87% rename from ext/microprofile/mp-rest-client/src/main/java/module-info.txt rename to ext/microprofile/mp-rest-client/src/main/java/module-info.java index 8ce4c5c..e502961 100644 --- a/ext/microprofile/mp-rest-client/src/main/java/module-info.txt +++ b/ext/microprofile/mp-rest-client/src/main/java/module-info.java
@@ -24,9 +24,14 @@ requires jakarta.json; requires jakarta.ws.rs; + requires microprofile.rest.client.api; + requires microprofile.config.api; + requires org.reactivestreams; + requires org.glassfish.jersey.ext.cdi1x; requires org.glassfish.jersey.core.common; requires org.glassfish.jersey.core.client; requires org.glassfish.jersey.core.server; requires org.glassfish.jersey.inject.hk2; + requires org.glassfish.jersey.media.sse; } \ No newline at end of file
diff --git a/incubator/cdi-inject-weld/src/main/java/module-info.txt b/incubator/cdi-inject-weld/src/main/java/module-info.txt index 03ca321..a905490 100644 --- a/incubator/cdi-inject-weld/src/main/java/module-info.txt +++ b/incubator/cdi-inject-weld/src/main/java/module-info.txt
@@ -25,6 +25,13 @@ requires java.logging; + requires weld.api; + requires weld.spi; + requires weld.core.impl; + requires weld.se.core; + requires weld.probe.core; + requires grizzly.http.server; + requires org.glassfish.jersey.core.common; requires org.glassfish.jersey.core.client; requires org.glassfish.jersey.core.server;
diff --git a/ext/microprofile/mp-rest-client/src/main/java/module-info.txt b/incubator/cdi-inject-weld/src/test/java/module-info.txt similarity index 82% copy from ext/microprofile/mp-rest-client/src/main/java/module-info.txt copy to incubator/cdi-inject-weld/src/test/java/module-info.txt index 8ce4c5c..89a3e5e 100644 --- a/ext/microprofile/mp-rest-client/src/main/java/module-info.txt +++ b/incubator/cdi-inject-weld/src/test/java/module-info.txt
@@ -14,19 +14,18 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -module org.glassfish.jersey.ext.mp.rest.client { - requires java.logging; - +open module org.glassfish.jersey.incubator.cdi.inject.weld { requires jakarta.annotation; requires jakarta.cdi; requires jakarta.inject; - requires jakarta.interceptor.api; - requires jakarta.json; requires jakarta.ws.rs; - requires org.glassfish.jersey.ext.cdi1x; + requires java.logging; + + requires junit; + requires org.glassfish.jersey.core.common; requires org.glassfish.jersey.core.client; requires org.glassfish.jersey.core.server; - requires org.glassfish.jersey.inject.hk2; + requires hamcrest.core; } \ No newline at end of file
diff --git a/incubator/declarative-linking/pom.xml b/incubator/declarative-linking/pom.xml index 08ef78a..57e8d83 100644 --- a/incubator/declarative-linking/pom.xml +++ b/incubator/declarative-linking/pom.xml
@@ -134,23 +134,20 @@ <profile> <id>InaccessibleObjectException</id> <activation><jdk>[16,)</jdk></activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine> + <properties> + <surefire.coverage.argline> --add-opens java.base/java.util.zip=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED - </argLine> - </configuration> - </plugin> - </plugins> - </build> + </surefire.coverage.argline> + </properties> </profile> </profiles> + <!--<properties> + <surefire.coverage.argline>--add-opens java.base/java.util.zip=org.glassfish.jersey.incubator.declarative.linking + --add-opens java.base/java.util=org.glassfish.jersey.incubator.declarative.linking --illegal-access=permit</surefire.coverage.argline> + </properties>--> + <build> <resources> <resource>
diff --git a/incubator/declarative-linking/src/main/java/module-info.txt b/incubator/declarative-linking/src/main/java/module-info.txt index c824a41..2835731 100644 --- a/incubator/declarative-linking/src/main/java/module-info.txt +++ b/incubator/declarative-linking/src/main/java/module-info.txt
@@ -19,7 +19,7 @@ requires jakarta.inject; requires jakarta.ws.rs; - requires static jakarta.xml.bind; + requires jakarta.xml.bind; requires java.logging; requires java.desktop; @@ -29,4 +29,7 @@ opens org.glassfish.jersey.linking; exports org.glassfish.jersey.linking; + + exports org.glassfish.jersey.linking.contributing; + exports org.glassfish.jersey.linking.mapping; } \ No newline at end of file
diff --git a/incubator/declarative-linking/src/test/java/module-info.txt b/incubator/declarative-linking/src/test/java/module-info.txt index 35353f7..aee82c7 100644 --- a/incubator/declarative-linking/src/test/java/module-info.txt +++ b/incubator/declarative-linking/src/test/java/module-info.txt
@@ -27,4 +27,5 @@ requires org.glassfish.jersey.core.client; requires org.glassfish.jersey.core.common; requires org.glassfish.jersey.core.server; + requires jsonassert; } \ No newline at end of file
diff --git a/media/json-jackson/pom.xml b/media/json-jackson/pom.xml index f056729..75ecea6 100644 --- a/media/json-jackson/pom.xml +++ b/media/json-jackson/pom.xml
@@ -103,6 +103,11 @@ </exclusions> </dependency> <dependency> + <groupId>org.glassfish.jersey.core</groupId> + <artifactId>jersey-server</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> <groupId>org.glassfish.jersey.ext</groupId> <artifactId>jersey-entity-filtering</artifactId> <version>${project.version}</version>
diff --git a/media/json-jackson/src/main/java/module-info.txt b/media/json-jackson/src/main/java/module-info.txt index a4d66bc..bb32929 100644 --- a/media/json-jackson/src/main/java/module-info.txt +++ b/media/json-jackson/src/main/java/module-info.txt
@@ -23,6 +23,7 @@ requires com.fasterxml.jackson.annotation; requires com.fasterxml.jackson.databind; requires com.fasterxml.jackson.module.jaxb; + requires com.fasterxml.jackson.module.jakarta.xmlbind; requires org.glassfish.jersey.core.common; requires org.glassfish.jersey.core.server;