JPMS: adjustments Signed-off-by: Maxim Nesen <maxim.nesen@oracle.com>
diff --git a/connectors/jdk-connector/src/main/java/module-info.java b/connectors/jdk-connector/src/main/java/module-info.java index 2ac98aa..199b09b 100644 --- a/connectors/jdk-connector/src/main/java/module-info.java +++ b/connectors/jdk-connector/src/main/java/module-info.java
@@ -26,4 +26,5 @@ requires org.glassfish.jersey.core.client; exports org.glassfish.jersey.jdk.connector; + exports org.glassfish.jersey.jdk.connector.internal; } \ No newline at end of file
diff --git a/incubator/cdi-inject-weld/pom.xml b/incubator/cdi-inject-weld/pom.xml index e722727..28f5404 100644 --- a/incubator/cdi-inject-weld/pom.xml +++ b/incubator/cdi-inject-weld/pom.xml
@@ -62,11 +62,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>jakarta.persistence</groupId> - <artifactId>jakarta.persistence-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>org.glassfish.jersey.containers</groupId> <artifactId>jersey-container-grizzly2-http</artifactId> <version>${project.version}</version>
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 a905490..7c7437c 100644 --- a/incubator/cdi-inject-weld/src/main/java/module-info.txt +++ b/incubator/cdi-inject-weld/src/main/java/module-info.txt
@@ -20,7 +20,7 @@ requires jakarta.inject; requires jakarta.interceptor.api; requires jakarta.servlet; - requires jakarta.persistence; +// requires jakarta.persistence; requires jakarta.ws.rs; requires java.logging;
diff --git a/media/sse/pom.xml b/media/sse/pom.xml index 275eb7b..5615faf 100644 --- a/media/sse/pom.xml +++ b/media/sse/pom.xml
@@ -88,5 +88,9 @@ </plugin> </plugins> </build> - + <properties> + <surefire.coverage.argline> + --add-modules=ALL-MODULE-PATH + </surefire.coverage.argline> + </properties> </project>
diff --git a/media/sse/src/main/java/module-info.java b/media/sse/src/main/java/module-info.java index 2895ea5..bf1a5fb 100644 --- a/media/sse/src/main/java/module-info.java +++ b/media/sse/src/main/java/module-info.java
@@ -21,7 +21,7 @@ requires jakarta.inject; requires jakarta.ws.rs; - requires jakarta.xml.bind; + requires static jakarta.xml.bind; requires org.glassfish.jersey.core.common; requires org.glassfish.jersey.core.client;
diff --git a/media/sse/src/test/java/module-info.txt b/media/sse/src/test/java/module-info.txt new file mode 100644 index 0000000..6d13930 --- /dev/null +++ b/media/sse/src/test/java/module-info.txt
@@ -0,0 +1,38 @@ +/* + * Copyright (c) 2022 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.media.sse { + requires java.logging; + + requires jakarta.inject; + requires jakarta.ws.rs; + + requires jakarta.xml.bind; //it's test + + requires org.glassfish.jersey.core.common; + requires org.glassfish.jersey.core.client; + requires org.glassfish.jersey.core.server; + + requires junit; + requires org.junit.jupiter.api; + requires org.junit.jupiter.engine; + + requires org.glassfish.jersey.tests.framework.core; + + exports org.glassfish.jersey.media.sse; + exports org.glassfish.jersey.media.sse.internal; + opens org.glassfish.jersey.media.sse; +} \ No newline at end of file
diff --git a/tests/integration/async-jersey-filter/pom.xml b/tests/integration/async-jersey-filter/pom.xml index 9433b78..1e4e495 100644 --- a/tests/integration/async-jersey-filter/pom.xml +++ b/tests/integration/async-jersey-filter/pom.xml
@@ -57,11 +57,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>jakarta.persistence</groupId> - <artifactId>jakarta.persistence-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>jakarta.xml.bind</groupId> <artifactId>jakarta.xml.bind-api</artifactId> <scope>provided</scope>
diff --git a/tests/integration/async-jersey-filter/src/main/java/module-info.java b/tests/integration/async-jersey-filter/src/main/java/module-info.java index 9027a6f..9483986 100644 --- a/tests/integration/async-jersey-filter/src/main/java/module-info.java +++ b/tests/integration/async-jersey-filter/src/main/java/module-info.java
@@ -16,7 +16,7 @@ module org.glassfish.jersey.tests.integration.async.jersey.filter { requires jakarta.inject; - requires jakarta.persistence; +// requires jakarta.persistence; requires jakarta.servlet; requires jakarta.ws.rs;
diff --git a/tests/integration/cdi-integration/context-inject-on-server/pom.xml b/tests/integration/cdi-integration/context-inject-on-server/pom.xml index 3d863d3..850045f 100644 --- a/tests/integration/cdi-integration/context-inject-on-server/pom.xml +++ b/tests/integration/cdi-integration/context-inject-on-server/pom.xml
@@ -51,12 +51,6 @@ <artifactId>jakarta.servlet-api</artifactId> </dependency> <dependency> - <groupId>jakarta.persistence</groupId> - <artifactId>jakarta.persistence-api</artifactId> - <scope>provided</scope> - <optional>true</optional> - </dependency> - <dependency> <groupId>org.glassfish.jersey.test-framework.providers</groupId> <artifactId>jersey-test-framework-provider-grizzly2</artifactId> <scope>test</scope>
diff --git a/tests/integration/cdi-integration/context-inject-on-server/src/main/java/module-info.java b/tests/integration/cdi-integration/context-inject-on-server/src/main/java/module-info.java index 3916359..2aab19a 100644 --- a/tests/integration/cdi-integration/context-inject-on-server/src/main/java/module-info.java +++ b/tests/integration/cdi-integration/context-inject-on-server/src/main/java/module-info.java
@@ -21,7 +21,7 @@ requires jakarta.inject; requires jakarta.cdi; requires jakarta.servlet; - requires jakarta.persistence; +// requires jakarta.persistence; requires org.glassfish.jersey.core.common; requires org.glassfish.jersey.core.server;
diff --git a/tests/integration/jersey-2704/pom.xml b/tests/integration/jersey-2704/pom.xml index 0340123..a6aae38 100644 --- a/tests/integration/jersey-2704/pom.xml +++ b/tests/integration/jersey-2704/pom.xml
@@ -50,12 +50,6 @@ <artifactId>jakarta.servlet-api</artifactId> <scope>provided</scope> </dependency> - <dependency> - <groupId>jakarta.persistence</groupId> - <artifactId>jakarta.persistence-api</artifactId> - <scope>provided</scope> - <optional>true</optional> - </dependency> </dependencies> <build>
diff --git a/tests/integration/jersey-2704/src/main/java/module-info.java b/tests/integration/jersey-2704/src/main/java/module-info.java index f040289..b99b1f7 100644 --- a/tests/integration/jersey-2704/src/main/java/module-info.java +++ b/tests/integration/jersey-2704/src/main/java/module-info.java
@@ -16,7 +16,7 @@ module org.glassfish.jersey.tests.integration.jersey_2704 { requires jakarta.inject; - requires jakarta.persistence; +// requires jakarta.persistence; requires jakarta.servlet; requires jakarta.ws.rs; requires jakarta.xml.bind;
diff --git a/tests/integration/jersey-780/pom.xml b/tests/integration/jersey-780/pom.xml index dd95b0e..b9360df 100644 --- a/tests/integration/jersey-780/pom.xml +++ b/tests/integration/jersey-780/pom.xml
@@ -70,11 +70,6 @@ <artifactId>junit-jupiter-engine</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>jakarta.persistence</groupId> - <artifactId>jakarta.persistence-api</artifactId> - <scope>test</scope> - </dependency> </dependencies> <build>
diff --git a/tests/integration/jersey-780/src/test/java/module-info.java b/tests/integration/jersey-780/src/test/java/module-info.java index 4d480e5..38839ce 100644 --- a/tests/integration/jersey-780/src/test/java/module-info.java +++ b/tests/integration/jersey-780/src/test/java/module-info.java
@@ -16,7 +16,7 @@ module org.glassfish.jersey.tests.integration.jersey_780 { requires jakarta.ws.rs; - requires jakarta.persistence; +// requires jakarta.persistence; requires org.glassfish.jersey.core.server; requires org.glassfish.jersey.tests.framework.core;