From 5eb30b61bbcb23fe32a0803573e3b0d4581ce972 Mon Sep 17 00:00:00 2001 From: Lachlan Roberts Date: Tue, 21 Sep 2021 09:33:13 +1000 Subject: [PATCH 01/17] Issue #6100 - fix flaky test MavenMetadataTest Signed-off-by: Lachlan Roberts --- .../org/eclipse/jetty/start/fileinits/MavenMetadataTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jetty-start/src/test/java/org/eclipse/jetty/start/fileinits/MavenMetadataTest.java b/jetty-start/src/test/java/org/eclipse/jetty/start/fileinits/MavenMetadataTest.java index 7bb9c8b3e72..068022c9e14 100644 --- a/jetty-start/src/test/java/org/eclipse/jetty/start/fileinits/MavenMetadataTest.java +++ b/jetty-start/src/test/java/org/eclipse/jetty/start/fileinits/MavenMetadataTest.java @@ -79,7 +79,7 @@ public class MavenMetadataTest @Test public void testIsExpiredTimestampYesterday() { - LocalDateTime yesterday = LocalDateTime.now().minusDays(1); + LocalDateTime yesterday = LocalDateTime.now(ZoneId.of("UTC")).minusDays(1); String timestamp = getTimestampFormatter().format(yesterday); assertTrue(MavenMetadata.isExpiredTimestamp(timestamp), "Timestamp should be stale: " + timestamp); } From 920feab979e18edd4ccfe1de01340bb751b385f0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 23 Sep 2021 09:17:09 +0000 Subject: [PATCH 02/17] Bump google-cloud-datastore from 2.1.0 to 2.1.2 Bumps [google-cloud-datastore](https://github.com/googleapis/java-datastore) from 2.1.0 to 2.1.2. - [Release notes](https://github.com/googleapis/java-datastore/releases) - [Changelog](https://github.com/googleapis/java-datastore/blob/master/CHANGELOG.md) - [Commits](https://github.com/googleapis/java-datastore/compare/v2.1.0...v2.1.2) --- updated-dependencies: - dependency-name: com.google.cloud:google-cloud-datastore dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- jetty-gcloud/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jetty-gcloud/pom.xml b/jetty-gcloud/pom.xml index 0120ea28385..c4c1e8b57dd 100644 --- a/jetty-gcloud/pom.xml +++ b/jetty-gcloud/pom.xml @@ -13,7 +13,7 @@ Jetty :: GCloud - 2.1.0 + 2.1.2 From 59ebbb635eeb7efd68ff77aff7d120f80251f405 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 23 Sep 2021 09:18:19 +0000 Subject: [PATCH 03/17] Bump jetty-test-helper from 5.8 to 5.9 Bumps [jetty-test-helper](https://github.com/eclipse/jetty.toolchain) from 5.8 to 5.9. - [Release notes](https://github.com/eclipse/jetty.toolchain/releases) - [Commits](https://github.com/eclipse/jetty.toolchain/compare/jetty-test-helper-5.8...jetty-test-helper-5.9) --- updated-dependencies: - dependency-name: org.eclipse.jetty.toolchain:jetty-test-helper dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fa5e463a9d4..40f4b98725b 100644 --- a/pom.xml +++ b/pom.xml @@ -82,7 +82,7 @@ 1.0.7 4.0.6 1.2 - 5.8 + 5.9 1.33 5.9.0 0.10.2 From 643aaf9f95cbcec547aeafd8850cc3fb59998c77 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 23 Sep 2021 09:18:39 +0000 Subject: [PATCH 04/17] Bump jamon.version from 2.81 to 2.82 Bumps `jamon.version` from 2.81 to 2.82. Updates `jamon` from 2.81 to 2.82 Updates `jamon_war` from 2.81 to 2.82 --- updated-dependencies: - dependency-name: com.jamonapi:jamon dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.jamonapi:jamon_war dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fa5e463a9d4..32262df2bca 100644 --- a/pom.xml +++ b/pom.xml @@ -68,7 +68,7 @@ 2.3.3 2.3.5 1.1.2 - 2.81 + 2.82 1.1.0.v201105071233 2.0 1.4.1.v201005082020 From 3a82c7d2efdbdbb538a34bc10836908dfb1abe71 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 23 Sep 2021 10:44:05 +0000 Subject: [PATCH 05/17] Bump junit.version from 5.8.0 to 5.8.1 Bumps `junit.version` from 5.8.0 to 5.8.1. Updates `junit-bom` from 5.8.0 to 5.8.1 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.8.0...r5.8.1) Updates `junit-vintage-engine` from 5.8.0 to 5.8.1 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.8.0...r5.8.1) --- updated-dependencies: - dependency-name: org.junit:junit-bom dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.junit.vintage:junit-vintage-engine dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fa5e463a9d4..2caa2eae832 100644 --- a/pom.xml +++ b/pom.xml @@ -94,7 +94,7 @@ 1.1.1 2.4.7 9.0.52 - 5.8.0 + 5.8.1 2.0.1 1.2.17 2.14.0 From feb11d05953337288b45dff17e5ad0fe6531caa5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 23 Sep 2021 10:45:48 +0000 Subject: [PATCH 06/17] Bump jakarta.inject-api from 1.0 to 1.0.3 Bumps [jakarta.inject-api](https://github.com/eclipse-ee4j/injection-api) from 1.0 to 1.0.3. - [Release notes](https://github.com/eclipse-ee4j/injection-api/releases) - [Commits](https://github.com/eclipse-ee4j/injection-api/compare/1.0...1.0.3) --- updated-dependencies: - dependency-name: jakarta.inject:jakarta.inject-api dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fa5e463a9d4..b9d2daee126 100644 --- a/pom.xml +++ b/pom.xml @@ -1072,7 +1072,7 @@ jakarta.inject jakarta.inject-api - 1.0 + 1.0.3 jakarta.servlet From 9461706e0331e6fde8de7f0ebc55fcc196d419fa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 23 Sep 2021 10:46:09 +0000 Subject: [PATCH 07/17] Bump hawtio-default from 2.13.5 to 2.13.6 Bumps [hawtio-default](https://github.com/hawtio/hawtio) from 2.13.5 to 2.13.6. - [Release notes](https://github.com/hawtio/hawtio/releases) - [Changelog](https://github.com/hawtio/hawtio/blob/master/CHANGES.md) - [Commits](https://github.com/hawtio/hawtio/compare/hawtio-2.13.5...hawtio-2.13.6) --- updated-dependencies: - dependency-name: io.hawt:hawtio-default dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fa5e463a9d4..270da12ed6c 100644 --- a/pom.xml +++ b/pom.xml @@ -50,7 +50,7 @@ 30.1.1-jre 5.0.1 2.2 - 2.13.5 + 2.13.6 4.2.2 11.0.11.Final 4.3.4.Final From b0752282484f43db2d7c5937e6507e87fbbbda7e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 23 Sep 2021 11:11:32 +0000 Subject: [PATCH 08/17] Bump log4j-api from 2.14.0 to 2.14.1 Bumps log4j-api from 2.14.0 to 2.14.1. --- updated-dependencies: - dependency-name: org.apache.logging.log4j:log4j-api dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 40f4b98725b..d441a01168d 100644 --- a/pom.xml +++ b/pom.xml @@ -68,7 +68,7 @@ 2.3.3 2.3.5 1.1.2 - 2.81 + 2.82 1.1.0.v201105071233 2.0 1.4.1.v201005082020 @@ -97,7 +97,7 @@ 5.8.0 2.0.1 1.2.17 - 2.14.0 + 2.14.1 1.3.0-alpha9 2.7.4 10.3.6 From 1310bb710aebc1d0ca841333b57ad5f9c50e461d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 23 Sep 2021 12:38:32 +0000 Subject: [PATCH 09/17] Bump grpc-core from 1.40.1 to 1.41.0 Bumps [grpc-core](https://github.com/grpc/grpc-java) from 1.40.1 to 1.41.0. - [Release notes](https://github.com/grpc/grpc-java/releases) - [Commits](https://github.com/grpc/grpc-java/compare/v1.40.1...v1.41.0) --- updated-dependencies: - dependency-name: io.grpc:grpc-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 8041ab8aac8..48a6fe5a505 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ 1.3 1.1.1 2.9.0 - 1.40.1 + 1.41.0 2.8.8 30.1.1-jre 5.0.1 @@ -1072,7 +1072,7 @@ jakarta.inject jakarta.inject-api - 1.0 + 1.0.3 jakarta.servlet From 46af92099e0b445f3238807c3875bf7d551773de Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 23 Sep 2021 13:42:46 +0000 Subject: [PATCH 10/17] Bump logback-core from 1.3.0-alpha9 to 1.3.0-alpha10 Bumps [logback-core](https://github.com/qos-ch/logback) from 1.3.0-alpha9 to 1.3.0-alpha10. - [Release notes](https://github.com/qos-ch/logback/releases) - [Commits](https://github.com/qos-ch/logback/compare/v_1.3.0-alpha9...v_1.3.0-alpha10) --- updated-dependencies: - dependency-name: ch.qos.logback:logback-core dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4f45c8fd355..0fcd8933124 100644 --- a/pom.xml +++ b/pom.xml @@ -98,7 +98,7 @@ 2.0.1 1.2.17 2.14.1 - 1.3.0-alpha9 + 1.3.0-alpha10 2.7.4 10.3.6 3.8.2 From 52fc22fd89cbc5e15c5adcbe398bdf90065c976d Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Thu, 23 Sep 2021 10:29:23 -0500 Subject: [PATCH 11/17] Restore accidentally removed `` + Fix upper bound deps that were missed without it Signed-off-by: Joakim Erdfelt --- pom.xml | 7 +++++++ tests/test-cdi/pom.xml | 4 ++++ tests/test-webapps/test-weld-cdi-webapp/pom.xml | 6 ++++++ 3 files changed, 17 insertions(+) diff --git a/pom.xml b/pom.xml index 4f45c8fd355..8c29df04477 100644 --- a/pom.xml +++ b/pom.xml @@ -57,6 +57,7 @@ 2.9.10.7 1.2.2 1.3.5 + 3.0.3 2.0.2 1.3.3 4.0.4 @@ -295,6 +296,7 @@ + @@ -1054,6 +1056,11 @@ ${hawtio.version} war + + jakarta.el + jakarta.el-api + ${jakarta.el-api.version} + jakarta.enterprise jakarta.enterprise.cdi-api diff --git a/tests/test-cdi/pom.xml b/tests/test-cdi/pom.xml index 1e004b7c2a9..82a0f4a5aeb 100644 --- a/tests/test-cdi/pom.xml +++ b/tests/test-cdi/pom.xml @@ -47,6 +47,10 @@ io.undertow * + + javax.enterprise + cdi-api + diff --git a/tests/test-webapps/test-weld-cdi-webapp/pom.xml b/tests/test-webapps/test-weld-cdi-webapp/pom.xml index c7e55b2e05e..1257860c95b 100644 --- a/tests/test-webapps/test-weld-cdi-webapp/pom.xml +++ b/tests/test-webapps/test-weld-cdi-webapp/pom.xml @@ -34,6 +34,12 @@ org.jboss.weld.servlet weld-servlet-core ${weld.version} + + + javax.enterprise + cdi-api + + From 99528fd17d6c57887a9f1ff9f542acc190b030ed Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Fri, 24 Sep 2021 11:58:57 +1000 Subject: [PATCH 12/17] fix directory name interpolation of mod file was not working (#6918) Signed-off-by: Olivier Lamy --- jetty-infinispan/infinispan-embedded/pom.xml | 19 +------------------ .../src/main/assembly/config.xml | 4 ++-- .../infinispan/infinispan-embedded.xml | 0 .../modules/infinispan-embedded.mod | 0 .../session-store-infinispan-embedded.mod | 0 .../embedded/infinispan-embedded-libs.mod | 0 .../infinispan-embedded-serverclasses.mod | 0 .../infinispan/embedded/infinispan.xml | 0 8 files changed, 3 insertions(+), 20 deletions(-) rename jetty-infinispan/infinispan-embedded/src/main/{config-templates => config-template}/etc/sessions/infinispan/infinispan-embedded.xml (100%) rename jetty-infinispan/infinispan-embedded/src/main/{config-templates => config-template}/modules/infinispan-embedded.mod (100%) rename jetty-infinispan/infinispan-embedded/src/main/{config-templates => config-template}/modules/session-store-infinispan-embedded.mod (100%) rename jetty-infinispan/infinispan-embedded/src/main/{config-templates => config-template}/modules/sessions/infinispan/embedded/infinispan-embedded-libs.mod (100%) rename jetty-infinispan/infinispan-embedded/src/main/{config-templates => config-template}/modules/sessions/infinispan/embedded/infinispan-embedded-serverclasses.mod (100%) rename jetty-infinispan/infinispan-embedded/src/main/{config-templates => config-template}/modules/sessions/infinispan/embedded/infinispan.xml (100%) diff --git a/jetty-infinispan/infinispan-embedded/pom.xml b/jetty-infinispan/infinispan-embedded/pom.xml index ef4569f642b..5305c9731bb 100644 --- a/jetty-infinispan/infinispan-embedded/pom.xml +++ b/jetty-infinispan/infinispan-embedded/pom.xml @@ -61,7 +61,7 @@ - + @@ -70,23 +70,6 @@ - - org.apache.maven.plugins - maven-assembly-plugin - - - package - - single - - - - src/main/assembly/config.xml - - - - - diff --git a/jetty-infinispan/infinispan-embedded/src/main/assembly/config.xml b/jetty-infinispan/infinispan-embedded/src/main/assembly/config.xml index 491f84e6116..93917acb50e 100644 --- a/jetty-infinispan/infinispan-embedded/src/main/assembly/config.xml +++ b/jetty-infinispan/infinispan-embedded/src/main/assembly/config.xml @@ -7,7 +7,7 @@ - src/main/config-templates + ${project.build.directory}/jetty-config-files ** @@ -17,7 +17,7 @@ - target + ${project.build.directory} modules/sessions/infinispan/embedded infinispan-embedded-libs.mod diff --git a/jetty-infinispan/infinispan-embedded/src/main/config-templates/etc/sessions/infinispan/infinispan-embedded.xml b/jetty-infinispan/infinispan-embedded/src/main/config-template/etc/sessions/infinispan/infinispan-embedded.xml similarity index 100% rename from jetty-infinispan/infinispan-embedded/src/main/config-templates/etc/sessions/infinispan/infinispan-embedded.xml rename to jetty-infinispan/infinispan-embedded/src/main/config-template/etc/sessions/infinispan/infinispan-embedded.xml diff --git a/jetty-infinispan/infinispan-embedded/src/main/config-templates/modules/infinispan-embedded.mod b/jetty-infinispan/infinispan-embedded/src/main/config-template/modules/infinispan-embedded.mod similarity index 100% rename from jetty-infinispan/infinispan-embedded/src/main/config-templates/modules/infinispan-embedded.mod rename to jetty-infinispan/infinispan-embedded/src/main/config-template/modules/infinispan-embedded.mod diff --git a/jetty-infinispan/infinispan-embedded/src/main/config-templates/modules/session-store-infinispan-embedded.mod b/jetty-infinispan/infinispan-embedded/src/main/config-template/modules/session-store-infinispan-embedded.mod similarity index 100% rename from jetty-infinispan/infinispan-embedded/src/main/config-templates/modules/session-store-infinispan-embedded.mod rename to jetty-infinispan/infinispan-embedded/src/main/config-template/modules/session-store-infinispan-embedded.mod diff --git a/jetty-infinispan/infinispan-embedded/src/main/config-templates/modules/sessions/infinispan/embedded/infinispan-embedded-libs.mod b/jetty-infinispan/infinispan-embedded/src/main/config-template/modules/sessions/infinispan/embedded/infinispan-embedded-libs.mod similarity index 100% rename from jetty-infinispan/infinispan-embedded/src/main/config-templates/modules/sessions/infinispan/embedded/infinispan-embedded-libs.mod rename to jetty-infinispan/infinispan-embedded/src/main/config-template/modules/sessions/infinispan/embedded/infinispan-embedded-libs.mod diff --git a/jetty-infinispan/infinispan-embedded/src/main/config-templates/modules/sessions/infinispan/embedded/infinispan-embedded-serverclasses.mod b/jetty-infinispan/infinispan-embedded/src/main/config-template/modules/sessions/infinispan/embedded/infinispan-embedded-serverclasses.mod similarity index 100% rename from jetty-infinispan/infinispan-embedded/src/main/config-templates/modules/sessions/infinispan/embedded/infinispan-embedded-serverclasses.mod rename to jetty-infinispan/infinispan-embedded/src/main/config-template/modules/sessions/infinispan/embedded/infinispan-embedded-serverclasses.mod diff --git a/jetty-infinispan/infinispan-embedded/src/main/config-templates/modules/sessions/infinispan/embedded/infinispan.xml b/jetty-infinispan/infinispan-embedded/src/main/config-template/modules/sessions/infinispan/embedded/infinispan.xml similarity index 100% rename from jetty-infinispan/infinispan-embedded/src/main/config-templates/modules/sessions/infinispan/embedded/infinispan.xml rename to jetty-infinispan/infinispan-embedded/src/main/config-template/modules/sessions/infinispan/embedded/infinispan.xml From a7a4b30f1f16a2ad859f0d64b954bc4f8ddfcc92 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 24 Sep 2021 09:22:06 +0000 Subject: [PATCH 13/17] Bump hawtio-default from 2.13.6 to 2.14.0 Bumps [hawtio-default](https://github.com/hawtio/hawtio) from 2.13.6 to 2.14.0. - [Release notes](https://github.com/hawtio/hawtio/releases) - [Changelog](https://github.com/hawtio/hawtio/blob/master/CHANGES.md) - [Commits](https://github.com/hawtio/hawtio/compare/hawtio-2.13.6...hawtio-2.14.0) --- updated-dependencies: - dependency-name: io.hawt:hawtio-default dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3984796ef1f..c75d71816c5 100644 --- a/pom.xml +++ b/pom.xml @@ -50,7 +50,7 @@ 30.1.1-jre 5.0.1 2.2 - 2.13.6 + 2.14.0 4.2.2 11.0.11.Final 4.3.4.Final From e9a47faeb358ba8a9b2ad4389113c4d1c04d9023 Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Mon, 27 Sep 2021 20:16:08 +0200 Subject: [PATCH 14/17] Issue #6558 - Allow configuring return type in JSON array parsing. Updated JSON implementation to keep backward compatibility by calling newArray(), now deprecated. Signed-off-by: Simone Bordet (cherry picked from commit 1d542be610b9d7def8fb5080f6e9cd492d6838bb) --- .../main/java/org/eclipse/jetty/util/ajax/JSON.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/jetty-util-ajax/src/main/java/org/eclipse/jetty/util/ajax/JSON.java b/jetty-util-ajax/src/main/java/org/eclipse/jetty/util/ajax/JSON.java index 719745c2736..42368a9218d 100644 --- a/jetty-util-ajax/src/main/java/org/eclipse/jetty/util/ajax/JSON.java +++ b/jetty-util-ajax/src/main/java/org/eclipse/jetty/util/ajax/JSON.java @@ -27,6 +27,7 @@ import java.util.Map; import java.util.Objects; import java.util.concurrent.ConcurrentHashMap; import java.util.function.Function; +import java.util.stream.IntStream; import org.eclipse.jetty.util.Loader; import org.eclipse.jetty.util.TypeUtil; @@ -84,7 +85,7 @@ public class JSON private final Map _convertors = new ConcurrentHashMap<>(); private int _stringBufferSize = 1024; - private Function, Object> _arrayConverter = List::toArray; + private Function, Object> _arrayConverter = this::defaultArrayConverter; /** * @return the initial stringBuffer size to use when creating JSON strings @@ -937,6 +938,14 @@ public class JSON return map; } + private Object defaultArrayConverter(List list) + { + // Call newArray() to keep backward compatibility. + Object[] objects = newArray(list.size()); + IntStream.range(0, list.size()).forEach(i -> objects[i] = list.get(i)); + return objects; + } + protected Object parseArray(Source source) { if (source.next() != '[') From 7ad12db3e441608e12bdb10583481c5394253071 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 28 Sep 2021 09:20:48 +0000 Subject: [PATCH 15/17] Bump guava from 30.1.1-jre to 31.0.1-jre Bumps [guava](https://github.com/google/guava) from 30.1.1-jre to 31.0.1-jre. - [Release notes](https://github.com/google/guava/releases) - [Commits](https://github.com/google/guava/commits) --- updated-dependencies: - dependency-name: com.google.guava:guava dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c75d71816c5..7297e51a98a 100644 --- a/pom.xml +++ b/pom.xml @@ -47,7 +47,7 @@ 2.9.0 1.41.0 2.8.8 - 30.1.1-jre + 31.0.1-jre 5.0.1 2.2 2.14.0 From 51d44a3401e9d3efdb94aabcbf0964d7e8e4b78a Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Thu, 30 Sep 2021 16:57:19 +1000 Subject: [PATCH 16/17] use dependencyManagement for internal dependencies (#6940) Signed-off-by: Olivier Lamy --- apache-jsp/pom.xml | 3 - apache-jstl/pom.xml | 3 - .../demo-async-rest-jar/pom.xml | 2 - .../demo-async-rest-server/pom.xml | 1 - .../demo-async-rest-webapp/pom.xml | 1 - demos/demo-jetty-webapp/pom.xml | 6 - demos/demo-jndi-webapp/pom.xml | 4 +- demos/demo-mock-resources/pom.xml | 1 - demos/demo-proxy-webapp/pom.xml | 7 - demos/demo-spec/demo-spec-webapp/pom.xml | 2 - demos/embedded/pom.xml | 21 - .../jetty-asciidoctor-extensions/pom.xml | 1 - documentation/jetty-documentation/pom.xml | 17 - javadoc/pom.xml | 42 -- .../jetty-alpn-conscrypt-client/pom.xml | 4 - .../jetty-alpn-conscrypt-server/pom.xml | 7 - jetty-alpn/jetty-alpn-java-client/pom.xml | 2 - jetty-alpn/jetty-alpn-java-server/pom.xml | 2 - jetty-annotations/pom.xml | 2 - jetty-ant/pom.xml | 3 - jetty-cdi/pom.xml | 22 +- jetty-client/pom.xml | 3 - jetty-deploy/pom.xml | 3 - jetty-fcgi/fcgi-client/pom.xml | 2 - jetty-fcgi/fcgi-server/pom.xml | 7 - .../jetty-gcloud-session-manager/pom.xml | 11 +- jetty-hazelcast/pom.xml | 2 - jetty-home/pom.xml | 34 +- jetty-http-spi/pom.xml | 2 - jetty-http/pom.xml | 1 - jetty-http2/http2-client/pom.xml | 6 - jetty-http2/http2-common/pom.xml | 10 +- jetty-http2/http2-hpack/pom.xml | 3 - .../http2-http-client-transport/pom.xml | 5 - jetty-http2/http2-server/pom.xml | 4 - jetty-infinispan/infinispan-common/pom.xml | 1 - .../infinispan-embedded-query/pom.xml | 1 - jetty-infinispan/infinispan-embedded/pom.xml | 1 - .../infinispan-remote-query/pom.xml | 1 - jetty-infinispan/infinispan-remote/pom.xml | 2 - jetty-io/pom.xml | 2 - jetty-jaas/pom.xml | 1 - jetty-jaspi/pom.xml | 1 - jetty-jmx/pom.xml | 1 - jetty-jndi/pom.xml | 2 - jetty-jspc-maven-plugin/pom.xml | 1 - jetty-keystore/pom.xml | 1 - jetty-maven-plugin/pom.xml | 15 - .../jetty-memcached-sessions/pom.xml | 3 - jetty-nosql/pom.xml | 2 - jetty-openid/pom.xml | 4 - jetty-osgi/jetty-osgi-boot-jsp/pom.xml | 3 - jetty-osgi/jetty-osgi-boot-warurl/pom.xml | 1 - jetty-osgi/jetty-osgi-httpservice/pom.xml | 2 - jetty-osgi/test-jetty-osgi-server/pom.xml | 1 - jetty-osgi/test-jetty-osgi-webapp/pom.xml | 1 - jetty-osgi/test-jetty-osgi/pom.xml | 22 - jetty-plus/pom.xml | 2 - jetty-proxy/pom.xml | 6 - jetty-quickstart/pom.xml | 2 - jetty-rewrite/pom.xml | 1 - jetty-runner/pom.xml | 8 - jetty-security/pom.xml | 1 - jetty-server/pom.xml | 4 - jetty-servlet/pom.xml | 5 - jetty-servlets/pom.xml | 4 - jetty-start/pom.xml | 1 - jetty-unixdomain-server/pom.xml | 1 - .../jetty-unixsocket-client/pom.xml | 3 - .../jetty-unixsocket-common/pom.xml | 1 - .../jetty-unixsocket-server/pom.xml | 1 - jetty-util-ajax/pom.xml | 1 - jetty-webapp/pom.xml | 4 - jetty-websocket/websocket-core-client/pom.xml | 3 - jetty-websocket/websocket-core-server/pom.xml | 1 - jetty-websocket/websocket-core-tests/pom.xml | 4 - .../websocket-javax-client/pom.xml | 5 - .../websocket-javax-common/pom.xml | 1 - .../websocket-javax-server/pom.xml | 3 - jetty-websocket/websocket-javax-tests/pom.xml | 3 - .../websocket-jetty-client/pom.xml | 5 - .../websocket-jetty-common/pom.xml | 2 - .../websocket-jetty-server/pom.xml | 6 - jetty-websocket/websocket-jetty-tests/pom.xml | 9 - jetty-websocket/websocket-servlet/pom.xml | 2 - jetty-xml/pom.xml | 1 - pom.xml | 430 +++++++++++++++++- tests/jetty-jmh/pom.xml | 2 - tests/test-cdi/pom.xml | 5 - tests/test-distribution/pom.xml | 11 - tests/test-http-client-transport/pom.xml | 10 - tests/test-integration/pom.xml | 14 - tests/test-jmx/jmx-webapp-it/pom.xml | 2 - tests/test-jmx/jmx-webapp/pom.xml | 1 - .../test-jpms-websocket-core/pom.xml | 2 - tests/test-loginservice/pom.xml | 4 - tests/test-quickstart/pom.xml | 14 - .../test-sessions/test-file-sessions/pom.xml | 3 - .../test-gcloud-sessions/pom.xml | 4 - .../test-hazelcast-sessions/pom.xml | 5 - .../test-infinispan-sessions/pom.xml | 11 - .../test-sessions/test-jdbc-sessions/pom.xml | 3 - .../test-memcached-sessions/pom.xml | 4 - .../test-mongodb-sessions/pom.xml | 5 - .../test-sessions-common/pom.xml | 2 - .../test-bad-websocket-webapp/pom.xml | 1 - tests/test-webapps/test-http2-webapp/pom.xml | 6 - .../test-webapps/test-webapp-rfc2616/pom.xml | 1 - .../pom.xml | 1 - .../test-websocket-client-webapp/pom.xml | 1 - .../test-websocket-webapp/pom.xml | 1 - 111 files changed, 439 insertions(+), 509 deletions(-) diff --git a/apache-jsp/pom.xml b/apache-jsp/pom.xml index 7bc846eb24f..b63f41bd921 100644 --- a/apache-jsp/pom.xml +++ b/apache-jsp/pom.xml @@ -70,7 +70,6 @@ org.eclipse.jetty jetty-util - ${project.version} org.eclipse.jetty.toolchain @@ -83,13 +82,11 @@ org.eclipse.jetty jetty-servlet - ${project.version} test org.eclipse.jetty.tests jetty-http-tools - ${project.version} test diff --git a/apache-jstl/pom.xml b/apache-jstl/pom.xml index 54e8877a4e1..f10bec88b64 100644 --- a/apache-jstl/pom.xml +++ b/apache-jstl/pom.xml @@ -54,21 +54,18 @@ org.eclipse.jetty apache-jsp - ${project.version} test org.eclipse.jetty jetty-annotations - ${project.version} test org.eclipse.jetty jetty-webapp - ${project.version} test diff --git a/demos/demo-async-rest/demo-async-rest-jar/pom.xml b/demos/demo-async-rest/demo-async-rest-jar/pom.xml index c9d5fd22765..317aede9a35 100644 --- a/demos/demo-async-rest/demo-async-rest-jar/pom.xml +++ b/demos/demo-async-rest/demo-async-rest-jar/pom.xml @@ -18,12 +18,10 @@ org.eclipse.jetty jetty-client - ${project.version} org.eclipse.jetty jetty-util-ajax - ${project.version} org.eclipse.jetty.toolchain diff --git a/demos/demo-async-rest/demo-async-rest-server/pom.xml b/demos/demo-async-rest/demo-async-rest-server/pom.xml index 4f42b6da8ba..7adece69032 100644 --- a/demos/demo-async-rest/demo-async-rest-server/pom.xml +++ b/demos/demo-async-rest/demo-async-rest-server/pom.xml @@ -18,7 +18,6 @@ org.eclipse.jetty jetty-webapp - ${project.version} diff --git a/demos/demo-async-rest/demo-async-rest-webapp/pom.xml b/demos/demo-async-rest/demo-async-rest-webapp/pom.xml index 803517d1f45..e7c709cc3da 100644 --- a/demos/demo-async-rest/demo-async-rest-webapp/pom.xml +++ b/demos/demo-async-rest/demo-async-rest-webapp/pom.xml @@ -23,7 +23,6 @@ org.eclipse.jetty.demos demo-async-rest-jar - ${project.version} org.eclipse.jetty.toolchain diff --git a/demos/demo-jetty-webapp/pom.xml b/demos/demo-jetty-webapp/pom.xml index b7f3c0e0aff..7c7dcfdb67c 100644 --- a/demos/demo-jetty-webapp/pom.xml +++ b/demos/demo-jetty-webapp/pom.xml @@ -129,7 +129,6 @@ org.eclipse.jetty jetty-servlets - ${project.version} provided @@ -140,13 +139,11 @@ org.eclipse.jetty jetty-webapp - ${project.version} test org.eclipse.jetty jetty-jmx - ${project.version} test @@ -182,19 +179,16 @@ org.eclipse.jetty.websocket websocket-jetty-api - ${project.version} provided org.eclipse.jetty.websocket websocket-jetty-server - ${project.version} provided org.eclipse.jetty.websocket websocket-javax-server - ${project.version} test diff --git a/demos/demo-jndi-webapp/pom.xml b/demos/demo-jndi-webapp/pom.xml index 7eaadc61184..564f616cd98 100644 --- a/demos/demo-jndi-webapp/pom.xml +++ b/demos/demo-jndi-webapp/pom.xml @@ -76,7 +76,7 @@ org.eclipse.jetty.orbit javax.mail.glassfish - 1.4.1.v201005082020 + ${javax.mail.glassfish.version} @@ -87,7 +87,6 @@ org.eclipse.jetty.demos demo-mock-resources - ${project.version} provided @@ -103,7 +102,6 @@ org.eclipse.jetty.orbit javax.mail.glassfish - 1.4.1.v201005082020 provided diff --git a/demos/demo-mock-resources/pom.xml b/demos/demo-mock-resources/pom.xml index d19e6afae9b..290a8dab498 100644 --- a/demos/demo-mock-resources/pom.xml +++ b/demos/demo-mock-resources/pom.xml @@ -54,7 +54,6 @@ org.eclipse.jetty.orbit javax.mail.glassfish - 1.4.1.v201005082020 provided diff --git a/demos/demo-proxy-webapp/pom.xml b/demos/demo-proxy-webapp/pom.xml index b2566ac8797..06c160f2a8e 100644 --- a/demos/demo-proxy-webapp/pom.xml +++ b/demos/demo-proxy-webapp/pom.xml @@ -37,7 +37,6 @@ org.eclipse.jetty jetty-proxy - ${project.version} org.eclipse.jetty.toolchain @@ -47,18 +46,15 @@ org.eclipse.jetty jetty-webapp - ${project.version} test org.eclipse.jetty jetty-client - ${project.version} org.eclipse.jetty jetty-jmx - ${project.version} test @@ -69,19 +65,16 @@ org.eclipse.jetty.http2 http2-server - ${project.version} test org.eclipse.jetty jetty-alpn-java-server - ${project.version} test org.eclipse.jetty jetty-annotations - ${project.version} test diff --git a/demos/demo-spec/demo-spec-webapp/pom.xml b/demos/demo-spec/demo-spec-webapp/pom.xml index 84448666c05..8de38850f6c 100644 --- a/demos/demo-spec/demo-spec-webapp/pom.xml +++ b/demos/demo-spec/demo-spec-webapp/pom.xml @@ -202,12 +202,10 @@ org.eclipse.jetty.demos demo-web-fragment - ${project.version} org.eclipse.jetty.demos demo-container-initializer - ${project.version} diff --git a/demos/embedded/pom.xml b/demos/embedded/pom.xml index 8608fcc4d53..f0a3a5b6d8f 100644 --- a/demos/embedded/pom.xml +++ b/demos/embedded/pom.xml @@ -24,57 +24,46 @@ org.eclipse.jetty jetty-util-ajax - ${project.version} org.eclipse.jetty jetty-webapp - ${project.version} org.eclipse.jetty jetty-security - ${project.version} org.eclipse.jetty jetty-servlets - ${project.version} org.eclipse.jetty jetty-deploy - ${project.version} org.eclipse.jetty jetty-rewrite - ${project.version} org.eclipse.jetty jetty-jmx - ${project.version} org.eclipse.jetty.websocket websocket-javax-server - ${project.version} org.eclipse.jetty.websocket websocket-servlet - ${project.version} org.eclipse.jetty.websocket websocket-jetty-server - ${project.version} org.eclipse.jetty.http2 http2-server - ${project.version} org.eclipse.jetty @@ -84,32 +73,26 @@ org.eclipse.jetty jetty-alpn-java-server - ${project.version} org.eclipse.jetty jetty-alpn-conscrypt-server - ${project.version} org.eclipse.jetty jetty-annotations - ${project.version} org.eclipse.jetty.demos demo-mock-resources - ${project.version} org.eclipse.jetty jetty-proxy - ${project.version} org.eclipse.jetty jetty-jaas - ${project.version} org.eclipse.jetty @@ -118,12 +101,10 @@ org.eclipse.jetty apache-jsp - ${project.version} org.eclipse.jetty apache-jstl - ${project.version} org.eclipse.jetty.orbit @@ -142,13 +123,11 @@ org.eclipse.jetty.websocket websocket-jetty-client - ${project.version} test org.eclipse.jetty jetty-home - ${project.version} zip test diff --git a/documentation/jetty-asciidoctor-extensions/pom.xml b/documentation/jetty-asciidoctor-extensions/pom.xml index 85feb7e8227..a0240dfb00b 100644 --- a/documentation/jetty-asciidoctor-extensions/pom.xml +++ b/documentation/jetty-asciidoctor-extensions/pom.xml @@ -34,7 +34,6 @@ org.eclipse.jetty.tests test-distribution - ${project.version} diff --git a/documentation/jetty-documentation/pom.xml b/documentation/jetty-documentation/pom.xml index aa0b3f05c7e..729b75f157a 100644 --- a/documentation/jetty-documentation/pom.xml +++ b/documentation/jetty-documentation/pom.xml @@ -144,22 +144,18 @@ org.eclipse.jetty jetty-alpn-server - ${project.version} org.eclipse.jetty jetty-client - ${project.version} org.eclipse.jetty jetty-jmx - ${project.version} org.eclipse.jetty jetty-rewrite - ${project.version} org.eclipse.jetty @@ -168,7 +164,6 @@ org.eclipse.jetty jetty-servlet - ${project.version} org.eclipse.jetty @@ -178,63 +173,51 @@ org.eclipse.jetty jetty-util-ajax - ${project.version} org.eclipse.jetty jetty-webapp - ${project.version} org.eclipse.jetty.fcgi fcgi-client - ${project.version} org.eclipse.jetty.http2 http2-server - ${project.version} org.eclipse.jetty.http2 http2-http-client-transport - ${project.version} org.eclipse.jetty jetty-unixdomain-server - ${project.version} org.eclipse.jetty jetty-slf4j-impl - ${project.version} runtime org.eclipse.jetty.memcached jetty-memcached-sessions - ${project.version} org.eclipse.jetty jetty-nosql - ${project.version} org.eclipse.jetty.websocket websocket-jetty-client - ${project.version} org.eclipse.jetty.websocket websocket-javax-server - ${project.version} org.eclipse.jetty.websocket websocket-jetty-server - ${project.version} diff --git a/javadoc/pom.xml b/javadoc/pom.xml index c006e2894cc..465f28271cd 100644 --- a/javadoc/pom.xml +++ b/javadoc/pom.xml @@ -148,224 +148,187 @@ org.eclipse.jetty jetty-annotations - ${project.version} provided org.eclipse.jetty jetty-ant - ${project.version} provided org.eclipse.jetty jetty-alpn-client - ${project.version} provided org.eclipse.jetty jetty-alpn-conscrypt-client - ${project.version} provided org.eclipse.jetty jetty-alpn-conscrypt-server - ${project.version} provided org.eclipse.jetty jetty-alpn-java-client - ${project.version} provided org.eclipse.jetty jetty-alpn-java-server - ${project.version} provided org.eclipse.jetty apache-jsp - ${project.version} provided org.eclipse.jetty apache-jstl - ${project.version} provided org.eclipse.jetty jetty-cdi - ${project.version} provided org.eclipse.jetty jetty-client - ${project.version} provided org.eclipse.jetty jetty-deploy - ${project.version} provided org.eclipse.jetty.fcgi fcgi-client - ${project.version} provided org.eclipse.jetty.fcgi fcgi-server - ${project.version} provided org.eclipse.jetty.gcloud jetty-gcloud-session-manager - ${project.version} provided org.eclipse.jetty jetty-http-spi - ${project.version} provided org.eclipse.jetty.http2 http2-server - ${project.version} provided org.eclipse.jetty.http2 http2-client - ${project.version} provided org.eclipse.jetty jetty-jaas - ${project.version} provided org.eclipse.jetty jetty-jaspi - ${project.version} provided org.eclipse.jetty.memcached jetty-memcached-sessions - ${project.version} provided org.eclipse.jetty jetty-nosql - ${project.version} provided org.eclipse.jetty.osgi jetty-osgi-boot - ${project.version} provided org.eclipse.jetty jetty-proxy - ${project.version} provided org.eclipse.jetty jetty-quickstart - ${project.version} provided org.eclipse.jetty jetty-rewrite ${project.version} - provided org.eclipse.jetty jetty-runner - ${project.version} provided org.eclipse.jetty jetty-openid - ${project.version} provided org.eclipse.jetty jetty-start - ${project.version} provided org.eclipse.jetty jetty-unixsocket-client - ${project.version} provided org.eclipse.jetty jetty-unixsocket-server - ${project.version} provided org.eclipse.jetty.websocket websocket-javax-server - ${project.version} provided org.eclipse.jetty.websocket websocket-javax-client - ${project.version} provided org.eclipse.jetty.websocket websocket-jetty-client - ${project.version} provided org.eclipse.jetty.websocket websocket-jetty-server - ${project.version} provided org.eclipse.jetty jetty-jmx - ${project.version} provided org.eclipse.jetty jetty-jndi - ${project.version} provided @@ -385,13 +348,11 @@ org.eclipse.jetty jetty-jspc-maven-plugin - ${project.version} provided org.eclipse.jetty jetty-maven-plugin - ${project.version} provided @@ -411,7 +372,6 @@ org.infinispan infinispan-core - ${infinispan.version} provided @@ -424,14 +384,12 @@ org.infinispan infinispan-client-hotrod - ${infinispan.version} provided org.infinispan.protostream protostream - ${infinispan.protostream.version} provided diff --git a/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml b/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml index 144d910a7b3..3f1b13f3cda 100644 --- a/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml +++ b/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml @@ -19,22 +19,18 @@ org.conscrypt conscrypt-openjdk-uber - ${conscrypt.version} org.eclipse.jetty jetty-alpn-client - ${project.version} org.slf4j slf4j-api - org.eclipse.jetty.http2 http2-client - ${project.version} test diff --git a/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml b/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml index f19fa9ee50c..07161e2c6a1 100644 --- a/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml +++ b/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml @@ -18,12 +18,10 @@ org.conscrypt conscrypt-openjdk-uber - ${conscrypt.version} org.eclipse.jetty jetty-alpn-server - ${project.version} org.eclipse.jetty @@ -41,31 +39,26 @@ org.eclipse.jetty.http2 http2-server - ${project.version} test org.eclipse.jetty jetty-alpn-conscrypt-client - ${project.version} test org.eclipse.jetty jetty-client - ${project.version} test org.eclipse.jetty.http2 http2-client - ${project.version} test org.eclipse.jetty.http2 http2-http-client-transport - ${project.version} test diff --git a/jetty-alpn/jetty-alpn-java-client/pom.xml b/jetty-alpn/jetty-alpn-java-client/pom.xml index a799751c677..c285b57f6ad 100644 --- a/jetty-alpn/jetty-alpn-java-client/pom.xml +++ b/jetty-alpn/jetty-alpn-java-client/pom.xml @@ -38,7 +38,6 @@ org.eclipse.jetty jetty-alpn-client - ${project.version} org.slf4j @@ -48,7 +47,6 @@ org.eclipse.jetty.http2 http2-client - ${project.version} test diff --git a/jetty-alpn/jetty-alpn-java-server/pom.xml b/jetty-alpn/jetty-alpn-java-server/pom.xml index cc3932c7612..64093b09cd0 100644 --- a/jetty-alpn/jetty-alpn-java-server/pom.xml +++ b/jetty-alpn/jetty-alpn-java-server/pom.xml @@ -48,7 +48,6 @@ org.eclipse.jetty jetty-alpn-server - ${project.version} org.slf4j @@ -62,7 +61,6 @@ org.eclipse.jetty.http2 http2-server - ${project.version} test diff --git a/jetty-annotations/pom.xml b/jetty-annotations/pom.xml index 8177bf6c24e..13fd65c0483 100644 --- a/jetty-annotations/pom.xml +++ b/jetty-annotations/pom.xml @@ -50,7 +50,6 @@ org.eclipse.jetty jetty-webapp - ${project.version} jakarta.annotation @@ -82,7 +81,6 @@ org.eclipse.jetty jetty-jndi - ${project.version} test diff --git a/jetty-ant/pom.xml b/jetty-ant/pom.xml index 8e5379b9544..c64c9fe72ba 100644 --- a/jetty-ant/pom.xml +++ b/jetty-ant/pom.xml @@ -74,7 +74,6 @@ org.eclipse.jetty jetty-security - ${project.version} org.eclipse.jetty @@ -83,12 +82,10 @@ org.eclipse.jetty jetty-webapp - ${project.version} org.eclipse.jetty jetty-annotations - ${project.version} org.slf4j diff --git a/jetty-cdi/pom.xml b/jetty-cdi/pom.xml index 8d10e02e16a..b67c6153669 100644 --- a/jetty-cdi/pom.xml +++ b/jetty-cdi/pom.xml @@ -16,19 +16,16 @@ org.eclipse.jetty jetty-util - ${project.version} compile org.eclipse.jetty jetty-webapp - ${project.version} compile org.eclipse.jetty jetty-annotations - ${project.version} compile @@ -57,7 +54,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M5 + ${maven.surefire.plugin.version} diff --git a/jetty-http-spi/pom.xml b/jetty-http-spi/pom.xml index 6aeb2e84d56..14a79fbcd7f 100644 --- a/jetty-http-spi/pom.xml +++ b/jetty-http-spi/pom.xml @@ -20,7 +20,6 @@ org.eclipse.jetty jetty-client - ${project.version} test @@ -36,7 +35,6 @@ org.slf4j jul-to-slf4j - ${slf4j.version} test diff --git a/jetty-http/pom.xml b/jetty-http/pom.xml index 9318511362e..be71d6f5f39 100644 --- a/jetty-http/pom.xml +++ b/jetty-http/pom.xml @@ -19,7 +19,6 @@ org.eclipse.jetty jetty-util - ${project.version} org.eclipse.jetty diff --git a/jetty-http2/http2-client/pom.xml b/jetty-http2/http2-client/pom.xml index 7b2c3e43b54..4f7d80456d2 100644 --- a/jetty-http2/http2-client/pom.xml +++ b/jetty-http2/http2-client/pom.xml @@ -32,12 +32,10 @@ org.eclipse.jetty.http2 http2-common - ${project.version} org.eclipse.jetty jetty-alpn-client - ${project.version} org.slf4j @@ -62,25 +60,21 @@ org.eclipse.jetty jetty-servlet - ${project.version} test org.eclipse.jetty jetty-servlets - ${project.version} test org.eclipse.jetty jetty-proxy - ${project.version} test org.eclipse.jetty.http2 http2-server - ${project.version} test diff --git a/jetty-http2/http2-common/pom.xml b/jetty-http2/http2-common/pom.xml index 82e0667afd5..138f59e7897 100644 --- a/jetty-http2/http2-common/pom.xml +++ b/jetty-http2/http2-common/pom.xml @@ -10,11 +10,14 @@ http2-common Jetty :: HTTP2 :: Common + + ${project.groupId}.common + + org.eclipse.jetty.http2 http2-hpack - ${project.version} org.slf4j @@ -24,7 +27,6 @@ org.eclipse.jetty jetty-jmx - ${project.version} true @@ -39,8 +41,4 @@ - - ${project.groupId}.common - - diff --git a/jetty-http2/http2-hpack/pom.xml b/jetty-http2/http2-hpack/pom.xml index 1cb36c0c7de..1e05378a2a5 100644 --- a/jetty-http2/http2-hpack/pom.xml +++ b/jetty-http2/http2-hpack/pom.xml @@ -36,7 +36,6 @@ org.eclipse.jetty jetty-util - ${project.version} org.eclipse.jetty @@ -54,7 +53,6 @@ org.eclipse.jetty.tests jetty-http-tools - ${project.version} test @@ -70,7 +68,6 @@ org.eclipse.jetty jetty-util-ajax - ${project.version} test diff --git a/jetty-http2/http2-http-client-transport/pom.xml b/jetty-http2/http2-http-client-transport/pom.xml index b9da3148078..cdc72c049b6 100644 --- a/jetty-http2/http2-http-client-transport/pom.xml +++ b/jetty-http2/http2-http-client-transport/pom.xml @@ -18,17 +18,14 @@ org.eclipse.jetty jetty-client - ${project.version} org.eclipse.jetty.http2 http2-client - ${project.version} org.eclipse.jetty jetty-alpn-java-client - ${project.version} org.slf4j @@ -38,7 +35,6 @@ org.eclipse.jetty jetty-alpn-java-server - ${project.version} test @@ -59,7 +55,6 @@ org.eclipse.jetty.http2 http2-server - ${project.version} test diff --git a/jetty-http2/http2-server/pom.xml b/jetty-http2/http2-server/pom.xml index 878c09c2ffd..62f9099ee5a 100644 --- a/jetty-http2/http2-server/pom.xml +++ b/jetty-http2/http2-server/pom.xml @@ -56,7 +56,6 @@ org.eclipse.jetty.http2 http2-common - ${project.version} org.eclipse.jetty @@ -69,19 +68,16 @@ org.eclipse.jetty jetty-servlet - ${project.version} test org.eclipse.jetty jetty-servlets - ${project.version} test org.eclipse.jetty jetty-alpn-server - ${project.version} test diff --git a/jetty-infinispan/infinispan-common/pom.xml b/jetty-infinispan/infinispan-common/pom.xml index 47f11452870..dca70a73940 100644 --- a/jetty-infinispan/infinispan-common/pom.xml +++ b/jetty-infinispan/infinispan-common/pom.xml @@ -48,7 +48,6 @@ org.infinispan.protostream protostream - ${infinispan.protostream.version} true provided diff --git a/jetty-infinispan/infinispan-embedded-query/pom.xml b/jetty-infinispan/infinispan-embedded-query/pom.xml index 20d96ec8945..c04502f467a 100644 --- a/jetty-infinispan/infinispan-embedded-query/pom.xml +++ b/jetty-infinispan/infinispan-embedded-query/pom.xml @@ -74,7 +74,6 @@ org.eclipse.jetty infinispan-common - ${project.version} org.infinispan diff --git a/jetty-infinispan/infinispan-embedded/pom.xml b/jetty-infinispan/infinispan-embedded/pom.xml index 5305c9731bb..b250c44d10a 100644 --- a/jetty-infinispan/infinispan-embedded/pom.xml +++ b/jetty-infinispan/infinispan-embedded/pom.xml @@ -76,7 +76,6 @@ org.eclipse.jetty infinispan-common - ${project.version} org.infinispan diff --git a/jetty-infinispan/infinispan-remote-query/pom.xml b/jetty-infinispan/infinispan-remote-query/pom.xml index 823052c475a..77635d4dd15 100644 --- a/jetty-infinispan/infinispan-remote-query/pom.xml +++ b/jetty-infinispan/infinispan-remote-query/pom.xml @@ -84,7 +84,6 @@ org.eclipse.jetty infinispan-common - ${project.version} org.infinispan diff --git a/jetty-infinispan/infinispan-remote/pom.xml b/jetty-infinispan/infinispan-remote/pom.xml index 36e8106322a..7b6f86cc6da 100644 --- a/jetty-infinispan/infinispan-remote/pom.xml +++ b/jetty-infinispan/infinispan-remote/pom.xml @@ -76,7 +76,6 @@ org.eclipse.jetty infinispan-common - ${project.version} org.infinispan @@ -91,7 +90,6 @@ org.infinispan.protostream protostream - ${infinispan.protostream.version} provided diff --git a/jetty-io/pom.xml b/jetty-io/pom.xml index f58d8cd98f5..8d4115e5069 100644 --- a/jetty-io/pom.xml +++ b/jetty-io/pom.xml @@ -20,12 +20,10 @@ org.eclipse.jetty jetty-util - ${project.version} org.eclipse.jetty jetty-jmx - ${project.version} true diff --git a/jetty-jaas/pom.xml b/jetty-jaas/pom.xml index 12982f7efab..9892a500664 100644 --- a/jetty-jaas/pom.xml +++ b/jetty-jaas/pom.xml @@ -41,7 +41,6 @@ org.eclipse.jetty jetty-security - ${project.version} diff --git a/jetty-jaspi/pom.xml b/jetty-jaspi/pom.xml index 3c01f5b1cdf..a39c14f4117 100644 --- a/jetty-jaspi/pom.xml +++ b/jetty-jaspi/pom.xml @@ -42,7 +42,6 @@ org.eclipse.jetty jetty-security - ${project.version} org.slf4j diff --git a/jetty-jmx/pom.xml b/jetty-jmx/pom.xml index fcd09303309..6c835a16c94 100644 --- a/jetty-jmx/pom.xml +++ b/jetty-jmx/pom.xml @@ -28,7 +28,6 @@ org.eclipse.jetty jetty-util - ${project.version} org.slf4j diff --git a/jetty-jndi/pom.xml b/jetty-jndi/pom.xml index e12cfb84546..8627d4a640d 100644 --- a/jetty-jndi/pom.xml +++ b/jetty-jndi/pom.xml @@ -42,7 +42,6 @@ org.eclipse.jetty jetty-util - ${project.version} org.slf4j @@ -66,7 +65,6 @@ org.eclipse.jetty jetty-security - ${project.version} provided diff --git a/jetty-jspc-maven-plugin/pom.xml b/jetty-jspc-maven-plugin/pom.xml index ef87965d8ce..161baf0474a 100644 --- a/jetty-jspc-maven-plugin/pom.xml +++ b/jetty-jspc-maven-plugin/pom.xml @@ -71,7 +71,6 @@ org.eclipse.jetty jetty-util - ${project.version} org.apache.maven diff --git a/jetty-keystore/pom.xml b/jetty-keystore/pom.xml index 826a18a5fe3..28766a81509 100644 --- a/jetty-keystore/pom.xml +++ b/jetty-keystore/pom.xml @@ -30,7 +30,6 @@ org.eclipse.jetty jetty-util - ${project.version} diff --git a/jetty-maven-plugin/pom.xml b/jetty-maven-plugin/pom.xml index d043a17963b..299707ec7f4 100644 --- a/jetty-maven-plugin/pom.xml +++ b/jetty-maven-plugin/pom.xml @@ -149,12 +149,10 @@ org.eclipse.jetty jetty-util - ${project.version} org.eclipse.jetty jetty-webapp - ${project.version} javax.servlet @@ -165,12 +163,10 @@ org.eclipse.jetty jetty-quickstart - ${project.version} org.eclipse.jetty jetty-jaas - ${project.version} org.eclipse.jetty @@ -179,7 +175,6 @@ org.eclipse.jetty jetty-jndi - ${project.version} org.eclipse.jetty @@ -188,12 +183,10 @@ org.eclipse.jetty jetty-servlet - ${project.version} org.eclipse.jetty jetty-client - ${project.version} org.eclipse.jetty @@ -206,37 +199,30 @@ org.eclipse.jetty jetty-jmx - ${project.version} org.eclipse.jetty jetty-annotations - ${project.version} org.eclipse.jetty.websocket websocket-javax-server - ${project.version} org.eclipse.jetty.websocket websocket-jetty-server - ${project.version} org.eclipse.jetty apache-jsp - ${project.version} org.eclipse.jetty apache-jstl - ${project.version} org.slf4j slf4j-api - ${slf4j.version} jakarta.transaction @@ -251,7 +237,6 @@ org.eclipse.jetty jetty-home - ${project.version} test zip diff --git a/jetty-memcached/jetty-memcached-sessions/pom.xml b/jetty-memcached/jetty-memcached-sessions/pom.xml index 6423033e87d..51f3dc0608b 100644 --- a/jetty-memcached/jetty-memcached-sessions/pom.xml +++ b/jetty-memcached/jetty-memcached-sessions/pom.xml @@ -23,19 +23,16 @@ org.slf4j slf4j-simple - ${slf4j.version} test org.eclipse.jetty jetty-webapp - ${project.version} test org.eclipse.jetty jetty-client - ${project.version} test diff --git a/jetty-nosql/pom.xml b/jetty-nosql/pom.xml index 6248c944cad..b90dea5b9a4 100644 --- a/jetty-nosql/pom.xml +++ b/jetty-nosql/pom.xml @@ -22,7 +22,6 @@ org.eclipse.jetty jetty-jmx - ${project.version} true @@ -48,7 +47,6 @@ org.eclipse.jetty.tests test-sessions-common - ${project.version} test diff --git a/jetty-openid/pom.xml b/jetty-openid/pom.xml index c10697626a7..6ea711ae461 100644 --- a/jetty-openid/pom.xml +++ b/jetty-openid/pom.xml @@ -46,17 +46,14 @@ org.eclipse.jetty jetty-client - ${project.version} org.eclipse.jetty jetty-security - ${project.version} org.eclipse.jetty jetty-util-ajax - ${project.version} org.slf4j @@ -70,7 +67,6 @@ org.eclipse.jetty jetty-servlet - ${project.version} test diff --git a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml index 9b0110832a4..b7aa6c2613f 100644 --- a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml +++ b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml @@ -16,12 +16,10 @@ org.eclipse.jetty jetty-deploy - ${project.version} org.eclipse.jetty.osgi jetty-osgi-boot - ${project.version} provided @@ -41,7 +39,6 @@ org.eclipse.jetty apache-jsp - ${project.version} diff --git a/jetty-osgi/jetty-osgi-boot-warurl/pom.xml b/jetty-osgi/jetty-osgi-boot-warurl/pom.xml index 94b8ca8caeb..35cc6ae10c1 100644 --- a/jetty-osgi/jetty-osgi-boot-warurl/pom.xml +++ b/jetty-osgi/jetty-osgi-boot-warurl/pom.xml @@ -17,7 +17,6 @@ org.eclipse.jetty jetty-util - ${project.version} org.eclipse.platform diff --git a/jetty-osgi/jetty-osgi-httpservice/pom.xml b/jetty-osgi/jetty-osgi-httpservice/pom.xml index 00b2e05ed93..7aea2ed13b2 100644 --- a/jetty-osgi/jetty-osgi-httpservice/pom.xml +++ b/jetty-osgi/jetty-osgi-httpservice/pom.xml @@ -16,12 +16,10 @@ org.eclipse.jetty jetty-util - ${project.version} org.eclipse.jetty jetty-servlet - ${project.version} org.eclipse.equinox.http diff --git a/jetty-osgi/test-jetty-osgi-server/pom.xml b/jetty-osgi/test-jetty-osgi-server/pom.xml index 0f19df8300d..5ad5208eb02 100644 --- a/jetty-osgi/test-jetty-osgi-server/pom.xml +++ b/jetty-osgi/test-jetty-osgi-server/pom.xml @@ -15,7 +15,6 @@ org.eclipse.jetty jetty-webapp - ${project.version} org.eclipse.platform diff --git a/jetty-osgi/test-jetty-osgi-webapp/pom.xml b/jetty-osgi/test-jetty-osgi-webapp/pom.xml index d9c21f7d603..65c762b6ea5 100644 --- a/jetty-osgi/test-jetty-osgi-webapp/pom.xml +++ b/jetty-osgi/test-jetty-osgi-webapp/pom.xml @@ -16,7 +16,6 @@ org.eclipse.jetty jetty-webapp - ${project.version} org.eclipse.platform diff --git a/jetty-osgi/test-jetty-osgi/pom.xml b/jetty-osgi/test-jetty-osgi/pom.xml index 8c715b5929e..9957ffea8a8 100644 --- a/jetty-osgi/test-jetty-osgi/pom.xml +++ b/jetty-osgi/test-jetty-osgi/pom.xml @@ -116,13 +116,11 @@ org.eclipse.platform org.eclipse.osgi - ${osgi-version} test org.eclipse.platform org.eclipse.osgi.services - ${osgi-services-version} test @@ -146,7 +144,6 @@ org.eclipse.jetty jetty-slf4j-impl - ${project.version} test @@ -233,19 +230,16 @@ org.eclipse.jetty jetty-annotations - ${project.version} runtime org.eclipse.jetty jetty-webapp - ${project.version} runtime org.eclipse.jetty jetty-deploy - ${project.version} runtime @@ -256,79 +250,66 @@ org.eclipse.jetty jetty-servlet - ${project.version} runtime org.eclipse.jetty jetty-servlets - ${project.version} runtime org.eclipse.jetty jetty-security - ${project.version} runtime org.eclipse.jetty jetty-xml - ${project.version} runtime org.eclipse.jetty jetty-jmx - ${project.version} runtime org.eclipse.jetty jetty-util - ${project.version} runtime org.eclipse.jetty jetty-client - ${project.version} runtime org.eclipse.jetty.websocket websocket-jetty-api - ${project.version} runtime org.eclipse.jetty.websocket websocket-jetty-common - ${project.version} runtime org.eclipse.jetty.websocket websocket-jetty-client - ${project.version} runtime org.eclipse.jetty.websocket websocket-javax-client - ${project.version} runtime org.eclipse.jetty.websocket websocket-servlet - ${project.version} runtime org.eclipse.jetty.websocket websocket-jetty-server - ${project.version} runtime @@ -339,18 +320,15 @@ org.eclipse.jetty.websocket websocket-javax-server - ${project.version} runtime org.eclipse.jetty.http2 http2-server - ${project.version} org.eclipse.jetty.http2 http2-hpack - ${project.version} org.eclipse.jetty.osgi diff --git a/jetty-plus/pom.xml b/jetty-plus/pom.xml index 6961013ffb2..76cb3381d15 100644 --- a/jetty-plus/pom.xml +++ b/jetty-plus/pom.xml @@ -44,12 +44,10 @@ org.eclipse.jetty jetty-jndi - ${project.version} org.eclipse.jetty jetty-webapp - ${project.version} org.slf4j diff --git a/jetty-proxy/pom.xml b/jetty-proxy/pom.xml index e85683e30e6..a2d5ed7dd9f 100644 --- a/jetty-proxy/pom.xml +++ b/jetty-proxy/pom.xml @@ -28,29 +28,24 @@ org.eclipse.jetty jetty-servlet - ${project.version} provided org.eclipse.jetty jetty-util - ${project.version} org.eclipse.jetty jetty-client - ${project.version} org.eclipse.jetty jetty-util-ajax - ${project.version} test org.eclipse.jetty.tests jetty-http-tools - ${project.version} test @@ -61,7 +56,6 @@ org.eclipse.jetty jetty-rewrite - ${project.version} test diff --git a/jetty-quickstart/pom.xml b/jetty-quickstart/pom.xml index 6782ac22b79..db6e2d1285e 100644 --- a/jetty-quickstart/pom.xml +++ b/jetty-quickstart/pom.xml @@ -38,7 +38,6 @@ org.eclipse.jetty jetty-webapp - ${project.version} org.eclipse.jetty @@ -47,7 +46,6 @@ org.eclipse.jetty jetty-annotations - ${project.version} org.slf4j diff --git a/jetty-rewrite/pom.xml b/jetty-rewrite/pom.xml index 5bbf3b02872..a3f58922b0f 100644 --- a/jetty-rewrite/pom.xml +++ b/jetty-rewrite/pom.xml @@ -36,7 +36,6 @@ org.eclipse.jetty.tests jetty-http-tools - ${project.version} test diff --git a/jetty-runner/pom.xml b/jetty-runner/pom.xml index 309d9fbcb14..06305fcd792 100644 --- a/jetty-runner/pom.xml +++ b/jetty-runner/pom.xml @@ -126,32 +126,26 @@ org.eclipse.jetty jetty-annotations - ${project.version} org.eclipse.jetty jetty-jaas - ${project.version} org.eclipse.jetty.websocket websocket-jetty-server - ${project.version} org.eclipse.jetty jetty-jndi - ${project.version} org.eclipse.jetty apache-jsp - ${project.version} org.eclipse.jetty apache-jstl - ${project.version} org.slf4j @@ -165,14 +159,12 @@ org.eclipse.jetty.demos demo-simple-webapp - ${project.version} war test org.eclipse.jetty jetty-client - ${project.version} test diff --git a/jetty-security/pom.xml b/jetty-security/pom.xml index befc5f88569..fe9db6aac8a 100644 --- a/jetty-security/pom.xml +++ b/jetty-security/pom.xml @@ -55,7 +55,6 @@ org.eclipse.jetty.tests jetty-http-tools - ${project.version} test diff --git a/jetty-server/pom.xml b/jetty-server/pom.xml index 3233d6367a8..d24cd4b9b5e 100644 --- a/jetty-server/pom.xml +++ b/jetty-server/pom.xml @@ -44,7 +44,6 @@ org.eclipse.jetty jetty-jmx - ${project.version} true @@ -55,7 +54,6 @@ org.eclipse.jetty jetty-xml - ${project.version} test @@ -66,13 +64,11 @@ org.eclipse.jetty.tests jetty-http-tools - ${project.version} test org.eclipse.jetty jetty-util-ajax - ${project.version} test diff --git a/jetty-servlet/pom.xml b/jetty-servlet/pom.xml index 7c020ce49cd..8078a55601f 100644 --- a/jetty-servlet/pom.xml +++ b/jetty-servlet/pom.xml @@ -34,7 +34,6 @@ org.eclipse.jetty jetty-security - ${project.version} org.slf4j @@ -43,13 +42,11 @@ org.eclipse.jetty jetty-util-ajax - ${project.version} true org.eclipse.jetty jetty-jmx - ${project.version} true @@ -66,13 +63,11 @@ org.eclipse.jetty.tests jetty-http-tools - ${project.version} test org.eclipse.jetty jetty-client - ${project.version} test diff --git a/jetty-servlets/pom.xml b/jetty-servlets/pom.xml index 70ca42e205a..68fa38df416 100644 --- a/jetty-servlets/pom.xml +++ b/jetty-servlets/pom.xml @@ -37,13 +37,11 @@ org.eclipse.jetty jetty-webapp - ${project.version} provided org.eclipse.jetty jetty-util - ${project.version} org.eclipse.jetty.toolchain @@ -67,13 +65,11 @@ org.eclipse.jetty jetty-jmx - ${project.version} test org.eclipse.jetty.tests jetty-http-tools - ${project.version} test diff --git a/jetty-start/pom.xml b/jetty-start/pom.xml index 57b6e1efd3c..50b6c5eb9f5 100644 --- a/jetty-start/pom.xml +++ b/jetty-start/pom.xml @@ -87,7 +87,6 @@ org.eclipse.jetty jetty-util - ${project.version} org.slf4j diff --git a/jetty-unixdomain-server/pom.xml b/jetty-unixdomain-server/pom.xml index 28af43303d7..0d69a081225 100644 --- a/jetty-unixdomain-server/pom.xml +++ b/jetty-unixdomain-server/pom.xml @@ -29,7 +29,6 @@ org.eclipse.jetty jetty-client - ${project.version} test diff --git a/jetty-unixsocket/jetty-unixsocket-client/pom.xml b/jetty-unixsocket/jetty-unixsocket-client/pom.xml index 67a75b9773d..5f81b1d6444 100644 --- a/jetty-unixsocket/jetty-unixsocket-client/pom.xml +++ b/jetty-unixsocket/jetty-unixsocket-client/pom.xml @@ -18,12 +18,10 @@ org.eclipse.jetty jetty-unixsocket-common - ${project.version} org.eclipse.jetty jetty-client - ${project.version} org.slf4j @@ -33,7 +31,6 @@ org.eclipse.jetty jetty-unixsocket-server - ${project.version} test diff --git a/jetty-unixsocket/jetty-unixsocket-common/pom.xml b/jetty-unixsocket/jetty-unixsocket-common/pom.xml index f4af9edd9eb..84ed6c153c6 100644 --- a/jetty-unixsocket/jetty-unixsocket-common/pom.xml +++ b/jetty-unixsocket/jetty-unixsocket-common/pom.xml @@ -22,7 +22,6 @@ org.eclipse.jetty jetty-util - ${project.version} org.slf4j diff --git a/jetty-unixsocket/jetty-unixsocket-server/pom.xml b/jetty-unixsocket/jetty-unixsocket-server/pom.xml index d66a096e389..a4cf6df4f93 100644 --- a/jetty-unixsocket/jetty-unixsocket-server/pom.xml +++ b/jetty-unixsocket/jetty-unixsocket-server/pom.xml @@ -18,7 +18,6 @@ org.eclipse.jetty jetty-unixsocket-common - ${project.version} org.eclipse.jetty diff --git a/jetty-util-ajax/pom.xml b/jetty-util-ajax/pom.xml index 48c7968600c..245d422933c 100644 --- a/jetty-util-ajax/pom.xml +++ b/jetty-util-ajax/pom.xml @@ -16,7 +16,6 @@ org.eclipse.jetty jetty-util - ${project.version} org.eclipse.jetty.toolchain diff --git a/jetty-webapp/pom.xml b/jetty-webapp/pom.xml index 17d4dc26586..e48bd9444b0 100644 --- a/jetty-webapp/pom.xml +++ b/jetty-webapp/pom.xml @@ -69,12 +69,10 @@ org.eclipse.jetty jetty-servlet - ${project.version} org.eclipse.jetty jetty-xml - ${project.version} org.slf4j @@ -88,7 +86,6 @@ org.eclipse.jetty.tests jetty-http-tools - ${project.version} test @@ -99,7 +96,6 @@ org.eclipse.jetty jetty-client - ${project.version} test diff --git a/jetty-websocket/websocket-core-client/pom.xml b/jetty-websocket/websocket-core-client/pom.xml index d5517f1dfd4..5d3318fab84 100644 --- a/jetty-websocket/websocket-core-client/pom.xml +++ b/jetty-websocket/websocket-core-client/pom.xml @@ -18,17 +18,14 @@ org.eclipse.jetty.websocket websocket-core-common - ${project.version} org.eclipse.jetty jetty-client - ${project.version} org.eclipse.jetty jetty-xml - ${project.version} true diff --git a/jetty-websocket/websocket-core-server/pom.xml b/jetty-websocket/websocket-core-server/pom.xml index 0094e2f3cf5..8a128dee828 100644 --- a/jetty-websocket/websocket-core-server/pom.xml +++ b/jetty-websocket/websocket-core-server/pom.xml @@ -18,7 +18,6 @@ org.eclipse.jetty.websocket websocket-core-common - ${project.version} org.eclipse.jetty diff --git a/jetty-websocket/websocket-core-tests/pom.xml b/jetty-websocket/websocket-core-tests/pom.xml index 65e51dc530d..a1641602885 100644 --- a/jetty-websocket/websocket-core-tests/pom.xml +++ b/jetty-websocket/websocket-core-tests/pom.xml @@ -18,22 +18,18 @@ org.eclipse.jetty.websocket websocket-core-client - ${project.version} org.eclipse.jetty.websocket websocket-core-server - ${project.version} org.eclipse.jetty.websocket websocket-core-common - ${project.version} org.eclipse.jetty jetty-servlet - ${project.version} test diff --git a/jetty-websocket/websocket-javax-client/pom.xml b/jetty-websocket/websocket-javax-client/pom.xml index 316a8c9b74e..b0b4873ee02 100644 --- a/jetty-websocket/websocket-javax-client/pom.xml +++ b/jetty-websocket/websocket-javax-client/pom.xml @@ -22,17 +22,14 @@ org.eclipse.jetty.websocket websocket-javax-common - ${project.version} org.eclipse.jetty.websocket websocket-core-client - ${project.version} org.eclipse.jetty jetty-client - ${project.version} org.eclipse.jetty.toolchain @@ -42,13 +39,11 @@ org.eclipse.jetty jetty-xml - ${project.version} test org.eclipse.jetty jetty-jmx - ${project.version} test diff --git a/jetty-websocket/websocket-javax-common/pom.xml b/jetty-websocket/websocket-javax-common/pom.xml index a5ba1e670e1..2d8c204ff11 100644 --- a/jetty-websocket/websocket-javax-common/pom.xml +++ b/jetty-websocket/websocket-javax-common/pom.xml @@ -47,7 +47,6 @@ org.eclipse.jetty.websocket websocket-core-client - ${project.version} org.slf4j diff --git a/jetty-websocket/websocket-javax-server/pom.xml b/jetty-websocket/websocket-javax-server/pom.xml index 680ddedf740..512d690cdf5 100644 --- a/jetty-websocket/websocket-javax-server/pom.xml +++ b/jetty-websocket/websocket-javax-server/pom.xml @@ -18,17 +18,14 @@ org.eclipse.jetty.websocket websocket-javax-client - ${project.version} org.eclipse.jetty.websocket websocket-servlet - ${project.version} org.eclipse.jetty jetty-annotations - ${project.version} org.eclipse.jetty.toolchain diff --git a/jetty-websocket/websocket-javax-tests/pom.xml b/jetty-websocket/websocket-javax-tests/pom.xml index 88b9f1ee70f..701d58f1df7 100644 --- a/jetty-websocket/websocket-javax-tests/pom.xml +++ b/jetty-websocket/websocket-javax-tests/pom.xml @@ -22,17 +22,14 @@ org.eclipse.jetty.websocket websocket-javax-client - ${project.version} org.eclipse.jetty.websocket websocket-javax-server - ${project.version} org.eclipse.jetty.tests jetty-http-tools - ${project.version} org.eclipse.jetty.toolchain diff --git a/jetty-websocket/websocket-jetty-client/pom.xml b/jetty-websocket/websocket-jetty-client/pom.xml index 1c79c3d69bb..fd821f2a8e8 100644 --- a/jetty-websocket/websocket-jetty-client/pom.xml +++ b/jetty-websocket/websocket-jetty-client/pom.xml @@ -38,27 +38,22 @@ org.eclipse.jetty.websocket websocket-jetty-api - ${project.version} org.eclipse.jetty.websocket websocket-jetty-common - ${project.version} org.eclipse.jetty.websocket websocket-core-client - ${project.version} org.eclipse.jetty jetty-client - ${project.version} org.eclipse.jetty jetty-webapp - ${project.version} true diff --git a/jetty-websocket/websocket-jetty-common/pom.xml b/jetty-websocket/websocket-jetty-common/pom.xml index d5db982aed5..c9550d38dac 100644 --- a/jetty-websocket/websocket-jetty-common/pom.xml +++ b/jetty-websocket/websocket-jetty-common/pom.xml @@ -38,12 +38,10 @@ org.eclipse.jetty.websocket websocket-jetty-api - ${project.version} org.eclipse.jetty.websocket websocket-core-common - ${project.version} org.eclipse.jetty diff --git a/jetty-websocket/websocket-jetty-server/pom.xml b/jetty-websocket/websocket-jetty-server/pom.xml index 427ea062756..15205a6dd7d 100644 --- a/jetty-websocket/websocket-jetty-server/pom.xml +++ b/jetty-websocket/websocket-jetty-server/pom.xml @@ -18,17 +18,14 @@ org.eclipse.jetty.websocket websocket-jetty-api - ${project.version} org.eclipse.jetty.websocket websocket-jetty-common - ${project.version} org.eclipse.jetty.websocket websocket-servlet - ${project.version} org.eclipse.jetty.toolchain @@ -37,17 +34,14 @@ org.eclipse.jetty jetty-servlet - ${project.version} org.eclipse.jetty jetty-annotations - ${project.version} org.eclipse.jetty jetty-jmx - ${project.version} true diff --git a/jetty-websocket/websocket-jetty-tests/pom.xml b/jetty-websocket/websocket-jetty-tests/pom.xml index a562b3d4e68..5641af60f93 100644 --- a/jetty-websocket/websocket-jetty-tests/pom.xml +++ b/jetty-websocket/websocket-jetty-tests/pom.xml @@ -23,49 +23,41 @@ org.eclipse.jetty.websocket websocket-jetty-api - ${project.version} test org.eclipse.jetty.websocket websocket-jetty-client - ${project.version} test org.eclipse.jetty.websocket websocket-jetty-server - ${project.version} test org.eclipse.jetty.tests jetty-http-tools - ${project.version} test org.eclipse.jetty.http2 http2-server - ${project.version} test org.eclipse.jetty jetty-alpn-server - ${project.version} test org.eclipse.jetty jetty-alpn-java-server - ${project.version} test org.eclipse.jetty.http2 http2-http-client-transport - ${project.version} test @@ -76,7 +68,6 @@ org.eclipse.jetty jetty-jmx - ${project.version} test diff --git a/jetty-websocket/websocket-servlet/pom.xml b/jetty-websocket/websocket-servlet/pom.xml index 3c20123f94d..a9a77f6d0b1 100644 --- a/jetty-websocket/websocket-servlet/pom.xml +++ b/jetty-websocket/websocket-servlet/pom.xml @@ -18,12 +18,10 @@ org.eclipse.jetty.websocket websocket-core-server - ${project.version} org.eclipse.jetty jetty-servlet - ${project.version} org.slf4j diff --git a/jetty-xml/pom.xml b/jetty-xml/pom.xml index 070adabfe7d..a945164babd 100644 --- a/jetty-xml/pom.xml +++ b/jetty-xml/pom.xml @@ -31,7 +31,6 @@ org.eclipse.jetty jetty-util - ${project.version} org.slf4j diff --git a/pom.xml b/pom.xml index 7297e51a98a..fe4011fec4e 100644 --- a/pom.xml +++ b/pom.xml @@ -1274,6 +1274,11 @@ asciidoctor-maven-plugin ${asciidoctor.maven.plugin.version} + + org.conscrypt + conscrypt-openjdk-uber + ${conscrypt.version} + org.codehaus.plexus plexus-component-annotations @@ -1284,31 +1289,448 @@ plexus-utils ${plexus-utils.version} + + org.eclipse.jetty + apache-jsp + ${project.version} + + + org.eclipse.jetty + apache-jstl + ${project.version} + + + org.eclipse.jetty + jetty-alpn-client + ${project.version} + + + org.eclipse.jetty + jetty-alpn-conscrypt-client + ${project.version} + + + org.eclipse.jetty + jetty-alpn-conscrypt-server + ${project.version} + + + org.eclipse.jetty + jetty-alpn-java-server + ${project.version} + + + org.eclipse.jetty + jetty-alpn-java-client + ${project.version} + + + org.eclipse.jetty + jetty-alpn-server + ${project.version} + + + org.eclipse.jetty + jetty-annotations + ${project.version} + + + org.eclipse.jetty + jetty-ant + ${project.version} + + + org.eclipse.jetty + jetty-cdi + ${project.version} + + + org.eclipse.jetty + jetty-client + ${project.version} + + + org.eclipse.jetty + jetty-deploy + ${project.version} + + + org.eclipse.jetty + jetty-hazelcast + ${project.version} + + + org.eclipse.jetty + jetty-home + ${project.version} + zip + org.eclipse.jetty jetty-http ${project.version} + + org.eclipse.jetty + jetty-http-spi + ${project.version} + + + org.eclipse.jetty + infinispan-common + ${project.version} + + + org.eclipse.jetty + infinispan-embedded + ${project.version} + + + org.eclipse.jetty + infinispan-embedded-query + ${project.version} + + + org.eclipse.jetty + infinispan-remote + ${project.version} + + + org.eclipse.jetty + infinispan-remote-query + ${project.version} + org.eclipse.jetty jetty-io ${project.version} + + org.eclipse.jetty + jetty-nosql + ${project.version} + + + org.eclipse.jetty + jetty-jaas + ${project.version} + + + org.eclipse.jetty + jetty-jaspi + ${project.version} + + + org.eclipse.jetty + jetty-jmx + ${project.version} + + + org.eclipse.jetty + jetty-jndi + ${project.version} + + + org.eclipse.jetty + jetty-jspc-maven-plugin + ${project.version} + + + org.eclipse.jetty + jetty-keystore + ${project.version} + + + org.eclipse.jetty + jetty-maven-plugin + ${project.version} + + + org.eclipse.jetty + jetty-openid + ${project.version} + org.eclipse.jetty jetty-plus ${project.version} + + org.eclipse.jetty + jetty-proxy + ${project.version} + + + org.eclipse.jetty + jetty-quickstart + ${project.version} + + + org.eclipse.jetty + jetty-rewrite + ${project.version} + + + org.eclipse.jetty + jetty-runner + ${project.version} + + + org.eclipse.jetty + jetty-security + ${project.version} + org.eclipse.jetty jetty-server ${project.version} + + org.eclipse.jetty + jetty-servlet + ${project.version} + + + org.eclipse.jetty + jetty-servlets + ${project.version} + org.eclipse.jetty jetty-slf4j-impl ${project.version} - test + + + org.eclipse.jetty + jetty-start + ${project.version} + + + org.eclipse.jetty + jetty-unixdomain-server + ${project.version} + + + org.eclipse.jetty + jetty-unixsocket-client + ${project.version} + + + org.eclipse.jetty + jetty-unixsocket-common + ${project.version} + + + org.eclipse.jetty + jetty-unixsocket-server + ${project.version} + + + org.eclipse.jetty + jetty-util + ${project.version} + + + org.eclipse.jetty + jetty-util-ajax + ${project.version} + + + org.eclipse.jetty + jetty-webapp + ${project.version} + + + org.eclipse.jetty + jetty-xml + ${project.version} + + + org.eclipse.jetty.demos + demo-async-rest-jar + ${project.version} + + + org.eclipse.jetty.demos + demo-async-rest-webapp + ${project.version} + war + + + org.eclipse.jetty.demos + demo-container-initializer + ${project.version} + + + org.eclipse.jetty.demos + demo-jaas-webapp + ${project.version} + war + + + org.eclipse.jetty.demos + demo-jetty-webapp + ${project.version} + war + + + org.eclipse.jetty.demos + demo-jndi-webapp + ${project.version} + war + + + org.eclipse.jetty.demos + demo-jsp-webapp + ${project.version} + war + + + org.eclipse.jetty.demos + demo-mock-resources + ${project.version} + + + org.eclipse.jetty.demos + demo-proxy-webapp + ${project.version} + + + org.eclipse.jetty.demos + demo-spec-webapp + ${project.version} + war + + + org.eclipse.jetty.demos + demo-simple-webapp + ${project.version} + war + + + org.eclipse.jetty.demos + demo-web-fragment + ${project.version} + + + org.eclipse.jetty.fcgi + fcgi-client + ${project.version} + + + org.eclipse.jetty.fcgi + fcgi-server + ${project.version} + + + org.eclipse.jetty.gcloud + jetty-gcloud-session-manager + ${project.version} + + + org.eclipse.jetty.http2 + http2-client + ${project.version} + + + org.eclipse.jetty.http2 + http2-common + ${project.version} + + + org.eclipse.jetty.http2 + http2-hpack + ${project.version} + + + org.eclipse.jetty.http2 + http2-http-client-transport + ${project.version} + + + org.eclipse.jetty.http2 + http2-server + ${project.version} + + + org.eclipse.jetty.memcached + jetty-memcached-sessions + ${project.version} + + + org.eclipse.jetty.osgi + jetty-osgi-boot + ${project.version} + + + org.eclipse.jetty.tests + jetty-http-tools + ${project.version} + + + org.eclipse.jetty.tests + test-distribution + ${project.version} + + + org.eclipse.jetty.tests + test-sessions-common + ${project.version} + + + org.eclipse.jetty.websocket + websocket-core-client + ${project.version} + + + org.eclipse.jetty.websocket + websocket-core-common + ${project.version} + + + org.eclipse.jetty.websocket + websocket-core-server + ${project.version} + + + org.eclipse.jetty.websocket + websocket-javax-server + ${project.version} + + + org.eclipse.jetty.websocket + websocket-javax-client + ${project.version} + + + org.eclipse.jetty.websocket + websocket-javax-common + ${project.version} + + + org.eclipse.jetty.websocket + websocket-jetty-api + ${project.version} + + + org.eclipse.jetty.websocket + websocket-jetty-client + ${project.version} + + + org.eclipse.jetty.websocket + websocket-jetty-common + ${project.version} + + + org.eclipse.jetty.websocket + websocket-jetty-server + ${project.version} + + + org.eclipse.jetty.websocket + websocket-servlet + ${project.version} org.eclipse.jetty.orbit @@ -1401,6 +1823,11 @@ pom import + + org.infinispan.protostream + protostream + ${infinispan.protostream.version} + org.jboss.logging jboss-logging @@ -1482,7 +1909,6 @@ org.slf4j jul-to-slf4j ${slf4j.version} - test org.slf4j diff --git a/tests/jetty-jmh/pom.xml b/tests/jetty-jmh/pom.xml index fef615d0a61..c475fcc2072 100644 --- a/tests/jetty-jmh/pom.xml +++ b/tests/jetty-jmh/pom.xml @@ -75,7 +75,6 @@ org.eclipse.jetty jetty-util - ${project.version} org.eclipse.jetty @@ -101,7 +100,6 @@ org.eclipse.jetty jetty-client - ${project.version} org.eclipse.jetty.toolchain diff --git a/tests/test-cdi/pom.xml b/tests/test-cdi/pom.xml index 82a0f4a5aeb..61691080bb3 100644 --- a/tests/test-cdi/pom.xml +++ b/tests/test-cdi/pom.xml @@ -19,12 +19,10 @@ org.eclipse.jetty jetty-cdi - ${project.version} org.eclipse.jetty jetty-webapp - ${project.version} compile @@ -61,19 +59,16 @@ org.eclipse.jetty.websocket websocket-javax-server - ${project.version} test org.eclipse.jetty.websocket websocket-jetty-server - ${project.version} test org.eclipse.jetty.websocket websocket-jetty-client - ${project.version} test diff --git a/tests/test-distribution/pom.xml b/tests/test-distribution/pom.xml index 618abb47637..81f02301887 100644 --- a/tests/test-distribution/pom.xml +++ b/tests/test-distribution/pom.xml @@ -19,7 +19,6 @@ org.eclipse.jetty jetty-util - ${project.version} org.slf4j @@ -72,26 +71,22 @@ org.eclipse.jetty jetty-home - ${project.version} zip test org.eclipse.jetty jetty-client - ${project.version} test org.eclipse.jetty.http2 http2-http-client-transport - ${project.version} test org.eclipse.jetty.demos demo-simple-webapp - ${project.version} war test @@ -112,7 +107,6 @@ org.eclipse.jetty.demos demo-jetty-webapp - ${project.version} war test @@ -127,31 +121,26 @@ org.eclipse.jetty jetty-unixsocket-server - ${project.version} test org.eclipse.jetty jetty-unixsocket-client - ${project.version} test org.eclipse.jetty.websocket websocket-jetty-client - ${project.version} test org.eclipse.jetty jetty-util-ajax - ${project.version} test org.eclipse.jetty.websocket websocket-jetty-api - ${project.version} test diff --git a/tests/test-http-client-transport/pom.xml b/tests/test-http-client-transport/pom.xml index 8c508d35092..f3227e586d4 100644 --- a/tests/test-http-client-transport/pom.xml +++ b/tests/test-http-client-transport/pom.xml @@ -54,61 +54,51 @@ org.eclipse.jetty jetty-alpn-java-client - ${project.version} test org.eclipse.jetty jetty-alpn-java-server - ${project.version} test org.eclipse.jetty jetty-jmx - ${project.version} test org.eclipse.jetty jetty-servlet - ${project.version} test org.eclipse.jetty jetty-client - ${project.version} test org.eclipse.jetty.http2 http2-server - ${project.version} test org.eclipse.jetty.http2 http2-http-client-transport - ${project.version} test org.eclipse.jetty jetty-unixsocket-client - ${project.version} test org.eclipse.jetty jetty-unixsocket-server - ${project.version} test org.eclipse.jetty.fcgi fcgi-server - ${project.version} test diff --git a/tests/test-integration/pom.xml b/tests/test-integration/pom.xml index 7d8f1ed71e1..2b869b156a5 100644 --- a/tests/test-integration/pom.xml +++ b/tests/test-integration/pom.xml @@ -74,22 +74,18 @@ org.eclipse.jetty jetty-webapp - ${project.version} org.eclipse.jetty jetty-deploy - ${project.version} org.eclipse.jetty jetty-rewrite - ${project.version} org.eclipse.jetty jetty-client - ${project.version} org.slf4j @@ -104,7 +100,6 @@ org.eclipse.jetty.tests jetty-http-tools - ${project.version} test @@ -120,41 +115,34 @@ org.eclipse.jetty apache-jsp - ${project.version} org.eclipse.jetty.http2 http2-server - ${project.version} org.eclipse.jetty jetty-annotations - ${project.version} test org.eclipse.jetty jetty-servlets - ${project.version} test org.eclipse.jetty.websocket websocket-jetty-server - ${project.version} test org.eclipse.jetty.websocket websocket-jetty-client - ${project.version} test org.eclipse.jetty.websocket websocket-javax-server - ${project.version} test @@ -167,14 +155,12 @@ org.eclipse.jetty.demos demo-jetty-webapp - ${project.version} war test org.eclipse.jetty jetty-alpn-server - ${project.version} test diff --git a/tests/test-jmx/jmx-webapp-it/pom.xml b/tests/test-jmx/jmx-webapp-it/pom.xml index 05090ab2a5f..0e930808dac 100644 --- a/tests/test-jmx/jmx-webapp-it/pom.xml +++ b/tests/test-jmx/jmx-webapp-it/pom.xml @@ -19,12 +19,10 @@ org.eclipse.jetty jetty-annotations - ${project.version} org.eclipse.jetty jetty-jmx - ${project.version} org.eclipse.jetty.tests diff --git a/tests/test-jmx/jmx-webapp/pom.xml b/tests/test-jmx/jmx-webapp/pom.xml index af263093d1b..6bcb43b24bb 100644 --- a/tests/test-jmx/jmx-webapp/pom.xml +++ b/tests/test-jmx/jmx-webapp/pom.xml @@ -22,7 +22,6 @@ org.eclipse.jetty jetty-jmx - ${project.version} org.slf4j diff --git a/tests/test-jpms/test-jpms-websocket-core/pom.xml b/tests/test-jpms/test-jpms-websocket-core/pom.xml index 93f862c4c1e..eb422b75a57 100644 --- a/tests/test-jpms/test-jpms-websocket-core/pom.xml +++ b/tests/test-jpms/test-jpms-websocket-core/pom.xml @@ -14,12 +14,10 @@ org.eclipse.jetty.websocket websocket-core-server - ${project.version} org.eclipse.jetty.websocket websocket-core-client - ${project.version} diff --git a/tests/test-loginservice/pom.xml b/tests/test-loginservice/pom.xml index 0e26bcc6210..dde8ff34742 100644 --- a/tests/test-loginservice/pom.xml +++ b/tests/test-loginservice/pom.xml @@ -19,17 +19,14 @@ org.eclipse.jetty jetty-webapp - ${project.version} org.eclipse.jetty jetty-client - ${project.version} org.eclipse.jetty jetty-security - ${project.version} org.eclipse.jetty @@ -38,7 +35,6 @@ org.eclipse.jetty jetty-jndi - ${project.version} org.testcontainers diff --git a/tests/test-quickstart/pom.xml b/tests/test-quickstart/pom.xml index 8cb30c1f1f0..626701fc0bf 100644 --- a/tests/test-quickstart/pom.xml +++ b/tests/test-quickstart/pom.xml @@ -18,19 +18,16 @@ org.eclipse.jetty jetty-quickstart - ${project.version} test org.eclipse.jetty jetty-webapp - ${project.version} test org.eclipse.jetty jetty-jmx - ${project.version} test @@ -41,7 +38,6 @@ org.eclipse.jetty jetty-annotations - ${project.version} test @@ -52,64 +48,54 @@ org.eclipse.jetty.demos demo-mock-resources - ${project.version} test org.eclipse.jetty.orbit javax.mail.glassfish - 1.4.1.v201005082020 test org.eclipse.jetty jetty-servlets - ${project.version} test org.eclipse.jetty.demos demo-jndi-webapp - ${project.version} war test org.eclipse.jetty.demos demo-spec-webapp - ${project.version} war test org.eclipse.jetty.demos demo-jetty-webapp - ${project.version} war test org.eclipse.jetty.websocket websocket-javax-server - ${project.version} test org.eclipse.jetty.websocket websocket-jetty-server - ${project.version} test org.eclipse.jetty apache-jsp - ${project.version} test org.eclipse.jetty apache-jstl - ${project.version} test diff --git a/tests/test-sessions/test-file-sessions/pom.xml b/tests/test-sessions/test-file-sessions/pom.xml index 6baeb95374c..6ddbd1290b9 100644 --- a/tests/test-sessions/test-file-sessions/pom.xml +++ b/tests/test-sessions/test-file-sessions/pom.xml @@ -32,19 +32,16 @@ org.eclipse.jetty jetty-webapp - ${project.version} test org.eclipse.jetty jetty-client - ${project.version} test org.eclipse.jetty.tests test-sessions-common - ${project.version} test diff --git a/tests/test-sessions/test-gcloud-sessions/pom.xml b/tests/test-sessions/test-gcloud-sessions/pom.xml index b4886486e2f..58ad7dbd4ec 100644 --- a/tests/test-sessions/test-gcloud-sessions/pom.xml +++ b/tests/test-sessions/test-gcloud-sessions/pom.xml @@ -32,25 +32,21 @@ org.eclipse.jetty jetty-webapp - ${project.version} test org.eclipse.jetty jetty-client - ${project.version} test org.eclipse.jetty.tests test-sessions-common - ${project.version} test org.eclipse.jetty.gcloud jetty-gcloud-session-manager - ${project.version} test diff --git a/tests/test-sessions/test-hazelcast-sessions/pom.xml b/tests/test-sessions/test-hazelcast-sessions/pom.xml index 4a3b33c6c07..b27327f53c7 100644 --- a/tests/test-sessions/test-hazelcast-sessions/pom.xml +++ b/tests/test-sessions/test-hazelcast-sessions/pom.xml @@ -68,25 +68,21 @@ org.eclipse.jetty jetty-webapp - ${project.version} test org.eclipse.jetty jetty-client - ${project.version} test org.eclipse.jetty.tests test-sessions-common - ${project.version} test org.eclipse.jetty jetty-hazelcast - ${project.version} test @@ -103,7 +99,6 @@ org.eclipse.jetty jetty-jmx - ${project.version} true test diff --git a/tests/test-sessions/test-infinispan-sessions/pom.xml b/tests/test-sessions/test-infinispan-sessions/pom.xml index 81a23543bb6..5b3d1e61c8f 100644 --- a/tests/test-sessions/test-infinispan-sessions/pom.xml +++ b/tests/test-sessions/test-infinispan-sessions/pom.xml @@ -76,37 +76,31 @@ org.eclipse.jetty jetty-webapp - ${project.version} test org.eclipse.jetty jetty-client - ${project.version} test org.eclipse.jetty.tests test-sessions-common - ${project.version} test org.eclipse.jetty infinispan-remote-query - ${project.version} test org.eclipse.jetty infinispan-embedded-query - ${project.version} test org.eclipse.jetty jetty-jmx - ${project.version} true test @@ -118,7 +112,6 @@ org.infinispan infinispan-core - ${infinispan.version} test @@ -130,25 +123,21 @@ org.infinispan infinispan-query - ${infinispan.version} test org.infinispan infinispan-client-hotrod - ${infinispan.version} test org.infinispan infinispan-remote-query-client - ${infinispan.version} test org.infinispan.protostream protostream - ${infinispan.protostream.version} test diff --git a/tests/test-sessions/test-jdbc-sessions/pom.xml b/tests/test-sessions/test-jdbc-sessions/pom.xml index 4948223d43b..e4ad034cd03 100644 --- a/tests/test-sessions/test-jdbc-sessions/pom.xml +++ b/tests/test-sessions/test-jdbc-sessions/pom.xml @@ -41,19 +41,16 @@ org.eclipse.jetty jetty-webapp - ${project.version} test org.eclipse.jetty jetty-client - ${project.version} test org.eclipse.jetty.tests test-sessions-common - ${project.version} test diff --git a/tests/test-sessions/test-memcached-sessions/pom.xml b/tests/test-sessions/test-memcached-sessions/pom.xml index 01488a225ba..c5520c34c74 100644 --- a/tests/test-sessions/test-memcached-sessions/pom.xml +++ b/tests/test-sessions/test-memcached-sessions/pom.xml @@ -32,25 +32,21 @@ org.eclipse.jetty jetty-webapp - ${project.version} test org.eclipse.jetty jetty-client - ${project.version} test org.eclipse.jetty.tests test-sessions-common - ${project.version} test org.eclipse.jetty.memcached jetty-memcached-sessions - ${project.version} test diff --git a/tests/test-sessions/test-mongodb-sessions/pom.xml b/tests/test-sessions/test-mongodb-sessions/pom.xml index 08aea5cc78d..632079e3ac6 100644 --- a/tests/test-sessions/test-mongodb-sessions/pom.xml +++ b/tests/test-sessions/test-mongodb-sessions/pom.xml @@ -70,31 +70,26 @@ org.eclipse.jetty jetty-webapp - ${project.version} test org.eclipse.jetty jetty-client - ${project.version} test org.eclipse.jetty.tests test-sessions-common - ${project.version} test org.eclipse.jetty jetty-nosql - ${project.version} test org.eclipse.jetty jetty-jmx - ${project.version} true test diff --git a/tests/test-sessions/test-sessions-common/pom.xml b/tests/test-sessions/test-sessions-common/pom.xml index 74de0ac5295..a4ef15f0983 100644 --- a/tests/test-sessions/test-sessions-common/pom.xml +++ b/tests/test-sessions/test-sessions-common/pom.xml @@ -20,12 +20,10 @@ org.eclipse.jetty jetty-webapp - ${project.version} org.eclipse.jetty jetty-client - ${project.version} org.slf4j diff --git a/tests/test-webapps/test-bad-websocket-webapp/pom.xml b/tests/test-webapps/test-bad-websocket-webapp/pom.xml index 27efb0836b5..1e2e4b367b8 100644 --- a/tests/test-webapps/test-bad-websocket-webapp/pom.xml +++ b/tests/test-webapps/test-bad-websocket-webapp/pom.xml @@ -22,7 +22,6 @@ org.eclipse.jetty.websocket websocket-javax-common - ${project.version} provided diff --git a/tests/test-webapps/test-http2-webapp/pom.xml b/tests/test-webapps/test-http2-webapp/pom.xml index 07db526b78d..a81fc25655f 100644 --- a/tests/test-webapps/test-http2-webapp/pom.xml +++ b/tests/test-webapps/test-http2-webapp/pom.xml @@ -60,7 +60,6 @@ org.eclipse.jetty.http2 http2-client - ${project.version} org.eclipse.jetty.toolchain @@ -70,31 +69,26 @@ org.eclipse.jetty jetty-alpn-java-client - ${project.version} org.eclipse.jetty jetty-alpn-java-server - ${project.version} test org.eclipse.jetty jetty-client - ${project.version} test org.eclipse.jetty jetty-webapp - ${project.version} test org.eclipse.jetty.http2 http2-server - ${project.version} test diff --git a/tests/test-webapps/test-webapp-rfc2616/pom.xml b/tests/test-webapps/test-webapp-rfc2616/pom.xml index fa9c3a6165a..0c94987b14f 100644 --- a/tests/test-webapps/test-webapp-rfc2616/pom.xml +++ b/tests/test-webapps/test-webapp-rfc2616/pom.xml @@ -41,7 +41,6 @@ org.eclipse.jetty jetty-servlets - ${project.version} org.eclipse.jetty.toolchain diff --git a/tests/test-webapps/test-websocket-client-provided-webapp/pom.xml b/tests/test-webapps/test-websocket-client-provided-webapp/pom.xml index aafe053c59f..9e01a1b6784 100644 --- a/tests/test-webapps/test-websocket-client-provided-webapp/pom.xml +++ b/tests/test-webapps/test-websocket-client-provided-webapp/pom.xml @@ -35,7 +35,6 @@ org.eclipse.jetty.websocket websocket-jetty-client - ${project.version} provided diff --git a/tests/test-webapps/test-websocket-client-webapp/pom.xml b/tests/test-webapps/test-websocket-client-webapp/pom.xml index 52113a2e0d5..7e51e75d623 100644 --- a/tests/test-webapps/test-websocket-client-webapp/pom.xml +++ b/tests/test-webapps/test-websocket-client-webapp/pom.xml @@ -35,7 +35,6 @@ org.eclipse.jetty.websocket websocket-jetty-client - ${project.version} diff --git a/tests/test-webapps/test-websocket-webapp/pom.xml b/tests/test-webapps/test-websocket-webapp/pom.xml index f9cc55bc06a..5e616e37138 100644 --- a/tests/test-webapps/test-websocket-webapp/pom.xml +++ b/tests/test-webapps/test-websocket-webapp/pom.xml @@ -30,7 +30,6 @@ org.eclipse.jetty.websocket websocket-javax-common - ${project.version} provided From 0412bdc3d980cc758abbc6fc06166b221598939e Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Thu, 30 Sep 2021 08:57:28 +0200 Subject: [PATCH 17/17] Fixes #6938 - module-info.java file do not use the canonical order for the elements Changed order of entries in module-info.java to be canonical (cherry picked from commit 02691171d500175ac47fedf00a712eeb62dff67c) Signed-off-by: Simone Bordet --- apache-jsp/src/main/java/module-info.java | 19 +++++------- .../src/main/java/module-info.java | 11 +++---- .../src/main/java/module-info.java | 9 +++--- .../src/main/java/module-info.java | 7 ++--- .../src/main/java/module-info.java | 9 +++--- .../src/main/java/module-info.java | 7 ++--- .../src/main/java/module-info.java | 11 +++---- .../src/main/java/module-info.java | 19 +++++------- jetty-cdi/src/main/java/module-info.java | 3 +- jetty-client/src/main/java/module-info.java | 23 ++++++++------ jetty-deploy/src/main/java/module-info.java | 17 +++++----- .../src/main/java/module-info.java | 7 +++-- .../src/main/java/module-info.java | 7 +++-- jetty-http/src/main/java/module-info.java | 15 +++++---- .../src/main/java/module-info.java | 7 +++-- .../src/main/java/module-info.java | 7 +++-- .../src/main/java/module-info.java | 13 ++++---- .../src/main/java/module-info.java | 7 +++-- .../src/main/java/module-info.java | 5 +-- jetty-io/src/main/java/module-info.java | 7 +++-- jetty-jaas/src/main/java/module-info.java | 11 ++++--- jetty-jaspi/src/main/java/module-info.java | 17 +++++----- jetty-jmx/src/main/java/module-info.java | 5 +-- jetty-jndi/src/main/java/module-info.java | 21 +++++++------ .../src/main/java/module-info.java | 2 +- jetty-openid/src/main/java/module-info.java | 7 +++-- jetty-plus/src/main/java/module-info.java | 21 ++++++------- jetty-proxy/src/main/java/module-info.java | 4 +-- .../src/main/java/module-info.java | 7 +++-- jetty-rewrite/src/main/java/module-info.java | 9 +++--- jetty-security/src/main/java/module-info.java | 22 ++++++------- jetty-server/src/main/java/module-info.java | 18 ++++++----- jetty-servlet/src/main/java/module-info.java | 19 +++++++----- jetty-servlets/src/main/java/module-info.java | 5 +-- .../src/main/java/module-info.java | 10 +++--- .../src/main/java/module-info.java | 5 +-- .../src/main/java/module-info.java | 11 ++++--- .../src/main/java/module-info.java | 9 +++--- .../src/main/java/module-info.java | 9 +++--- .../src/main/java/module-info.java | 4 +-- jetty-util/src/main/java/module-info.java | 29 +++++++++-------- jetty-webapp/src/main/java/module-info.java | 11 +++---- .../src/main/java/module-info.java | 5 +-- .../src/main/java/module-info.java | 31 ++++++++----------- .../src/main/java/module-info.java | 5 +-- .../src/main/java/module-info.java | 25 ++++++++------- .../src/main/java/module-info.java | 9 +++--- .../src/main/java/module-info.java | 24 +++++++------- .../src/main/java/module-info.java | 4 +-- .../src/main/java/module-info.java | 8 +++-- .../src/main/java/module-info.java | 11 +++---- .../src/main/java/module-info.java | 20 ++++++------ .../src/main/java/module-info.java | 7 +++-- jetty-xml/src/main/java/module-info.java | 9 +++--- .../src/main/java/module-info.java | 2 +- 55 files changed, 316 insertions(+), 310 deletions(-) diff --git a/apache-jsp/src/main/java/module-info.java b/apache-jsp/src/main/java/module-info.java index a2d356b2989..92698f697f5 100644 --- a/apache-jsp/src/main/java/module-info.java +++ b/apache-jsp/src/main/java/module-info.java @@ -11,23 +11,20 @@ // ======================================================================== // -import javax.servlet.ServletContainerInitializer; - -import org.apache.juli.logging.Log; -import org.eclipse.jetty.apache.jsp.JettyJasperInitializer; -import org.eclipse.jetty.apache.jsp.JuliLog; - module org.eclipse.jetty.apache.jsp { - exports org.eclipse.jetty.apache.jsp; - exports org.eclipse.jetty.jsp; - requires java.xml; requires jetty.servlet.api; requires org.eclipse.jetty.util; requires org.mortbay.apache.jasper; requires org.slf4j; - provides Log with JuliLog; - provides ServletContainerInitializer with JettyJasperInitializer; + exports org.eclipse.jetty.apache.jsp; + exports org.eclipse.jetty.jsp; + + provides org.apache.juli.logging.Log with + org.eclipse.jetty.apache.jsp.JuliLog; + + provides javax.servlet.ServletContainerInitializer with + org.eclipse.jetty.apache.jsp.JettyJasperInitializer; } diff --git a/jetty-alpn/jetty-alpn-client/src/main/java/module-info.java b/jetty-alpn/jetty-alpn-client/src/main/java/module-info.java index 1fa4c719502..ab1f8b5e08b 100644 --- a/jetty-alpn/jetty-alpn-client/src/main/java/module-info.java +++ b/jetty-alpn/jetty-alpn-client/src/main/java/module-info.java @@ -11,14 +11,13 @@ // ======================================================================== // -import org.eclipse.jetty.io.ssl.ALPNProcessor; - module org.eclipse.jetty.alpn.client { - exports org.eclipse.jetty.alpn.client; - - requires transitive org.eclipse.jetty.io; requires org.slf4j; - uses ALPNProcessor.Client; + requires transitive org.eclipse.jetty.io; + + exports org.eclipse.jetty.alpn.client; + + uses org.eclipse.jetty.io.ssl.ALPNProcessor.Client; } diff --git a/jetty-alpn/jetty-alpn-conscrypt-client/src/main/java/module-info.java b/jetty-alpn/jetty-alpn-conscrypt-client/src/main/java/module-info.java index 75839604331..f649362d004 100644 --- a/jetty-alpn/jetty-alpn-conscrypt-client/src/main/java/module-info.java +++ b/jetty-alpn/jetty-alpn-conscrypt-client/src/main/java/module-info.java @@ -11,14 +11,13 @@ // ======================================================================== // -import org.eclipse.jetty.alpn.conscrypt.client.ConscryptClientALPNProcessor; -import org.eclipse.jetty.io.ssl.ALPNProcessor; - module org.eclipse.jetty.alpn.conscrypt.client { requires org.conscrypt; - requires transitive org.eclipse.jetty.alpn.client; requires org.slf4j; - provides ALPNProcessor.Client with ConscryptClientALPNProcessor; + requires transitive org.eclipse.jetty.alpn.client; + + provides org.eclipse.jetty.io.ssl.ALPNProcessor.Client with + org.eclipse.jetty.alpn.conscrypt.client.ConscryptClientALPNProcessor; } diff --git a/jetty-alpn/jetty-alpn-conscrypt-server/src/main/java/module-info.java b/jetty-alpn/jetty-alpn-conscrypt-server/src/main/java/module-info.java index e08bc1a14fb..5baf41284b4 100644 --- a/jetty-alpn/jetty-alpn-conscrypt-server/src/main/java/module-info.java +++ b/jetty-alpn/jetty-alpn-conscrypt-server/src/main/java/module-info.java @@ -11,14 +11,13 @@ // ======================================================================== // -import org.eclipse.jetty.alpn.conscrypt.server.ConscryptServerALPNProcessor; -import org.eclipse.jetty.io.ssl.ALPNProcessor; - module org.eclipse.jetty.alpn.conscrypt.server { requires org.conscrypt; requires org.slf4j; + requires transitive org.eclipse.jetty.alpn.server; - provides ALPNProcessor.Server with ConscryptServerALPNProcessor; + provides org.eclipse.jetty.io.ssl.ALPNProcessor.Server with + org.eclipse.jetty.alpn.conscrypt.server.ConscryptServerALPNProcessor; } diff --git a/jetty-alpn/jetty-alpn-java-client/src/main/java/module-info.java b/jetty-alpn/jetty-alpn-java-client/src/main/java/module-info.java index 694d112a78c..d2e73bab162 100644 --- a/jetty-alpn/jetty-alpn-java-client/src/main/java/module-info.java +++ b/jetty-alpn/jetty-alpn-java-client/src/main/java/module-info.java @@ -11,13 +11,12 @@ // ======================================================================== // -import org.eclipse.jetty.alpn.java.client.JDK9ClientALPNProcessor; -import org.eclipse.jetty.io.ssl.ALPNProcessor; - module org.eclipse.jetty.alpn.java.client { - requires transitive org.eclipse.jetty.alpn.client; requires org.slf4j; - provides ALPNProcessor.Client with JDK9ClientALPNProcessor; + requires transitive org.eclipse.jetty.alpn.client; + + provides org.eclipse.jetty.io.ssl.ALPNProcessor.Client with + org.eclipse.jetty.alpn.java.client.JDK9ClientALPNProcessor; } diff --git a/jetty-alpn/jetty-alpn-java-server/src/main/java/module-info.java b/jetty-alpn/jetty-alpn-java-server/src/main/java/module-info.java index 76d94316310..520b0860356 100644 --- a/jetty-alpn/jetty-alpn-java-server/src/main/java/module-info.java +++ b/jetty-alpn/jetty-alpn-java-server/src/main/java/module-info.java @@ -11,13 +11,12 @@ // ======================================================================== // -import org.eclipse.jetty.alpn.java.server.JDK9ServerALPNProcessor; -import org.eclipse.jetty.io.ssl.ALPNProcessor; - module org.eclipse.jetty.alpn.java.server { requires org.slf4j; + requires transitive org.eclipse.jetty.alpn.server; - provides ALPNProcessor.Server with JDK9ServerALPNProcessor; + provides org.eclipse.jetty.io.ssl.ALPNProcessor.Server with + org.eclipse.jetty.alpn.java.server.JDK9ServerALPNProcessor; } diff --git a/jetty-alpn/jetty-alpn-server/src/main/java/module-info.java b/jetty-alpn/jetty-alpn-server/src/main/java/module-info.java index 7826190f9f5..73b18a266ff 100644 --- a/jetty-alpn/jetty-alpn-server/src/main/java/module-info.java +++ b/jetty-alpn/jetty-alpn-server/src/main/java/module-info.java @@ -11,14 +11,13 @@ // ======================================================================== // -import org.eclipse.jetty.io.ssl.ALPNProcessor; - module org.eclipse.jetty.alpn.server { - exports org.eclipse.jetty.alpn.server; - - requires transitive org.eclipse.jetty.server; requires org.slf4j; - uses ALPNProcessor.Server; + requires transitive org.eclipse.jetty.server; + + exports org.eclipse.jetty.alpn.server; + + uses org.eclipse.jetty.io.ssl.ALPNProcessor.Server; } diff --git a/jetty-annotations/src/main/java/module-info.java b/jetty-annotations/src/main/java/module-info.java index d1e7f5456ce..f6665c65dd0 100644 --- a/jetty-annotations/src/main/java/module-info.java +++ b/jetty-annotations/src/main/java/module-info.java @@ -11,22 +11,19 @@ // ======================================================================== // -import javax.servlet.ServletContainerInitializer; - -import org.eclipse.jetty.annotations.AnnotationConfiguration; -import org.eclipse.jetty.webapp.Configuration; - module org.eclipse.jetty.annotations { - exports org.eclipse.jetty.annotations; - requires java.annotation; requires java.naming; - requires transitive org.eclipse.jetty.plus; - requires transitive org.objectweb.asm; requires org.slf4j; - uses ServletContainerInitializer; + requires transitive org.eclipse.jetty.plus; + requires transitive org.objectweb.asm; - provides Configuration with AnnotationConfiguration; + exports org.eclipse.jetty.annotations; + + uses javax.servlet.ServletContainerInitializer; + + provides org.eclipse.jetty.webapp.Configuration with + org.eclipse.jetty.annotations.AnnotationConfiguration; } diff --git a/jetty-cdi/src/main/java/module-info.java b/jetty-cdi/src/main/java/module-info.java index 6c066370d8f..1b4f64a6f47 100644 --- a/jetty-cdi/src/main/java/module-info.java +++ b/jetty-cdi/src/main/java/module-info.java @@ -14,7 +14,8 @@ module org.eclipse.jetty.cdi { requires org.eclipse.jetty.annotations; + requires transitive org.eclipse.jetty.webapp; exports org.eclipse.jetty.cdi; -} \ No newline at end of file +} diff --git a/jetty-client/src/main/java/module-info.java b/jetty-client/src/main/java/module-info.java index 31515a9388f..a98fd5c4489 100644 --- a/jetty-client/src/main/java/module-info.java +++ b/jetty-client/src/main/java/module-info.java @@ -13,20 +13,23 @@ module org.eclipse.jetty.client { + requires org.eclipse.jetty.alpn.client; + requires org.slf4j; + + requires transitive org.eclipse.jetty.http; + + // Only required if using JMX. + requires static java.management; + // Only required if using SPNEGO. + requires static java.security.jgss; + requires static org.eclipse.jetty.jmx; + exports org.eclipse.jetty.client; exports org.eclipse.jetty.client.api; exports org.eclipse.jetty.client.dynamic; exports org.eclipse.jetty.client.http; - exports org.eclipse.jetty.client.jmx to org.eclipse.jetty.jmx; exports org.eclipse.jetty.client.util; - requires org.eclipse.jetty.alpn.client; - requires transitive org.eclipse.jetty.http; - requires org.slf4j; - - // Only required if using SPNEGO. - requires static java.security.jgss; - // Only required if using JMX. - requires static java.management; - requires static org.eclipse.jetty.jmx; + exports org.eclipse.jetty.client.jmx to + org.eclipse.jetty.jmx; } diff --git a/jetty-deploy/src/main/java/module-info.java b/jetty-deploy/src/main/java/module-info.java index b27ef902a22..7c6605cbc20 100644 --- a/jetty-deploy/src/main/java/module-info.java +++ b/jetty-deploy/src/main/java/module-info.java @@ -13,17 +13,20 @@ module org.eclipse.jetty.deploy { - exports org.eclipse.jetty.deploy; - exports org.eclipse.jetty.deploy.bindings; - exports org.eclipse.jetty.deploy.graph; - exports org.eclipse.jetty.deploy.jmx to org.eclipse.jetty.jmx; - exports org.eclipse.jetty.deploy.providers; - requires java.xml; - requires transitive org.eclipse.jetty.webapp; requires org.eclipse.jetty.xml; requires org.slf4j; + requires transitive org.eclipse.jetty.webapp; + // Only required if using JMX. requires static org.eclipse.jetty.jmx; + + exports org.eclipse.jetty.deploy; + exports org.eclipse.jetty.deploy.bindings; + exports org.eclipse.jetty.deploy.graph; + exports org.eclipse.jetty.deploy.providers; + + exports org.eclipse.jetty.deploy.jmx to + org.eclipse.jetty.jmx; } diff --git a/jetty-fcgi/fcgi-client/src/main/java/module-info.java b/jetty-fcgi/fcgi-client/src/main/java/module-info.java index 56a688dc46d..022f80ca129 100644 --- a/jetty-fcgi/fcgi-client/src/main/java/module-info.java +++ b/jetty-fcgi/fcgi-client/src/main/java/module-info.java @@ -13,11 +13,12 @@ module org.eclipse.jetty.fcgi.client { + requires org.slf4j; + + requires transitive org.eclipse.jetty.client; + exports org.eclipse.jetty.fcgi; exports org.eclipse.jetty.fcgi.client.http; exports org.eclipse.jetty.fcgi.generator; exports org.eclipse.jetty.fcgi.parser; - - requires transitive org.eclipse.jetty.client; - requires org.slf4j; } diff --git a/jetty-fcgi/fcgi-server/src/main/java/module-info.java b/jetty-fcgi/fcgi-server/src/main/java/module-info.java index f2556a3b90a..ecc1112e90d 100644 --- a/jetty-fcgi/fcgi-server/src/main/java/module-info.java +++ b/jetty-fcgi/fcgi-server/src/main/java/module-info.java @@ -13,13 +13,14 @@ module org.eclipse.jetty.fcgi.server { - exports org.eclipse.jetty.fcgi.server; - exports org.eclipse.jetty.fcgi.server.proxy; + requires org.slf4j; requires transitive org.eclipse.jetty.fcgi.client; requires transitive org.eclipse.jetty.proxy; - requires org.slf4j; // Only required if using the proxy features. requires static jetty.servlet.api; + + exports org.eclipse.jetty.fcgi.server; + exports org.eclipse.jetty.fcgi.server.proxy; } diff --git a/jetty-http/src/main/java/module-info.java b/jetty-http/src/main/java/module-info.java index 718a5ee88d7..76b4ddc5c39 100644 --- a/jetty-http/src/main/java/module-info.java +++ b/jetty-http/src/main/java/module-info.java @@ -11,18 +11,17 @@ // ======================================================================== // -import org.eclipse.jetty.http.Http1FieldPreEncoder; -import org.eclipse.jetty.http.HttpFieldPreEncoder; - module org.eclipse.jetty.http { + requires org.slf4j; + + requires transitive org.eclipse.jetty.io; + exports org.eclipse.jetty.http; exports org.eclipse.jetty.http.pathmap; - requires transitive org.eclipse.jetty.io; - requires org.slf4j; + uses org.eclipse.jetty.http.HttpFieldPreEncoder; - uses HttpFieldPreEncoder; - - provides HttpFieldPreEncoder with Http1FieldPreEncoder; + provides org.eclipse.jetty.http.HttpFieldPreEncoder with + org.eclipse.jetty.http.Http1FieldPreEncoder; } diff --git a/jetty-http2/http2-client/src/main/java/module-info.java b/jetty-http2/http2-client/src/main/java/module-info.java index 2049c4efe6f..602d8d17567 100644 --- a/jetty-http2/http2-client/src/main/java/module-info.java +++ b/jetty-http2/http2-client/src/main/java/module-info.java @@ -13,9 +13,10 @@ module org.eclipse.jetty.http2.client { - exports org.eclipse.jetty.http2.client; - requires org.eclipse.jetty.alpn.client; - requires transitive org.eclipse.jetty.http2.common; requires org.slf4j; + + requires transitive org.eclipse.jetty.http2.common; + + exports org.eclipse.jetty.http2.client; } diff --git a/jetty-http2/http2-common/src/main/java/module-info.java b/jetty-http2/http2-common/src/main/java/module-info.java index 1238a74ca80..1a3d5d3f98f 100644 --- a/jetty-http2/http2-common/src/main/java/module-info.java +++ b/jetty-http2/http2-common/src/main/java/module-info.java @@ -13,13 +13,14 @@ module org.eclipse.jetty.http2.common { + requires org.slf4j; + + requires transitive org.eclipse.jetty.http2.hpack; + exports org.eclipse.jetty.http2; exports org.eclipse.jetty.http2.api; exports org.eclipse.jetty.http2.api.server; exports org.eclipse.jetty.http2.frames; exports org.eclipse.jetty.http2.generator; exports org.eclipse.jetty.http2.parser; - - requires transitive org.eclipse.jetty.http2.hpack; - requires org.slf4j; } diff --git a/jetty-http2/http2-hpack/src/main/java/module-info.java b/jetty-http2/http2-hpack/src/main/java/module-info.java index 2a544673e09..d3a6e40d58a 100644 --- a/jetty-http2/http2-hpack/src/main/java/module-info.java +++ b/jetty-http2/http2-hpack/src/main/java/module-info.java @@ -11,15 +11,14 @@ // ======================================================================== // -import org.eclipse.jetty.http.HttpFieldPreEncoder; -import org.eclipse.jetty.http2.hpack.HpackFieldPreEncoder; - module org.eclipse.jetty.http2.hpack { - exports org.eclipse.jetty.http2.hpack; - - requires transitive org.eclipse.jetty.http; requires org.slf4j; - provides HttpFieldPreEncoder with HpackFieldPreEncoder; + requires transitive org.eclipse.jetty.http; + + exports org.eclipse.jetty.http2.hpack; + + provides org.eclipse.jetty.http.HttpFieldPreEncoder with + org.eclipse.jetty.http2.hpack.HpackFieldPreEncoder; } diff --git a/jetty-http2/http2-http-client-transport/src/main/java/module-info.java b/jetty-http2/http2-http-client-transport/src/main/java/module-info.java index 4f3b5143551..f95f90134ae 100644 --- a/jetty-http2/http2-http-client-transport/src/main/java/module-info.java +++ b/jetty-http2/http2-http-client-transport/src/main/java/module-info.java @@ -13,10 +13,11 @@ module org.eclipse.jetty.http2.http.client.transport { - exports org.eclipse.jetty.http2.client.http; - requires org.eclipse.jetty.alpn.client; + requires org.slf4j; + requires transitive org.eclipse.jetty.client; requires transitive org.eclipse.jetty.http2.client; - requires org.slf4j; + + exports org.eclipse.jetty.http2.client.http; } diff --git a/jetty-http2/http2-server/src/main/java/module-info.java b/jetty-http2/http2-server/src/main/java/module-info.java index ac6252dff88..8b069e96338 100644 --- a/jetty-http2/http2-server/src/main/java/module-info.java +++ b/jetty-http2/http2-server/src/main/java/module-info.java @@ -13,9 +13,10 @@ module org.eclipse.jetty.http2.server { - exports org.eclipse.jetty.http2.server; + requires org.slf4j; requires transitive org.eclipse.jetty.http2.common; requires transitive org.eclipse.jetty.server; - requires org.slf4j; + + exports org.eclipse.jetty.http2.server; } diff --git a/jetty-io/src/main/java/module-info.java b/jetty-io/src/main/java/module-info.java index aa51953d0c3..45cf24f521e 100644 --- a/jetty-io/src/main/java/module-info.java +++ b/jetty-io/src/main/java/module-info.java @@ -13,12 +13,13 @@ module org.eclipse.jetty.io { - exports org.eclipse.jetty.io; - exports org.eclipse.jetty.io.ssl; + requires org.slf4j; requires transitive org.eclipse.jetty.util; - requires org.slf4j; // Only required if using JMX. requires static org.eclipse.jetty.jmx; + + exports org.eclipse.jetty.io; + exports org.eclipse.jetty.io.ssl; } diff --git a/jetty-jaas/src/main/java/module-info.java b/jetty-jaas/src/main/java/module-info.java index 0cb97ebe593..eaff73b3f24 100644 --- a/jetty-jaas/src/main/java/module-info.java +++ b/jetty-jaas/src/main/java/module-info.java @@ -13,14 +13,15 @@ module org.eclipse.jetty.jaas { - exports org.eclipse.jetty.jaas; - exports org.eclipse.jetty.jaas.callback; - exports org.eclipse.jetty.jaas.spi; + requires org.slf4j; + requires org.eclipse.jetty.util; requires transitive org.eclipse.jetty.security; - requires org.slf4j; // Only required if using JDBCLoginModule. requires static java.sql; - requires org.eclipse.jetty.util; + + exports org.eclipse.jetty.jaas; + exports org.eclipse.jetty.jaas.callback; + exports org.eclipse.jetty.jaas.spi; } diff --git a/jetty-jaspi/src/main/java/module-info.java b/jetty-jaspi/src/main/java/module-info.java index a4cade9e4c5..bbe7b27409c 100644 --- a/jetty-jaspi/src/main/java/module-info.java +++ b/jetty-jaspi/src/main/java/module-info.java @@ -11,20 +11,19 @@ // ======================================================================== // -import org.eclipse.jetty.security.Authenticator; -import org.eclipse.jetty.security.jaspi.JaspiAuthenticatorFactory; - module org.eclipse.jetty.security.jaspi { + requires jetty.servlet.api; + requires org.slf4j; + + requires transitive javax.security.auth.message; + requires transitive org.eclipse.jetty.security; + exports org.eclipse.jetty.security.jaspi; exports org.eclipse.jetty.security.jaspi.callback; exports org.eclipse.jetty.security.jaspi.modules; exports org.eclipse.jetty.security.jaspi.provider; - requires transitive javax.security.auth.message; - requires jetty.servlet.api; - requires transitive org.eclipse.jetty.security; - requires org.slf4j; - - provides Authenticator.Factory with JaspiAuthenticatorFactory; + provides org.eclipse.jetty.security.Authenticator.Factory with + org.eclipse.jetty.security.jaspi.JaspiAuthenticatorFactory; } diff --git a/jetty-jmx/src/main/java/module-info.java b/jetty-jmx/src/main/java/module-info.java index 713c562fb31..0c753ae103f 100644 --- a/jetty-jmx/src/main/java/module-info.java +++ b/jetty-jmx/src/main/java/module-info.java @@ -13,14 +13,15 @@ module org.eclipse.jetty.jmx { - exports org.eclipse.jetty.jmx; + requires org.slf4j; // Applications that use ObjectMBean must use JMX classes too. requires transitive java.management; requires transitive org.eclipse.jetty.util; - requires org.slf4j; // Only required if using ConnectorServer. requires static java.management.rmi; requires static java.rmi; + + exports org.eclipse.jetty.jmx; } diff --git a/jetty-jndi/src/main/java/module-info.java b/jetty-jndi/src/main/java/module-info.java index 49cdb5aae1b..22d11630372 100644 --- a/jetty-jndi/src/main/java/module-info.java +++ b/jetty-jndi/src/main/java/module-info.java @@ -13,18 +13,19 @@ module org.eclipse.jetty.jndi { + requires org.slf4j; + + requires transitive java.naming; + requires transitive org.eclipse.jetty.server; + + // Only required if using MailSessionReference. + requires static javax.mail.glassfish; + // Only required if using DataSourceCloser. + requires static java.sql; + requires static org.eclipse.jetty.security; + exports org.eclipse.jetty.jndi; exports org.eclipse.jetty.jndi.factories; exports org.eclipse.jetty.jndi.java; exports org.eclipse.jetty.jndi.local; - - requires transitive java.naming; - requires transitive org.eclipse.jetty.server; - requires org.slf4j; - - // Only required if using DataSourceCloser. - requires static java.sql; - // Only required if using MailSessionReference. - requires static javax.mail.glassfish; - requires static org.eclipse.jetty.security; } diff --git a/jetty-memcached/jetty-memcached-sessions/src/main/java/module-info.java b/jetty-memcached/jetty-memcached-sessions/src/main/java/module-info.java index 01b313cfc3c..9b83c74aec2 100644 --- a/jetty-memcached/jetty-memcached-sessions/src/main/java/module-info.java +++ b/jetty-memcached/jetty-memcached-sessions/src/main/java/module-info.java @@ -18,4 +18,4 @@ module org.eclipse.jetty.memcached.session requires transitive xmemcached; exports org.eclipse.jetty.memcached.session; -} \ No newline at end of file +} diff --git a/jetty-openid/src/main/java/module-info.java b/jetty-openid/src/main/java/module-info.java index 2c70122d18c..f518a176f3b 100644 --- a/jetty-openid/src/main/java/module-info.java +++ b/jetty-openid/src/main/java/module-info.java @@ -13,9 +13,10 @@ module org.eclipse.jetty.security.openid { - requires transitive org.eclipse.jetty.client; - requires transitive org.eclipse.jetty.security; requires org.eclipse.jetty.util.ajax; + requires transitive org.eclipse.jetty.client; + requires transitive org.eclipse.jetty.security; + exports org.eclipse.jetty.security.openid; -} \ No newline at end of file +} diff --git a/jetty-plus/src/main/java/module-info.java b/jetty-plus/src/main/java/module-info.java index 52a0fb30816..18fce3d9be4 100644 --- a/jetty-plus/src/main/java/module-info.java +++ b/jetty-plus/src/main/java/module-info.java @@ -11,21 +11,13 @@ // ======================================================================== // -import org.eclipse.jetty.plus.webapp.EnvConfiguration; -import org.eclipse.jetty.plus.webapp.PlusConfiguration; -import org.eclipse.jetty.webapp.Configuration; - module org.eclipse.jetty.plus { - exports org.eclipse.jetty.plus.annotation; - exports org.eclipse.jetty.plus.jndi; - exports org.eclipse.jetty.plus.security; - exports org.eclipse.jetty.plus.webapp; - requires org.eclipse.jetty.jndi; - requires transitive org.eclipse.jetty.webapp; requires org.slf4j; + requires transitive org.eclipse.jetty.webapp; + // Only required if using DataSourceLoginService. requires static java.sql; // Only required if using Transaction. @@ -33,5 +25,12 @@ module org.eclipse.jetty.plus // Only required if using RunAs. requires static org.eclipse.jetty.servlet; - provides Configuration with EnvConfiguration, PlusConfiguration; + exports org.eclipse.jetty.plus.annotation; + exports org.eclipse.jetty.plus.jndi; + exports org.eclipse.jetty.plus.security; + exports org.eclipse.jetty.plus.webapp; + + provides org.eclipse.jetty.webapp.Configuration with + org.eclipse.jetty.plus.webapp.EnvConfiguration, + org.eclipse.jetty.plus.webapp.PlusConfiguration; } diff --git a/jetty-proxy/src/main/java/module-info.java b/jetty-proxy/src/main/java/module-info.java index 7f6e8580415..9bc4f5a5e75 100644 --- a/jetty-proxy/src/main/java/module-info.java +++ b/jetty-proxy/src/main/java/module-info.java @@ -13,9 +13,9 @@ module org.eclipse.jetty.proxy { - exports org.eclipse.jetty.proxy; - requires transitive org.eclipse.jetty.client; requires transitive org.eclipse.jetty.server; requires transitive org.slf4j; + + exports org.eclipse.jetty.proxy; } diff --git a/jetty-quickstart/src/main/java/module-info.java b/jetty-quickstart/src/main/java/module-info.java index d5cdf8f5fd5..38fda9e4084 100644 --- a/jetty-quickstart/src/main/java/module-info.java +++ b/jetty-quickstart/src/main/java/module-info.java @@ -13,9 +13,10 @@ module org.eclipse.jetty.quickstart { - exports org.eclipse.jetty.quickstart; - requires jetty.servlet.api; - requires transitive org.eclipse.jetty.annotations; requires org.slf4j; + + requires transitive org.eclipse.jetty.annotations; + + exports org.eclipse.jetty.quickstart; } diff --git a/jetty-rewrite/src/main/java/module-info.java b/jetty-rewrite/src/main/java/module-info.java index 24a8777d841..6508b1f1349 100644 --- a/jetty-rewrite/src/main/java/module-info.java +++ b/jetty-rewrite/src/main/java/module-info.java @@ -13,10 +13,11 @@ module org.eclipse.jetty.rewrite { + requires jetty.servlet.api; + requires org.slf4j; + + requires transitive org.eclipse.jetty.server; + exports org.eclipse.jetty.rewrite; exports org.eclipse.jetty.rewrite.handler; - - requires jetty.servlet.api; - requires transitive org.eclipse.jetty.server; - requires org.slf4j; } diff --git a/jetty-security/src/main/java/module-info.java b/jetty-security/src/main/java/module-info.java index 20eb1d2907c..8ea25e789b0 100644 --- a/jetty-security/src/main/java/module-info.java +++ b/jetty-security/src/main/java/module-info.java @@ -11,20 +11,20 @@ // ======================================================================== // -import org.eclipse.jetty.security.Authenticator; - module org.eclipse.jetty.security { + requires org.slf4j; + + requires transitive org.eclipse.jetty.server; + + // Only required if using SPNEGO. + requires static java.security.jgss; + // Only required if using JDBCLoginService. + requires static java.sql; + exports org.eclipse.jetty.security; exports org.eclipse.jetty.security.authentication; - requires transitive org.eclipse.jetty.server; - requires org.slf4j; - - // Only required if using JDBCLoginService. - requires static java.sql; - // Only required if using SPNEGO. - requires static java.security.jgss; - - uses Authenticator.Factory; + uses org.eclipse.jetty.security.Authenticator.Factory; } + diff --git a/jetty-server/src/main/java/module-info.java b/jetty-server/src/main/java/module-info.java index 0d15a24947a..0af03e21647 100644 --- a/jetty-server/src/main/java/module-info.java +++ b/jetty-server/src/main/java/module-info.java @@ -13,13 +13,6 @@ module org.eclipse.jetty.server { - exports org.eclipse.jetty.server; - exports org.eclipse.jetty.server.handler; - exports org.eclipse.jetty.server.handler.gzip; - exports org.eclipse.jetty.server.handler.jmx to org.eclipse.jetty.jmx; - exports org.eclipse.jetty.server.jmx to org.eclipse.jetty.jmx; - exports org.eclipse.jetty.server.session; - requires transitive jetty.servlet.api; requires transitive org.eclipse.jetty.http; requires transitive org.slf4j; @@ -29,4 +22,15 @@ module org.eclipse.jetty.server requires static java.naming; // Only required if using JMX. requires static org.eclipse.jetty.jmx; + + exports org.eclipse.jetty.server; + exports org.eclipse.jetty.server.handler; + exports org.eclipse.jetty.server.handler.gzip; + exports org.eclipse.jetty.server.session; + + exports org.eclipse.jetty.server.handler.jmx to + org.eclipse.jetty.jmx; + + exports org.eclipse.jetty.server.jmx to + org.eclipse.jetty.jmx; } diff --git a/jetty-servlet/src/main/java/module-info.java b/jetty-servlet/src/main/java/module-info.java index f1035d2d7d6..4221c8a9113 100644 --- a/jetty-servlet/src/main/java/module-info.java +++ b/jetty-servlet/src/main/java/module-info.java @@ -13,18 +13,21 @@ module org.eclipse.jetty.servlet { - exports org.eclipse.jetty.servlet; - exports org.eclipse.jetty.servlet.jmx to org.eclipse.jetty.jmx; - exports org.eclipse.jetty.servlet.listener; - - requires transitive org.eclipse.jetty.security; requires org.slf4j; - // Only required if using StatisticsServlet. - requires static java.management; - requires static org.eclipse.jetty.util.ajax; + requires transitive org.eclipse.jetty.security; + // Only required if using IntrospectorCleaner. requires static java.desktop; + // Only required if using StatisticsServlet. + requires static java.management; // Only required if using JMX. requires static org.eclipse.jetty.jmx; + requires static org.eclipse.jetty.util.ajax; + + exports org.eclipse.jetty.servlet; + exports org.eclipse.jetty.servlet.listener; + + exports org.eclipse.jetty.servlet.jmx to + org.eclipse.jetty.jmx; } diff --git a/jetty-servlets/src/main/java/module-info.java b/jetty-servlets/src/main/java/module-info.java index 4ca60c9233f..fd0762edde4 100644 --- a/jetty-servlets/src/main/java/module-info.java +++ b/jetty-servlets/src/main/java/module-info.java @@ -16,10 +16,9 @@ // but other utility classes that depend on some Jetty module. module org.eclipse.jetty.servlets { - exports org.eclipse.jetty.servlets; + requires org.slf4j; requires transitive jetty.servlet.api; - requires org.slf4j; // Only required if using CloseableDoSFilter. requires static org.eclipse.jetty.io; @@ -28,4 +27,6 @@ module org.eclipse.jetty.servlets requires static org.eclipse.jetty.server; // Only required if using CrossOriginFilter, DoSFilter, etc. requires static org.eclipse.jetty.util; + + exports org.eclipse.jetty.servlets; } diff --git a/jetty-slf4j-impl/src/main/java/module-info.java b/jetty-slf4j-impl/src/main/java/module-info.java index 40372a04ed8..0d0b42c8813 100644 --- a/jetty-slf4j-impl/src/main/java/module-info.java +++ b/jetty-slf4j-impl/src/main/java/module-info.java @@ -11,15 +11,13 @@ // ======================================================================== // -import org.eclipse.jetty.logging.JettyLoggingServiceProvider; -import org.slf4j.spi.SLF4JServiceProvider; - module org.eclipse.jetty.logging { - exports org.eclipse.jetty.logging; - requires transitive java.management; requires transitive org.slf4j; - provides SLF4JServiceProvider with JettyLoggingServiceProvider; + exports org.eclipse.jetty.logging; + + provides org.slf4j.spi.SLF4JServiceProvider with + org.eclipse.jetty.logging.JettyLoggingServiceProvider; } diff --git a/jetty-unixdomain-server/src/main/java/module-info.java b/jetty-unixdomain-server/src/main/java/module-info.java index 97065cabead..f6132447fdf 100644 --- a/jetty-unixdomain-server/src/main/java/module-info.java +++ b/jetty-unixdomain-server/src/main/java/module-info.java @@ -13,8 +13,9 @@ module org.eclipse.jetty.unixdomain.server { - exports org.eclipse.jetty.unixdomain.server; + requires org.slf4j; requires transitive org.eclipse.jetty.server; - requires org.slf4j; + + exports org.eclipse.jetty.unixdomain.server; } diff --git a/jetty-unixsocket/jetty-unixsocket-client/src/main/java/module-info.java b/jetty-unixsocket/jetty-unixsocket-client/src/main/java/module-info.java index 40fdda1994a..da8b976d258 100644 --- a/jetty-unixsocket/jetty-unixsocket-client/src/main/java/module-info.java +++ b/jetty-unixsocket/jetty-unixsocket-client/src/main/java/module-info.java @@ -13,11 +13,12 @@ module org.eclipse.jetty.unixsocket.client { - exports org.eclipse.jetty.unixsocket.client; - - requires transitive org.jnrproject.enxio; - requires transitive org.jnrproject.unixsocket; - requires transitive org.eclipse.jetty.client; requires org.eclipse.jetty.unixsocket.common; requires org.slf4j; + + requires transitive org.eclipse.jetty.client; + requires transitive org.jnrproject.enxio; + requires transitive org.jnrproject.unixsocket; + + exports org.eclipse.jetty.unixsocket.client; } diff --git a/jetty-unixsocket/jetty-unixsocket-common/src/main/java/module-info.java b/jetty-unixsocket/jetty-unixsocket-common/src/main/java/module-info.java index 52fd7e519e1..e0a2686b0df 100644 --- a/jetty-unixsocket/jetty-unixsocket-common/src/main/java/module-info.java +++ b/jetty-unixsocket/jetty-unixsocket-common/src/main/java/module-info.java @@ -13,9 +13,10 @@ module org.eclipse.jetty.unixsocket.common { - exports org.eclipse.jetty.unixsocket.common; - - requires transitive org.jnrproject.unixsocket; - requires transitive org.eclipse.jetty.io; requires org.slf4j; + + requires transitive org.eclipse.jetty.io; + requires transitive org.jnrproject.unixsocket; + + exports org.eclipse.jetty.unixsocket.common; } diff --git a/jetty-unixsocket/jetty-unixsocket-server/src/main/java/module-info.java b/jetty-unixsocket/jetty-unixsocket-server/src/main/java/module-info.java index 75b7daa7381..1a48df4f7f2 100644 --- a/jetty-unixsocket/jetty-unixsocket-server/src/main/java/module-info.java +++ b/jetty-unixsocket/jetty-unixsocket-server/src/main/java/module-info.java @@ -13,11 +13,12 @@ module org.eclipse.jetty.unixsocket.server { - exports org.eclipse.jetty.unixsocket.server; + requires org.slf4j; - requires transitive org.jnrproject.enxio; - requires transitive org.jnrproject.unixsocket; requires transitive org.eclipse.jetty.server; requires transitive org.eclipse.jetty.unixsocket.common; - requires org.slf4j; + requires transitive org.jnrproject.enxio; + requires transitive org.jnrproject.unixsocket; + + exports org.eclipse.jetty.unixsocket.server; } diff --git a/jetty-util-ajax/src/main/java/module-info.java b/jetty-util-ajax/src/main/java/module-info.java index 28d9c437c07..d298c454dc3 100644 --- a/jetty-util-ajax/src/main/java/module-info.java +++ b/jetty-util-ajax/src/main/java/module-info.java @@ -13,8 +13,8 @@ module org.eclipse.jetty.util.ajax { - exports org.eclipse.jetty.util.ajax; - requires org.eclipse.jetty.util; requires org.slf4j; + + exports org.eclipse.jetty.util.ajax; } diff --git a/jetty-util/src/main/java/module-info.java b/jetty-util/src/main/java/module-info.java index fd75dcc635c..6c3ff94320e 100644 --- a/jetty-util/src/main/java/module-info.java +++ b/jetty-util/src/main/java/module-info.java @@ -11,10 +11,21 @@ // ======================================================================== // -import org.eclipse.jetty.util.security.CredentialProvider; - module org.eclipse.jetty.util { + // Standard Jetty Logging now. + requires org.slf4j; + + // Required by SSL code (for X509). + requires transitive java.naming; + + // Only required if using AppContextLeakPreventer/AWTLeakPreventer. + requires static java.desktop; + // Only required if using JavaUtilLog. + requires static java.logging; + // Only required if using DriverManagerLeakPreventer. + requires static java.sql; + exports org.eclipse.jetty.util; exports org.eclipse.jetty.util.annotation; exports org.eclipse.jetty.util.component; @@ -28,17 +39,5 @@ module org.eclipse.jetty.util exports org.eclipse.jetty.util.thread; exports org.eclipse.jetty.util.thread.strategy; - // Required by SSL code (for X509). - requires transitive java.naming; - - // Standard Jetty Logging now. - requires org.slf4j; - // Only required if using DriverManagerLeakPreventer. - requires static java.sql; - // Only required if using AppContextLeakPreventer/AWTLeakPreventer. - requires static java.desktop; - // Only required if using JavaUtilLog. - requires static java.logging; - - uses CredentialProvider; + uses org.eclipse.jetty.util.security.CredentialProvider; } diff --git a/jetty-webapp/src/main/java/module-info.java b/jetty-webapp/src/main/java/module-info.java index 5121f5eca99..89cfecc76cb 100644 --- a/jetty-webapp/src/main/java/module-info.java +++ b/jetty-webapp/src/main/java/module-info.java @@ -11,20 +11,19 @@ // ======================================================================== // -import org.eclipse.jetty.webapp.Configuration; - module org.eclipse.jetty.webapp { - exports org.eclipse.jetty.webapp; + requires org.slf4j; requires transitive java.instrument; requires transitive org.eclipse.jetty.servlet; requires transitive org.eclipse.jetty.xml; - requires org.slf4j; - uses Configuration; + exports org.eclipse.jetty.webapp; - provides Configuration with + uses org.eclipse.jetty.webapp.Configuration; + + provides org.eclipse.jetty.webapp.Configuration with org.eclipse.jetty.webapp.FragmentConfiguration, org.eclipse.jetty.webapp.JaasConfiguration, org.eclipse.jetty.webapp.JaspiConfiguration, diff --git a/jetty-websocket/websocket-core-client/src/main/java/module-info.java b/jetty-websocket/websocket-core-client/src/main/java/module-info.java index 950c2060a16..e1139735009 100644 --- a/jetty-websocket/websocket-core-client/src/main/java/module-info.java +++ b/jetty-websocket/websocket-core-client/src/main/java/module-info.java @@ -13,12 +13,13 @@ module org.eclipse.jetty.websocket.core.client { - exports org.eclipse.jetty.websocket.core.client; - requires org.slf4j; + requires transitive org.eclipse.jetty.client; requires transitive org.eclipse.jetty.websocket.core.common; // Only required if using XmlHttpClientProvider. requires static org.eclipse.jetty.xml; + + exports org.eclipse.jetty.websocket.core.client; } diff --git a/jetty-websocket/websocket-core-common/src/main/java/module-info.java b/jetty-websocket/websocket-core-common/src/main/java/module-info.java index 822e3c6c6ac..8703605be28 100644 --- a/jetty-websocket/websocket-core-common/src/main/java/module-info.java +++ b/jetty-websocket/websocket-core-common/src/main/java/module-info.java @@ -11,14 +11,14 @@ // ======================================================================== // -import org.eclipse.jetty.websocket.core.Extension; -import org.eclipse.jetty.websocket.core.internal.FragmentExtension; -import org.eclipse.jetty.websocket.core.internal.IdentityExtension; -import org.eclipse.jetty.websocket.core.internal.PerMessageDeflateExtension; -import org.eclipse.jetty.websocket.core.internal.ValidationExtension; - module org.eclipse.jetty.websocket.core.common { + requires org.eclipse.jetty.http; + requires org.slf4j; + + requires transitive org.eclipse.jetty.io; + requires transitive org.eclipse.jetty.util; + exports org.eclipse.jetty.websocket.core; exports org.eclipse.jetty.websocket.core.exception; @@ -44,16 +44,11 @@ module org.eclipse.jetty.websocket.core.common org.eclipse.jetty.websocket.javax.client, org.eclipse.jetty.websocket.javax.server; - requires org.eclipse.jetty.http; - requires transitive org.eclipse.jetty.io; - requires transitive org.eclipse.jetty.util; - requires org.slf4j; - - uses Extension; - - provides Extension with - FragmentExtension, - IdentityExtension, - PerMessageDeflateExtension, - ValidationExtension; + uses org.eclipse.jetty.websocket.core.Extension; + + provides org.eclipse.jetty.websocket.core.Extension with + org.eclipse.jetty.websocket.core.internal.FragmentExtension, + org.eclipse.jetty.websocket.core.internal.IdentityExtension, + org.eclipse.jetty.websocket.core.internal.PerMessageDeflateExtension, + org.eclipse.jetty.websocket.core.internal.ValidationExtension; } diff --git a/jetty-websocket/websocket-core-server/src/main/java/module-info.java b/jetty-websocket/websocket-core-server/src/main/java/module-info.java index 915f30ecb0a..6b31a5c2fb7 100644 --- a/jetty-websocket/websocket-core-server/src/main/java/module-info.java +++ b/jetty-websocket/websocket-core-server/src/main/java/module-info.java @@ -13,9 +13,10 @@ module org.eclipse.jetty.websocket.core.server { - exports org.eclipse.jetty.websocket.core.server; - requires org.slf4j; + requires transitive org.eclipse.jetty.server; requires transitive org.eclipse.jetty.websocket.core.common; + + exports org.eclipse.jetty.websocket.core.server; } diff --git a/jetty-websocket/websocket-javax-client/src/main/java/module-info.java b/jetty-websocket/websocket-javax-client/src/main/java/module-info.java index 41fd3072940..c667ce00f74 100644 --- a/jetty-websocket/websocket-javax-client/src/main/java/module-info.java +++ b/jetty-websocket/websocket-javax-client/src/main/java/module-info.java @@ -11,21 +11,22 @@ // ======================================================================== // -import javax.websocket.ContainerProvider; - -import org.eclipse.jetty.websocket.javax.client.JavaxWebSocketClientContainerProvider; - module org.eclipse.jetty.websocket.javax.client { - exports org.eclipse.jetty.websocket.javax.client; - exports org.eclipse.jetty.websocket.javax.client.internal to org.eclipse.jetty.websocket.javax.server; - - requires static jetty.servlet.api; - requires org.slf4j; requires org.eclipse.jetty.websocket.core.client; requires org.eclipse.jetty.websocket.javax.common; - requires transitive org.eclipse.jetty.client; - requires transitive jetty.websocket.api; + requires org.slf4j; - provides ContainerProvider with JavaxWebSocketClientContainerProvider; + requires transitive jetty.websocket.api; + requires transitive org.eclipse.jetty.client; + + requires static jetty.servlet.api; + + exports org.eclipse.jetty.websocket.javax.client; + + exports org.eclipse.jetty.websocket.javax.client.internal to + org.eclipse.jetty.websocket.javax.server; + + provides javax.websocket.ContainerProvider with + org.eclipse.jetty.websocket.javax.client.JavaxWebSocketClientContainerProvider; } diff --git a/jetty-websocket/websocket-javax-common/src/main/java/module-info.java b/jetty-websocket/websocket-javax-common/src/main/java/module-info.java index a4a97dd8a1b..2d50df733ca 100644 --- a/jetty-websocket/websocket-javax-common/src/main/java/module-info.java +++ b/jetty-websocket/websocket-javax-common/src/main/java/module-info.java @@ -13,12 +13,13 @@ module org.eclipse.jetty.websocket.javax.common { + requires org.slf4j; + + requires transitive jetty.websocket.api; + requires transitive org.eclipse.jetty.websocket.core.client; + exports org.eclipse.jetty.websocket.javax.common; exports org.eclipse.jetty.websocket.javax.common.decoders; exports org.eclipse.jetty.websocket.javax.common.encoders; exports org.eclipse.jetty.websocket.javax.common.messages; - - requires org.slf4j; - requires transitive jetty.websocket.api; - requires transitive org.eclipse.jetty.websocket.core.client; } diff --git a/jetty-websocket/websocket-javax-server/src/main/java/module-info.java b/jetty-websocket/websocket-javax-server/src/main/java/module-info.java index 5f525eb5881..cdc4e481b0f 100644 --- a/jetty-websocket/websocket-javax-server/src/main/java/module-info.java +++ b/jetty-websocket/websocket-javax-server/src/main/java/module-info.java @@ -11,26 +11,24 @@ // ======================================================================== // -import javax.servlet.ServletContainerInitializer; -import javax.websocket.server.ServerEndpointConfig; - -import org.eclipse.jetty.webapp.Configuration; -import org.eclipse.jetty.websocket.javax.server.config.ContainerDefaultConfigurator; -import org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketConfiguration; -import org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketServletContainerInitializer; - module org.eclipse.jetty.websocket.javax.server { - exports org.eclipse.jetty.websocket.javax.server.config; - requires org.eclipse.jetty.websocket.core.server; requires org.eclipse.jetty.websocket.javax.common; requires org.eclipse.jetty.websocket.servlet; requires org.slf4j; + requires transitive org.eclipse.jetty.webapp; requires transitive org.eclipse.jetty.websocket.javax.client; - provides Configuration with JavaxWebSocketConfiguration; - provides ServerEndpointConfig.Configurator with ContainerDefaultConfigurator; - provides ServletContainerInitializer with JavaxWebSocketServletContainerInitializer; + exports org.eclipse.jetty.websocket.javax.server.config; + + provides javax.servlet.ServletContainerInitializer with + org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketServletContainerInitializer; + + provides javax.websocket.server.ServerEndpointConfig.Configurator with + org.eclipse.jetty.websocket.javax.server.config.ContainerDefaultConfigurator; + + provides org.eclipse.jetty.webapp.Configuration with + org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketConfiguration; } diff --git a/jetty-websocket/websocket-jetty-api/src/main/java/module-info.java b/jetty-websocket/websocket-jetty-api/src/main/java/module-info.java index 5dff1f65044..a262968bbbe 100644 --- a/jetty-websocket/websocket-jetty-api/src/main/java/module-info.java +++ b/jetty-websocket/websocket-jetty-api/src/main/java/module-info.java @@ -11,8 +11,6 @@ // ======================================================================== // -import org.eclipse.jetty.websocket.api.ExtensionConfig; - module org.eclipse.jetty.websocket.jetty.api { exports org.eclipse.jetty.websocket.api; @@ -20,5 +18,5 @@ module org.eclipse.jetty.websocket.jetty.api exports org.eclipse.jetty.websocket.api.exceptions; exports org.eclipse.jetty.websocket.api.util; - uses ExtensionConfig.Parser; + uses org.eclipse.jetty.websocket.api.ExtensionConfig.Parser; } diff --git a/jetty-websocket/websocket-jetty-client/src/main/java/module-info.java b/jetty-websocket/websocket-jetty-client/src/main/java/module-info.java index b1027d23fd7..02866a7c7b1 100644 --- a/jetty-websocket/websocket-jetty-client/src/main/java/module-info.java +++ b/jetty-websocket/websocket-jetty-client/src/main/java/module-info.java @@ -13,12 +13,14 @@ module org.eclipse.jetty.websocket.jetty.client { - exports org.eclipse.jetty.websocket.client; - - requires static org.eclipse.jetty.webapp; requires org.eclipse.jetty.websocket.core.client; requires org.eclipse.jetty.websocket.jetty.common; requires org.slf4j; + requires transitive org.eclipse.jetty.client; requires transitive org.eclipse.jetty.websocket.jetty.api; + + requires static org.eclipse.jetty.webapp; + + exports org.eclipse.jetty.websocket.client; } diff --git a/jetty-websocket/websocket-jetty-common/src/main/java/module-info.java b/jetty-websocket/websocket-jetty-common/src/main/java/module-info.java index 3ab332598eb..6773b72e99a 100644 --- a/jetty-websocket/websocket-jetty-common/src/main/java/module-info.java +++ b/jetty-websocket/websocket-jetty-common/src/main/java/module-info.java @@ -11,17 +11,16 @@ // ======================================================================== // -import org.eclipse.jetty.websocket.api.ExtensionConfig; -import org.eclipse.jetty.websocket.common.ExtensionConfigParser; - module org.eclipse.jetty.websocket.jetty.common { - exports org.eclipse.jetty.websocket.common; - requires org.eclipse.jetty.util; requires org.slf4j; + requires transitive org.eclipse.jetty.websocket.core.common; requires transitive org.eclipse.jetty.websocket.jetty.api; - provides ExtensionConfig.Parser with ExtensionConfigParser; + exports org.eclipse.jetty.websocket.common; + + provides org.eclipse.jetty.websocket.api.ExtensionConfig.Parser with + org.eclipse.jetty.websocket.common.ExtensionConfigParser; } diff --git a/jetty-websocket/websocket-jetty-server/src/main/java/module-info.java b/jetty-websocket/websocket-jetty-server/src/main/java/module-info.java index 4368b3a98ad..ba66c1e2744 100644 --- a/jetty-websocket/websocket-jetty-server/src/main/java/module-info.java +++ b/jetty-websocket/websocket-jetty-server/src/main/java/module-info.java @@ -11,28 +11,26 @@ // ======================================================================== // -import javax.servlet.ServletContainerInitializer; - -import org.eclipse.jetty.webapp.Configuration; -import org.eclipse.jetty.websocket.server.config.JettyWebSocketConfiguration; -import org.eclipse.jetty.websocket.server.config.JettyWebSocketServletContainerInitializer; - module org.eclipse.jetty.websocket.jetty.server { - exports org.eclipse.jetty.websocket.server; - exports org.eclipse.jetty.websocket.server.config; - requires jetty.servlet.api; requires org.eclipse.jetty.websocket.core.server; requires org.eclipse.jetty.websocket.jetty.common; requires org.eclipse.jetty.websocket.servlet; requires org.slf4j; + requires transitive org.eclipse.jetty.webapp; requires transitive org.eclipse.jetty.websocket.jetty.api; // Only required if using JMX. requires static org.eclipse.jetty.jmx; - provides ServletContainerInitializer with JettyWebSocketServletContainerInitializer; - provides Configuration with JettyWebSocketConfiguration; + exports org.eclipse.jetty.websocket.server; + exports org.eclipse.jetty.websocket.server.config; + + provides javax.servlet.ServletContainerInitializer with + org.eclipse.jetty.websocket.server.config.JettyWebSocketServletContainerInitializer; + + provides org.eclipse.jetty.webapp.Configuration with + org.eclipse.jetty.websocket.server.config.JettyWebSocketConfiguration; } diff --git a/jetty-websocket/websocket-servlet/src/main/java/module-info.java b/jetty-websocket/websocket-servlet/src/main/java/module-info.java index 3939f04080f..524fc537ab9 100644 --- a/jetty-websocket/websocket-servlet/src/main/java/module-info.java +++ b/jetty-websocket/websocket-servlet/src/main/java/module-info.java @@ -13,9 +13,10 @@ module org.eclipse.jetty.websocket.servlet { - exports org.eclipse.jetty.websocket.servlet; - - requires transitive org.eclipse.jetty.servlet; requires org.eclipse.jetty.websocket.core.server; requires org.slf4j; + + requires transitive org.eclipse.jetty.servlet; + + exports org.eclipse.jetty.websocket.servlet; } diff --git a/jetty-xml/src/main/java/module-info.java b/jetty-xml/src/main/java/module-info.java index 94ca49b6e13..f89a840ef17 100644 --- a/jetty-xml/src/main/java/module-info.java +++ b/jetty-xml/src/main/java/module-info.java @@ -11,15 +11,14 @@ // ======================================================================== // -import org.eclipse.jetty.xml.ConfigurationProcessorFactory; - module org.eclipse.jetty.xml { - exports org.eclipse.jetty.xml; + requires org.slf4j; requires transitive java.xml; requires transitive org.eclipse.jetty.util; - requires org.slf4j; - uses ConfigurationProcessorFactory; + exports org.eclipse.jetty.xml; + + uses org.eclipse.jetty.xml.ConfigurationProcessorFactory; } diff --git a/tests/test-jpms/test-jpms-websocket-core/src/main/java/module-info.java b/tests/test-jpms/test-jpms-websocket-core/src/main/java/module-info.java index c10573d1531..d733160b513 100644 --- a/tests/test-jpms/test-jpms-websocket-core/src/main/java/module-info.java +++ b/tests/test-jpms/test-jpms-websocket-core/src/main/java/module-info.java @@ -17,6 +17,6 @@ */ module org.eclipse.jetty.websocket.core.tests { - requires org.eclipse.jetty.websocket.core.server; requires org.eclipse.jetty.websocket.core.client; + requires org.eclipse.jetty.websocket.core.server; }