JPMS tests/integration Signed-off-by: Maxim Nesen <maxim.nesen@oracle.com>
diff --git a/tests/integration/jersey-1964/src/main/java/module-info.java b/tests/integration/jersey-1964/src/main/java/module-info.java index 2c0b602..a7b3d5d 100644 --- a/tests/integration/jersey-1964/src/main/java/module-info.java +++ b/tests/integration/jersey-1964/src/main/java/module-info.java
@@ -14,7 +14,7 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -module org.glassfish.jersey.tests.integration.jersey_1964{ +module org.glassfish.jersey.tests.integration.jersey_1964 { requires jakarta.ws.rs; requires jakarta.xml.bind; requires org.glassfish.jersey.core.server;
diff --git a/tests/integration/jersey-2031/pom.xml b/tests/integration/jersey-2031/pom.xml index 4f953ee..d66f640 100644 --- a/tests/integration/jersey-2031/pom.xml +++ b/tests/integration/jersey-2031/pom.xml
@@ -53,6 +53,12 @@ <artifactId>jersey-test-framework-provider-external</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>jakarta.servlet.jsp</groupId> + <artifactId>jakarta.servlet.jsp-api</artifactId> + <version>${jsp.version}</version> + <scope>provided</scope> + </dependency> </dependencies> <build>
diff --git a/tests/integration/jersey-2031/src/main/java/module-info.java b/tests/integration/jersey-2031/src/main/java/module-info.java new file mode 100644 index 0000000..b46433a --- /dev/null +++ b/tests/integration/jersey-2031/src/main/java/module-info.java
@@ -0,0 +1,24 @@ +/* + * 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.tests.integration.jersey_2031 { + requires jakarta.ws.rs; + requires jakarta.xml.bind; + requires jakarta.servlet.jsp; + requires org.glassfish.jersey.core.server; + requires org.glassfish.jersey.ext.mvc; + requires org.glassfish.jersey.ext.mvc.jsp; +} \ No newline at end of file
diff --git a/tests/integration/jersey-2136/src/main/java/module-info.java b/tests/integration/jersey-2136/src/main/java/module-info.java new file mode 100644 index 0000000..324dc62 --- /dev/null +++ b/tests/integration/jersey-2136/src/main/java/module-info.java
@@ -0,0 +1,21 @@ +/* + * 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.tests.integration.jersey_2136 { + requires jakarta.ws.rs; + requires jakarta.xml.bind; + requires org.glassfish.jersey.core.server; +} \ No newline at end of file
diff --git a/tests/integration/jersey-2137/src/main/java/module-info.java b/tests/integration/jersey-2137/src/main/java/module-info.java new file mode 100644 index 0000000..f35db2e --- /dev/null +++ b/tests/integration/jersey-2137/src/main/java/module-info.java
@@ -0,0 +1,22 @@ +/* + * 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.tests.integration.jersey_2137 { + requires jakarta.persistence; + requires jakarta.cdi; + requires jakarta.transaction; + requires jakarta.ws.rs; +} \ No newline at end of file
diff --git a/tests/integration/jersey-2154/src/main/java/module-info.java b/tests/integration/jersey-2154/src/main/java/module-info.java new file mode 100644 index 0000000..0d93c2d --- /dev/null +++ b/tests/integration/jersey-2154/src/main/java/module-info.java
@@ -0,0 +1,21 @@ +/* + * 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.tests.integration.jersey_2154 { + requires jakarta.ejb.api; + requires jakarta.cdi; + requires jakarta.ws.rs; +} \ No newline at end of file
diff --git a/tests/integration/jersey-2160/src/main/java/module-info.java b/tests/integration/jersey-2160/src/main/java/module-info.java new file mode 100644 index 0000000..15779d5 --- /dev/null +++ b/tests/integration/jersey-2160/src/main/java/module-info.java
@@ -0,0 +1,22 @@ +/* + * 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.tests.integration.jersey_2160 { + requires jakarta.servlet; + requires jakarta.ws.rs; + requires jakarta.xml.bind; + requires org.glassfish.hk2.api; +} \ No newline at end of file
diff --git a/tests/integration/jersey-2167/src/main/java/module-info.java b/tests/integration/jersey-2167/src/main/java/module-info.java new file mode 100644 index 0000000..1237902 --- /dev/null +++ b/tests/integration/jersey-2167/src/main/java/module-info.java
@@ -0,0 +1,26 @@ +/* + * 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.tests.integration.jersey_2167 { + requires jakarta.inject; + requires jakarta.ws.rs; + requires jakarta.xml.bind; + + requires java.logging; + + requires org.glassfish.jersey.core.common; + requires org.glassfish.jersey.core.server; +} \ No newline at end of file
diff --git a/tests/integration/jersey-2176/src/main/java/module-info.java b/tests/integration/jersey-2176/src/main/java/module-info.java new file mode 100644 index 0000000..791d9d9 --- /dev/null +++ b/tests/integration/jersey-2176/src/main/java/module-info.java
@@ -0,0 +1,24 @@ +/* + * 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.tests.integration.jersey_2176 { + requires jakarta.ws.rs; + requires jakarta.servlet; + requires jakarta.xml.bind; + + requires org.glassfish.jersey.core.common; + requires org.glassfish.jersey.core.server; +} \ No newline at end of file
diff --git a/tests/integration/jersey-2184/src/main/java/module-info.java b/tests/integration/jersey-2184/src/main/java/module-info.java new file mode 100644 index 0000000..6645ae5 --- /dev/null +++ b/tests/integration/jersey-2184/src/main/java/module-info.java
@@ -0,0 +1,21 @@ +/* + * 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.tests.integration.jersey_2184 { + requires jakarta.servlet; + requires jakarta.ws.rs; + requires jakarta.xml.bind; +} \ No newline at end of file
diff --git a/tests/integration/jersey-2255/src/main/java/module-info.java b/tests/integration/jersey-2255/src/main/java/module-info.java new file mode 100644 index 0000000..c9d1889 --- /dev/null +++ b/tests/integration/jersey-2255/src/main/java/module-info.java
@@ -0,0 +1,25 @@ +/* + * 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.tests.integration.jersey_2255 { + requires jakarta.ws.rs; + requires jakarta.xml.bind; + requires org.glassfish.jersey.core.common; + requires org.glassfish.jersey.core.server; + requires org.glassfish.jersey.ext.entity.filtering; + + opens org.glassfish.jersey.tests.integration.jersey2255; +} \ No newline at end of file
diff --git a/tests/integration/jersey-2322/src/main/java/module-info.txt b/tests/integration/jersey-2322/src/main/java/module-info.txt new file mode 100644 index 0000000..2bcefdc --- /dev/null +++ b/tests/integration/jersey-2322/src/main/java/module-info.txt
@@ -0,0 +1,23 @@ +/* + * 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 + */ +//TODO - fixme as soon as json-jackson module is modularized +module org.glassfish.jersey.tests.integration.jersey_2322 { + requires com.fasterxml.jackson.databind; + + requires jakarta.ws.rs; + + requires org.glassfish.jersey.core.server; +} \ No newline at end of file
diff --git a/tests/integration/jersey-2335/src/main/java/module-info.java b/tests/integration/jersey-2335/src/main/java/module-info.java new file mode 100644 index 0000000..d38396c --- /dev/null +++ b/tests/integration/jersey-2335/src/main/java/module-info.java
@@ -0,0 +1,25 @@ +/* + * 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.tests.integration.jersey_2335 { + requires jakarta.ws.rs; + requires jakarta.xml.bind; + + requires org.glassfish.jersey.core.common; + requires org.glassfish.jersey.core.server; + + opens org.glassfish.jersey.tests.integration.jersey2335; +} \ No newline at end of file
diff --git a/tests/integration/jersey-2551/src/main/java/module-info.java b/tests/integration/jersey-2551/src/main/java/module-info.java new file mode 100644 index 0000000..346a629 --- /dev/null +++ b/tests/integration/jersey-2551/src/main/java/module-info.java
@@ -0,0 +1,26 @@ +/* + * 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.tests.integration.jersey_2551 { + requires jakarta.inject; + requires jakarta.ws.rs; + requires jakarta.xml.bind; + + requires org.glassfish.hk2.api; + requires org.glassfish.hk2.locator; + + requires org.glassfish.jersey.core.server; +} \ No newline at end of file
diff --git a/tests/integration/jersey-2612/src/main/java/module-info.java b/tests/integration/jersey-2612/src/main/java/module-info.java new file mode 100644 index 0000000..578bd03 --- /dev/null +++ b/tests/integration/jersey-2612/src/main/java/module-info.java
@@ -0,0 +1,26 @@ +/* + * 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.tests.integration.jersey_2612 { + requires jakarta.inject; + requires jakarta.ws.rs; + requires jakarta.xml.bind; + + requires guava; + + requires org.glassfish.jersey.core.common; + requires org.glassfish.jersey.core.server; +} \ No newline at end of file
diff --git a/tests/integration/jersey-2637/src/main/java/module-info.java b/tests/integration/jersey-2637/src/main/java/module-info.java new file mode 100644 index 0000000..1568de5 --- /dev/null +++ b/tests/integration/jersey-2637/src/main/java/module-info.java
@@ -0,0 +1,23 @@ +/* + * 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.tests.integration.jersey_2637 { + requires jakarta.servlet; + requires jakarta.ws.rs; + requires jakarta.xml.bind; + + requires org.glassfish.jersey.core.server; +} \ No newline at end of file
diff --git a/tests/integration/jersey-2654/src/main/java/module-info.java b/tests/integration/jersey-2654/src/main/java/module-info.java new file mode 100644 index 0000000..c2d5306 --- /dev/null +++ b/tests/integration/jersey-2654/src/main/java/module-info.java
@@ -0,0 +1,20 @@ +/* + * 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.tests.integration.jersey_2654 { + requires jakarta.ws.rs; +// requires jakarta.xml.bind; +} \ No newline at end of file
diff --git a/tests/integration/jersey-2704/pom.xml b/tests/integration/jersey-2704/pom.xml index a6aae38..0340123 100644 --- a/tests/integration/jersey-2704/pom.xml +++ b/tests/integration/jersey-2704/pom.xml
@@ -50,6 +50,12 @@ <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 new file mode 100644 index 0000000..f040289 --- /dev/null +++ b/tests/integration/jersey-2704/src/main/java/module-info.java
@@ -0,0 +1,30 @@ +/* + * 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.tests.integration.jersey_2704 { + requires jakarta.inject; + requires jakarta.persistence; + requires jakarta.servlet; + requires jakarta.ws.rs; + requires jakarta.xml.bind; + + requires org.glassfish.hk2.api; + + requires org.glassfish.jersey.core.common; + requires org.glassfish.jersey.core.server; + + requires org.glassfish.jersey.container.servlet.core; +} \ No newline at end of file