diff --git a/bundles/apidocs/pom.xml b/bundles/apidocs/pom.xml index 58c4485a71..635cb94f35 100644 --- a/bundles/apidocs/pom.xml +++ b/bundles/apidocs/pom.xml @@ -297,6 +297,7 @@ org.glassfish.jersey.*:* *.innate:*.innate.* + true diff --git a/connectors/jetty-connector/pom.xml b/connectors/jetty-connector/pom.xml index d8436b5297..b5a3f9fc94 100644 --- a/connectors/jetty-connector/pom.xml +++ b/connectors/jetty-connector/pom.xml @@ -44,17 +44,6 @@ - - org.eclipse.jetty - jetty-client - - - org.slf4j - slf4j-api - - - - org.glassfish.jersey.media jersey-media-jaxb @@ -155,6 +144,18 @@ ${jetty11.version} + + + org.eclipse.jetty + jetty-client + + + org.slf4j + slf4j-api + + + + ${java11.build.outputDirectory} @@ -192,6 +193,18 @@ [17,) + + + org.eclipse.jetty + jetty-client + + + org.slf4j + slf4j-api + + + + ${java17.build.outputDirectory} diff --git a/connectors/jetty-connector/src/main/java17/module-info.java b/connectors/jetty-connector/src/main/java/module-info.java similarity index 93% rename from connectors/jetty-connector/src/main/java17/module-info.java rename to connectors/jetty-connector/src/main/java/module-info.java index 67f8b4bd18..89f42eb7ab 100644 --- a/connectors/jetty-connector/src/main/java17/module-info.java +++ b/connectors/jetty-connector/src/main/java/module-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2024 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 diff --git a/containers/grizzly2-servlet/src/main/java/module-info.java b/containers/grizzly2-servlet/src/main/java/module-info.java index 07712cd20f..f114421518 100644 --- a/containers/grizzly2-servlet/src/main/java/module-info.java +++ b/containers/grizzly2-servlet/src/main/java/module-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, 2023 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2024 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 diff --git a/core-common/src/main/java/module-info.java b/core-common/src/main/java/module-info.java index 7af8951672..84b84dec1e 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, 2023 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2024 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 diff --git a/core-server/src/test/java/org/glassfish/jersey/server/internal/scanning/JarFileScannerTest.java b/core-server/src/test/java/org/glassfish/jersey/server/internal/scanning/JarFileScannerTest.java index c85d1b2d66..e2d42eccbf 100644 --- a/core-server/src/test/java/org/glassfish/jersey/server/internal/scanning/JarFileScannerTest.java +++ b/core-server/src/test/java/org/glassfish/jersey/server/internal/scanning/JarFileScannerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2023 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2024 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 diff --git a/ext/cdi/jersey-cdi1x-transaction/pom.xml b/ext/cdi/jersey-cdi1x-transaction/pom.xml index 580ff73a1b..2509e00b3a 100644 --- a/ext/cdi/jersey-cdi1x-transaction/pom.xml +++ b/ext/cdi/jersey-cdi1x-transaction/pom.xml @@ -65,6 +65,16 @@ jakarta.enterprise jakarta.enterprise.cdi-api + + + jakarta.annotation + jakarta.annotation-api + + + jakarta.el + jakarta.el-api + + diff --git a/pom.xml b/pom.xml index 557fad53cb..07510ac6be 100644 --- a/pom.xml +++ b/pom.xml @@ -579,6 +579,7 @@ etc/config/checkstyle.xml etc/config/checkstyle-suppressions.xml ${project.build.directory}/checkstyle/checkstyle-result.xml + **/module-info.java diff --git a/tests/integration/async-jersey-filter/src/test/java/module-info.java b/tests/integration/async-jersey-filter/src/test/java/module-info.java index 55d2d87aa9..3d48ae1a6e 100644 --- a/tests/integration/async-jersey-filter/src/test/java/module-info.java +++ b/tests/integration/async-jersey-filter/src/test/java/module-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, 2023 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 2024 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 diff --git a/tests/integration/client-connector-provider/src/test/java/module-info.java b/tests/integration/client-connector-provider/src/test/java/module-info.java index c306f6a1a4..5000e221c2 100644 --- a/tests/integration/client-connector-provider/src/test/java/module-info.java +++ b/tests/integration/client-connector-provider/src/test/java/module-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2023, 2024 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 diff --git a/tests/integration/jersey-2255/src/test/java/module-info.java b/tests/integration/jersey-2255/src/test/java/module-info.java index 5d4f2fd4d7..86ca4de799 100644 --- a/tests/integration/jersey-2255/src/test/java/module-info.java +++ b/tests/integration/jersey-2255/src/test/java/module-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2023, 2024 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 diff --git a/tests/integration/jersey-4099/src/test/java/module-info.java b/tests/integration/jersey-4099/src/test/java/module-info.java index 9a2560c7ff..eeea072db8 100644 --- a/tests/integration/jersey-4099/src/test/java/module-info.java +++ b/tests/integration/jersey-4099/src/test/java/module-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2023, 2024 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 diff --git a/tests/integration/jersey-5087/pom.xml b/tests/integration/jersey-5087/pom.xml index 7b51fae4bc..2c7cce8b08 100644 --- a/tests/integration/jersey-5087/pom.xml +++ b/tests/integration/jersey-5087/pom.xml @@ -81,6 +81,12 @@ org.glassfish.jersey.connectors jersey-jetty-connector + + + org.slf4j + slf4j-api + + org.glassfish.jersey.connectors @@ -330,4 +336,15 @@ true + + + jdk_11_17 + + [11,17) + + + 2.0.13 + + + \ No newline at end of file