JPMS adjustments to the actual 3.1 Signed-off-by: Maxim Nesen <maxim.nesen@oracle.com>
diff --git a/archetypes/jersey-quickstart-grizzly2/pom.xml b/archetypes/jersey-quickstart-grizzly2/pom.xml index c3983d7..563ffa8 100644 --- a/archetypes/jersey-quickstart-grizzly2/pom.xml +++ b/archetypes/jersey-quickstart-grizzly2/pom.xml
@@ -53,4 +53,4 @@ </plugins> </build> -</project> +</project> \ No newline at end of file
diff --git a/archetypes/jersey-quickstart-webapp/pom.xml b/archetypes/jersey-quickstart-webapp/pom.xml index d73f895..5f6c3fd 100644 --- a/archetypes/jersey-quickstart-webapp/pom.xml +++ b/archetypes/jersey-quickstart-webapp/pom.xml
@@ -52,4 +52,4 @@ </resource> </resources> </build> -</project> +</project> \ No newline at end of file
diff --git a/archetypes/pom.xml b/archetypes/pom.xml index 1b44aa6..ff49ac1 100644 --- a/archetypes/pom.xml +++ b/archetypes/pom.xml
@@ -32,7 +32,7 @@ <description> A module containing archetypes for generating Jersey-based applications. </description> - + <!-- List of available modules --> <modules> <module>jersey-heroku-webapp</module> <module>jersey-quickstart-grizzly2</module>
diff --git a/connectors/apache-connector/pom.xml b/connectors/apache-connector/pom.xml index 5e609f1..f06225c 100644 --- a/connectors/apache-connector/pom.xml +++ b/connectors/apache-connector/pom.xml
@@ -77,4 +77,4 @@ </plugins> </build> -</project> +</project> \ No newline at end of file
diff --git a/containers/glassfish/jersey-gf-ejb/pom.xml b/containers/glassfish/jersey-gf-ejb/pom.xml index af2b033..b56e8ea 100644 --- a/containers/glassfish/jersey-gf-ejb/pom.xml +++ b/containers/glassfish/jersey-gf-ejb/pom.xml
@@ -137,4 +137,4 @@ </plugin> </plugins> </build> - </project> + </project> \ No newline at end of file
diff --git a/containers/grizzly2-http/pom.xml b/containers/grizzly2-http/pom.xml index 439c127..43d8d8c 100644 --- a/containers/grizzly2-http/pom.xml +++ b/containers/grizzly2-http/pom.xml
@@ -193,4 +193,4 @@ </build> </profile> </profiles> -</project> +</project> \ No newline at end of file
diff --git a/containers/grizzly2-servlet/pom.xml b/containers/grizzly2-servlet/pom.xml index ac5bc9b..6cca879 100644 --- a/containers/grizzly2-servlet/pom.xml +++ b/containers/grizzly2-servlet/pom.xml
@@ -80,4 +80,4 @@ </plugin> </plugins> </build> -</project> +</project> \ No newline at end of file
diff --git a/containers/jdk-http/pom.xml b/containers/jdk-http/pom.xml index 144d66c..439710d 100644 --- a/containers/jdk-http/pom.xml +++ b/containers/jdk-http/pom.xml
@@ -90,4 +90,4 @@ <!-- https://bugs.openjdk.java.net/browse/JDK-8211426 --> <surefire.security.argline>-Djdk.tls.client.protocols=TLSv1.2</surefire.security.argline> </properties> -</project> +</project> \ No newline at end of file
diff --git a/containers/jersey-servlet-core/pom.xml b/containers/jersey-servlet-core/pom.xml index 5b356c2..2ab86ce 100644 --- a/containers/jersey-servlet-core/pom.xml +++ b/containers/jersey-servlet-core/pom.xml
@@ -89,4 +89,4 @@ </surefire.coverage.argline> </properties> -</project> +</project> \ No newline at end of file
diff --git a/containers/netty-http/pom.xml b/containers/netty-http/pom.xml index c791c3d..fba4ac5 100644 --- a/containers/netty-http/pom.xml +++ b/containers/netty-http/pom.xml
@@ -75,4 +75,4 @@ </plugins> </build> -</project> +</project> \ No newline at end of file
diff --git a/containers/simple-http/pom.xml b/containers/simple-http/pom.xml index 3956b65..483e8b9 100644 --- a/containers/simple-http/pom.xml +++ b/containers/simple-http/pom.xml
@@ -89,4 +89,4 @@ </resources> </build> -</project> +</project> \ No newline at end of file
diff --git a/core-client/src/main/java/module-info.java b/core-client/src/main/java/module-info.java index bf58d5e..52d96f1 100644 --- a/core-client/src/main/java/module-info.java +++ b/core-client/src/main/java/module-info.java
@@ -37,13 +37,19 @@ org.glassfish.jersey.grizzly.connector, org.glassfish.jersey.jetty.connector; + exports org.glassfish.jersey.client.innate.http to + org.glassfish.jersey.apache.connector, + org.glassfish.jersey.netty.connector, + org.glassfish.jersey.grizzly.connector, + org.glassfish.jersey.jetty.connector, + org.glassfish.jersey.jdk.connector; + opens org.glassfish.jersey.client; opens org.glassfish.jersey.client.spi; opens org.glassfish.jersey.client.filter; // for Localization messages opens org.glassfish.jersey.client.internal; - opens org.glassfish.jersey.client.internal.jdkconnector; uses org.glassfish.jersey.client.spi.AsyncConnectorCallback; uses org.glassfish.jersey.client.spi.ConnectorProvider;
diff --git a/core-common/src/main/java/module-info.java b/core-common/src/main/java/module-info.java index e944d60..1ab1f23 100644 --- a/core-common/src/main/java/module-info.java +++ b/core-common/src/main/java/module-info.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2023 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 @@ -76,6 +76,5 @@ provides jakarta.ws.rs.ext.RuntimeDelegate with org.glassfish.jersey.internal.RuntimeDelegateImpl; provides org.glassfish.jersey.internal.spi.AutoDiscoverable - with org.glassfish.jersey.logging.LoggingFeatureAutoDiscoverable, - org.glassfish.jersey.internal.config.ExternalPropertiesAutoDiscoverable; + with org.glassfish.jersey.logging.LoggingFeatureAutoDiscoverable; } \ No newline at end of file
diff --git a/core-common/src/main/java/org/glassfish/jersey/internal/util/ReflectionHelper.java b/core-common/src/main/java/org/glassfish/jersey/internal/util/ReflectionHelper.java index 6383095..aa46870 100644 --- a/core-common/src/main/java/org/glassfish/jersey/internal/util/ReflectionHelper.java +++ b/core-common/src/main/java/org/glassfish/jersey/internal/util/ReflectionHelper.java
@@ -1344,6 +1344,7 @@ * @param m the method to find * @return privileged action to return public method found. * @see AccessController#doPrivileged(java.security.PrivilegedAction) + * */ public static PrivilegedAction<Method> findMethodOnClassPA(final Class<?> c, final Method m) { return new PrivilegedAction<Method>() {
diff --git a/examples/extended-wadl-webapp/pom.xml b/examples/extended-wadl-webapp/pom.xml index 4fa6f5b..e4552af 100644 --- a/examples/extended-wadl-webapp/pom.xml +++ b/examples/extended-wadl-webapp/pom.xml
@@ -147,33 +147,15 @@ <plugins> <!-- Extended Wadl Config: this plugin generates the jaxb beans from xsd schemas --> <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <dependencies> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-xjc</artifactId> - <version>4.0.0-M3</version> - </dependency> - </dependencies> + <groupId>org.codehaus.mojo</groupId> + <artifactId>jaxb2-maven-plugin</artifactId> + <version>2.5.0</version> <executions> <execution> - <id>xjc-gen-for-glassfish-acc</id> - <phase>generate-sources</phase> + <id>xjc</id> <goals> - <goal>run</goal> + <goal>xjc</goal> </goals> - <configuration> - <target> - <taskdef name="xjc" classname="com.sun.tools.xjc.XJCTask" classpathref="maven.plugin.classpath"/> - <property name="dest" location="${project.build.directory}/generated-sources/xjc"/> - <mkdir dir="${dest}"/> - <xjc destdir="${dest}" fork="true" - schema="${project.basedir}/src/main/xsd" - package="org.glassfish.jersey.examples.extendedwadl"> - <jvmarg value="-DenableExternalEntityProcessing=true"/> - </xjc> - </target> - </configuration> </execution> </executions> <configuration> @@ -361,4 +343,4 @@ </build> </profile> </profiles> -</project> +</project> \ No newline at end of file
diff --git a/ext/cdi/jersey-cdi1x-ban-custom-hk2-binding/pom.xml b/ext/cdi/jersey-cdi1x-ban-custom-hk2-binding/pom.xml index c4aaf8e..7530ce1 100644 --- a/ext/cdi/jersey-cdi1x-ban-custom-hk2-binding/pom.xml +++ b/ext/cdi/jersey-cdi1x-ban-custom-hk2-binding/pom.xml
@@ -89,4 +89,4 @@ </plugin> </plugins> </build> -</project> +</project> \ No newline at end of file
diff --git a/ext/cdi/jersey-cdi1x-servlet/pom.xml b/ext/cdi/jersey-cdi1x-servlet/pom.xml index e9430bf..8a6b1cd 100644 --- a/ext/cdi/jersey-cdi1x-servlet/pom.xml +++ b/ext/cdi/jersey-cdi1x-servlet/pom.xml
@@ -102,4 +102,4 @@ </plugins> </build> -</project> +</project> \ No newline at end of file
diff --git a/ext/cdi/jersey-cdi1x-transaction/pom.xml b/ext/cdi/jersey-cdi1x-transaction/pom.xml index 3c6b052..bddee12 100644 --- a/ext/cdi/jersey-cdi1x-transaction/pom.xml +++ b/ext/cdi/jersey-cdi1x-transaction/pom.xml
@@ -124,4 +124,4 @@ </plugin> </plugins> </build> -</project> +</project> \ No newline at end of file
diff --git a/ext/cdi/jersey-cdi1x-validation/pom.xml b/ext/cdi/jersey-cdi1x-validation/pom.xml index d68060f..560bcfe 100644 --- a/ext/cdi/jersey-cdi1x-validation/pom.xml +++ b/ext/cdi/jersey-cdi1x-validation/pom.xml
@@ -122,4 +122,4 @@ </plugins> </build> -</project> +</project> \ No newline at end of file
diff --git a/ext/mvc-bean-validation/pom.xml b/ext/mvc-bean-validation/pom.xml index 6a9a724..344c458 100644 --- a/ext/mvc-bean-validation/pom.xml +++ b/ext/mvc-bean-validation/pom.xml
@@ -79,4 +79,4 @@ </dependency> </dependencies> -</project> +</project> \ No newline at end of file
diff --git a/ext/mvc-freemarker/pom.xml b/ext/mvc-freemarker/pom.xml index 6a068cd..9a55634 100644 --- a/ext/mvc-freemarker/pom.xml +++ b/ext/mvc-freemarker/pom.xml
@@ -88,4 +88,4 @@ </dependency> </dependencies> -</project> +</project> \ No newline at end of file
diff --git a/ext/mvc-mustache/pom.xml b/ext/mvc-mustache/pom.xml index 72dc672..0649674 100644 --- a/ext/mvc-mustache/pom.xml +++ b/ext/mvc-mustache/pom.xml
@@ -94,4 +94,4 @@ </dependency> </dependencies> -</project> +</project> \ No newline at end of file
diff --git a/ext/rx/rx-client-guava/pom.xml b/ext/rx/rx-client-guava/pom.xml index 50a6d64..da4df95 100644 --- a/ext/rx/rx-client-guava/pom.xml +++ b/ext/rx/rx-client-guava/pom.xml
@@ -44,4 +44,4 @@ <version>${guava.version}</version> </dependency> </dependencies> -</project> +</project> \ No newline at end of file
diff --git a/ext/rx/rx-client-rxjava/pom.xml b/ext/rx/rx-client-rxjava/pom.xml index 7925d4c..457ec35 100644 --- a/ext/rx/rx-client-rxjava/pom.xml +++ b/ext/rx/rx-client-rxjava/pom.xml
@@ -45,4 +45,4 @@ </dependency> </dependencies> -</project> +</project> \ No newline at end of file
diff --git a/ext/rx/rx-client-rxjava2/pom.xml b/ext/rx/rx-client-rxjava2/pom.xml index 669583b..c91b771 100644 --- a/ext/rx/rx-client-rxjava2/pom.xml +++ b/ext/rx/rx-client-rxjava2/pom.xml
@@ -56,4 +56,4 @@ </dependency> </dependencies> -</project> +</project> \ No newline at end of file
diff --git a/ext/wadl-doclet/pom.xml b/ext/wadl-doclet/pom.xml index 6b6ac22..159c15e 100644 --- a/ext/wadl-doclet/pom.xml +++ b/ext/wadl-doclet/pom.xml
@@ -197,4 +197,4 @@ </resource> </resources> </build> -</project> +</project> \ No newline at end of file
diff --git a/incubator/gae-integration/pom.xml b/incubator/gae-integration/pom.xml index 5a8c869..19dddb9 100644 --- a/incubator/gae-integration/pom.xml +++ b/incubator/gae-integration/pom.xml
@@ -55,5 +55,25 @@ <directory>${project.build.directory}/legal</directory> </resource> </resources> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <executions> + <execution> + <id>default-compile</id> + <configuration> + <!-- compile everything to ensure module-info contains right entries --> + <release>11</release> + <compilerArgs> + <arg>--add-reads</arg> + <arg>org.glassfish.jersey.incubator.gae.integration=ALL-UNNAMED</arg> + <arg>-Xdiags:verbose</arg> + </compilerArgs> + </configuration> + </execution> + </executions> + </plugin> + </plugins> </build> </project>
diff --git a/incubator/gae-integration/src/main/java/module-info.java b/incubator/gae-integration/src/main/java/module-info.java index ad9a85c..761af57 100644 --- a/incubator/gae-integration/src/main/java/module-info.java +++ b/incubator/gae-integration/src/main/java/module-info.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2023 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 @@ -17,7 +17,7 @@ module org.glassfish.jersey.incubator.gae.integration { requires jakarta.ws.rs; - requires appengine.api; +// requires com.google.appengine.api; requires org.glassfish.jersey.core.common; requires org.glassfish.jersey.core.server;
diff --git a/incubator/kryo/src/main/java/module-info.java b/incubator/kryo/src/main/java/module-info.java index b9c7384..1bed528 100644 --- a/incubator/kryo/src/main/java/module-info.java +++ b/incubator/kryo/src/main/java/module-info.java
@@ -16,6 +16,7 @@ module org.glassfish.jersey.incubator.media.kryo { requires jakarta.annotation; + requires jakarta.inject; requires jakarta.ws.rs; requires kryo;
diff --git a/media/json-binding/src/main/java/module-info.java b/media/json-binding/src/main/java/module-info.java index 986c835..4b9edf6 100644 --- a/media/json-binding/src/main/java/module-info.java +++ b/media/json-binding/src/main/java/module-info.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2023 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,6 +16,7 @@ module org.glassfish.jersey.media.jsonb { requires jakarta.annotation; + requires jakarta.inject; requires jakarta.ws.rs; requires jakarta.json.bind;
diff --git a/media/json-jettison/src/main/java/module-info.java b/media/json-jettison/src/main/java/module-info.java index e5a90dc..88ff954 100644 --- a/media/json-jettison/src/main/java/module-info.java +++ b/media/json-jettison/src/main/java/module-info.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2023 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 @@ -18,6 +18,7 @@ requires java.logging; requires java.xml; + requires jakarta.inject; requires jakarta.ws.rs; requires static jakarta.xml.bind;
diff --git a/tests/integration/jersey-2031/pom.xml b/tests/integration/jersey-2031/pom.xml index d66f640..3683c54 100644 --- a/tests/integration/jersey-2031/pom.xml +++ b/tests/integration/jersey-2031/pom.xml
@@ -108,4 +108,4 @@ </plugins> </build> -</project> +</project> \ No newline at end of file
diff --git a/tests/integration/jersey-2704/pom.xml b/tests/integration/jersey-2704/pom.xml index a6aae38..9572665 100644 --- a/tests/integration/jersey-2704/pom.xml +++ b/tests/integration/jersey-2704/pom.xml
@@ -69,4 +69,4 @@ </plugins> </build> -</project> +</project> \ No newline at end of file