From 67629e68cc6c56a3e974e556561780fda0971dc0 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Mon, 14 Nov 2022 15:35:40 -0600 Subject: [PATCH 01/14] Issue #8895 - Introduce jetty-home--with-docs.zip Signed-off-by: Joakim Erdfelt --- javadoc/pom.xml | 2 +- jetty-home/pom.xml | 59 ++++++++++++++++++- .../assembly/jetty-with-docs-assembly.xml | 46 +++++++++++++++ jetty-maven-plugin/pom.xml | 12 ++-- pom.xml | 4 +- 5 files changed, 114 insertions(+), 9 deletions(-) create mode 100644 jetty-home/src/main/assembly/jetty-with-docs-assembly.xml diff --git a/javadoc/pom.xml b/javadoc/pom.xml index 3e1cfb5b6727..68726f254629 100644 --- a/javadoc/pom.xml +++ b/javadoc/pom.xml @@ -126,7 +126,7 @@ build-javadoc prepare-package - javadoc + jar Eclipse Jetty API Doc - v${project.version} diff --git a/jetty-home/pom.xml b/jetty-home/pom.xml index eb2fb0c81b1c..bbdf943eb5a5 100644 --- a/jetty-home/pom.xml +++ b/jetty-home/pom.xml @@ -13,6 +13,7 @@ ${basedir}/target/jetty-home ${basedir}/target/jetty-home-sources + ${basedir}/target/jetty-home-with-docs 1.0.4 true @@ -120,7 +121,6 @@ - copy-lib-deps generate-resources @@ -508,6 +508,42 @@ ${assembly-directory} + + unpack-documentation + generate-resources + + unpack + + + + + org.eclipse.jetty.documentation + jetty-documentation + ${project.version} + jar + + + ${docs-assembly-directory}/docs + + + + unpack-javadoc-aggregate + generate-resources + + unpack + + + + + org.eclipse.jetty + javadoc + ${project.version} + jar + + + ${docs-assembly-directory}/javadoc + + @@ -563,6 +599,19 @@ true + + docs + package + + single + + + + src/main/assembly/jetty-with-docs-assembly.xml + + true + + @@ -876,6 +925,14 @@ jar true + + org.eclipse.jetty + javadoc + ${project.version} + javadoc + jar + true + org.apache.logging.log4j log4j-api diff --git a/jetty-home/src/main/assembly/jetty-with-docs-assembly.xml b/jetty-home/src/main/assembly/jetty-with-docs-assembly.xml new file mode 100644 index 000000000000..c38740b3427c --- /dev/null +++ b/jetty-home/src/main/assembly/jetty-with-docs-assembly.xml @@ -0,0 +1,46 @@ + + with-docs + + tar.gz + zip + + + + ${assembly-directory} + + + ** + + + **/META-INF/** + *-config.jar + + bin/*.sh + + + 0444 + 0755 + + + ${assembly-directory} + + + bin/*.sh + + + 0555 + + + ${docs-assembly-directory} + + + ** + + + + diff --git a/jetty-maven-plugin/pom.xml b/jetty-maven-plugin/pom.xml index f8e58672f90e..70e41f809128 100644 --- a/jetty-maven-plugin/pom.xml +++ b/jetty-maven-plugin/pom.xml @@ -252,14 +252,18 @@ jetty-slf4j-impl test - + + <!– eliminating dependencies of jetty-home that are being pulled in when in reactor + for the jetty build itself. This can cause accidental cyclic references. –> + + org.eclipse.jetty + javadoc + org.eclipse.jetty jetty-alpn-conscrypt-server @@ -365,7 +369,7 @@ jboss-logging - + --> org.eclipse.jetty.toolchain jetty-test-helper diff --git a/pom.xml b/pom.xml index 4177b2a5f33b..61ee10f3346e 100644 --- a/pom.xml +++ b/pom.xml @@ -245,6 +245,7 @@ documentation jetty-keystore jetty-unixdomain-server + javadoc @@ -2206,9 +2207,6 @@ eclipse-release - - javadoc - From 3305440adce051941bcaf3bb28ebaca02cfa2af3 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Mon, 14 Nov 2022 15:51:27 -0600 Subject: [PATCH 02/14] Unpacking the right javadoc artifact --- jetty-home/pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jetty-home/pom.xml b/jetty-home/pom.xml index bbdf943eb5a5..1fce9cde0a69 100644 --- a/jetty-home/pom.xml +++ b/jetty-home/pom.xml @@ -50,6 +50,7 @@ + org.apache.maven.plugins maven-dependency-plugin @@ -538,6 +539,7 @@ org.eclipse.jetty javadoc ${project.version} + javadoc jar From 43615b53f32baef500581ab832fe87891e2924ce Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Tue, 15 Nov 2022 14:38:55 -0600 Subject: [PATCH 03/14] Issue #8895 - Fixing jetty-documentation dep reference Now the jetty-home artifact builds at the right time in the reactor. Signed-off-by: Joakim Erdfelt --- jetty-home/pom.xml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/jetty-home/pom.xml b/jetty-home/pom.xml index 1fce9cde0a69..0f08874bf722 100644 --- a/jetty-home/pom.xml +++ b/jetty-home/pom.xml @@ -521,7 +521,8 @@ org.eclipse.jetty.documentation jetty-documentation ${project.version} - jar + html + zip ${docs-assembly-directory}/docs @@ -927,6 +928,14 @@ jar true + + org.eclipse.jetty.documentation + jetty-documentation + ${project.version} + html + zip + true + org.eclipse.jetty javadoc From af227778bbe6a796f7080bb145f3222e0bb694da Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Tue, 15 Nov 2022 15:06:59 -0600 Subject: [PATCH 04/14] Issue #8895 - Move JettyHomeTester to own module + Fix for circular dependency loop test-distribution -> jetty-home -> jetty-documentation -> jetty-asciidoctor-extensions -> test-distribution + Remove any deps on anything in org.eclipse.jetty from new module Signed-off-by: Joakim Erdfelt --- .../jetty-asciidoctor-extensions/pom.xml | 3 +- .../jetty/docs/JettyIncludeExtension.java | 2 +- pom.xml | 6 ++ tests/jetty-home-tester/pom.xml | 84 +++++++++++++++++++ .../tests/hometester}/JettyHomeTester.java | 19 ++--- tests/pom.xml | 1 + tests/test-distribution/pom.xml | 60 +------------ .../jetty/tests/distribution/BadAppTests.java | 1 + .../jetty/tests/distribution/CDITests.java | 1 + .../tests/distribution/DemoModulesTests.java | 1 + .../tests/distribution/DistributionTests.java | 1 + .../distribution/DynamicListenerTests.java | 1 + .../tests/distribution/GzipModuleTests.java | 1 + .../distribution/LoggingOptionsTests.java | 1 + .../tests/distribution/OsgiAppTests.java | 1 + .../jetty/tests/distribution/StatsTests.java | 1 + .../distribution/ThirdPartyModulesTests.java | 1 + .../AbstractSessionDistributionTests.java | 2 +- .../HazelcastSessionDistributionTests.java | 3 +- 19 files changed, 118 insertions(+), 72 deletions(-) create mode 100644 tests/jetty-home-tester/pom.xml rename tests/{test-distribution/src/main/java/org/eclipse/jetty/tests/distribution => jetty-home-tester/src/main/java/org/eclipse/jetty/tests/hometester}/JettyHomeTester.java (98%) diff --git a/documentation/jetty-asciidoctor-extensions/pom.xml b/documentation/jetty-asciidoctor-extensions/pom.xml index 8c97b568f8a5..627ebdf93bab 100644 --- a/documentation/jetty-asciidoctor-extensions/pom.xml +++ b/documentation/jetty-asciidoctor-extensions/pom.xml @@ -33,7 +33,8 @@ org.eclipse.jetty.tests - test-distribution + jetty-home-tester + compile diff --git a/documentation/jetty-asciidoctor-extensions/src/main/java/org/eclipse/jetty/docs/JettyIncludeExtension.java b/documentation/jetty-asciidoctor-extensions/src/main/java/org/eclipse/jetty/docs/JettyIncludeExtension.java index 83b1ed9a4203..412b87f2f581 100644 --- a/documentation/jetty-asciidoctor-extensions/src/main/java/org/eclipse/jetty/docs/JettyIncludeExtension.java +++ b/documentation/jetty-asciidoctor-extensions/src/main/java/org/eclipse/jetty/docs/JettyIncludeExtension.java @@ -29,7 +29,7 @@ import org.asciidoctor.extension.IncludeProcessor; import org.asciidoctor.extension.PreprocessorReader; import org.asciidoctor.jruby.extension.spi.ExtensionRegistry; -import org.eclipse.jetty.tests.distribution.JettyHomeTester; +import org.eclipse.jetty.tests.hometester.JettyHomeTester; /** *

Asciidoctor include extension that includes into diff --git a/pom.xml b/pom.xml index 61ee10f3346e..6619b032a9f4 100644 --- a/pom.xml +++ b/pom.xml @@ -1340,6 +1340,12 @@ ${project.version} zip + + org.eclipse.jetty.tests + jetty-home-tester + ${project.version} + test + org.eclipse.jetty jetty-http diff --git a/tests/jetty-home-tester/pom.xml b/tests/jetty-home-tester/pom.xml new file mode 100644 index 000000000000..c5f4a6010160 --- /dev/null +++ b/tests/jetty-home-tester/pom.xml @@ -0,0 +1,84 @@ + + + org.eclipse.jetty.tests + tests-parent + 10.0.13-SNAPSHOT + + + 4.0.0 + jetty-home-tester + Jetty Tests :: jetty-home Tester + jar + + + ${project.groupId}.tests.jettyhometester + + + + + org.slf4j + slf4j-api + + + org.apache.maven + maven-artifact + + + org.apache.maven + maven-resolver-provider + + + org.apache.maven.resolver + maven-resolver-util + ${maven.resolver.version} + + + org.apache.maven.resolver + maven-resolver-api + ${maven.resolver.version} + + + org.apache.maven.resolver + maven-resolver-spi + ${maven.resolver.version} + + + org.apache.maven.resolver + maven-resolver-impl + ${maven.resolver.version} + + + + javax.annotation + javax.annotation-api + + + + + org.apache.maven.resolver + maven-resolver-connector-basic + ${maven.resolver.version} + + + org.apache.maven.resolver + maven-resolver-transport-file + ${maven.resolver.version} + + + org.apache.maven.resolver + maven-resolver-transport-http + ${maven.resolver.version} + + + org.junit.jupiter + junit-jupiter + compile + + + org.eclipse.jetty.toolchain + jetty-test-helper + compile + + + + diff --git a/tests/test-distribution/src/main/java/org/eclipse/jetty/tests/distribution/JettyHomeTester.java b/tests/jetty-home-tester/src/main/java/org/eclipse/jetty/tests/hometester/JettyHomeTester.java similarity index 98% rename from tests/test-distribution/src/main/java/org/eclipse/jetty/tests/distribution/JettyHomeTester.java rename to tests/jetty-home-tester/src/main/java/org/eclipse/jetty/tests/hometester/JettyHomeTester.java index d95c277b44c5..7f502774c0b3 100644 --- a/tests/test-distribution/src/main/java/org/eclipse/jetty/tests/distribution/JettyHomeTester.java +++ b/tests/jetty-home-tester/src/main/java/org/eclipse/jetty/tests/hometester/JettyHomeTester.java @@ -11,7 +11,7 @@ // ======================================================================== // -package org.eclipse.jetty.tests.distribution; +package org.eclipse.jetty.tests.hometester; import java.io.BufferedReader; import java.io.Closeable; @@ -40,6 +40,7 @@ import org.apache.maven.repository.internal.MavenRepositorySystemUtils; import org.codehaus.plexus.util.IOUtil; +import org.codehaus.plexus.util.StringUtils; import org.eclipse.aether.AbstractRepositoryListener; import org.eclipse.aether.DefaultRepositorySystemSession; import org.eclipse.aether.RepositoryEvent; @@ -60,10 +61,8 @@ import org.eclipse.aether.transport.file.FileTransporterFactory; import org.eclipse.aether.transport.http.HttpTransporterFactory; import org.eclipse.jetty.toolchain.test.FS; +import org.eclipse.jetty.toolchain.test.IO; import org.eclipse.jetty.toolchain.test.MavenTestingUtils; -import org.eclipse.jetty.util.IO; -import org.eclipse.jetty.util.NanoTime; -import org.eclipse.jetty.util.StringUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -162,9 +161,9 @@ public JettyHomeTester.Run start(List args) throws Exception args = new ArrayList<>(args); String mavenLocalRepository = config.getMavenLocalRepository(); - if (StringUtil.isNotBlank(mavenLocalRepository)) + if (StringUtils.isNotBlank(mavenLocalRepository)) mavenLocalRepository = System.getProperty("mavenRepoPath"); - if (StringUtil.isNotBlank(mavenLocalRepository)) + if (StringUtils.isNotBlank(mavenLocalRepository)) args.add("maven.local.repo=" + mavenLocalRepository); // if this JVM has `maven.repo.uri` defined, make sure to propagate it to child @@ -559,8 +558,8 @@ public void close() */ public boolean awaitConsoleLogsFor(String txt, long time, TimeUnit unit) throws InterruptedException { - long start = NanoTime.now(); - while (NanoTime.since(start) < unit.toNanos(time)) + long start = System.currentTimeMillis(); + while (start < unit.toMillis(time)) { boolean result = logs.stream().anyMatch(s -> s.contains(txt)); if (result) @@ -587,8 +586,8 @@ public boolean awaitLogsFileFor(Path logFile, String txt, long time, TimeUnit un thread.start(); try { - long start = NanoTime.now(); - while (NanoTime.since(start) < unit.toNanos(time)) + long start = System.currentTimeMillis(); + while (start < unit.toMillis(time)) { boolean result = logs.stream().anyMatch(s -> s.contains(txt)); if (result) diff --git a/tests/pom.xml b/tests/pom.xml index e04a268bcf37..3d872c15ef35 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -20,6 +20,7 @@ jetty-jmh jetty-http-tools + jetty-home-tester test-webapps test-sessions test-loginservice diff --git a/tests/test-distribution/pom.xml b/tests/test-distribution/pom.xml index 4c91bcdacce3..c080326c44e0 100644 --- a/tests/test-distribution/pom.xml +++ b/tests/test-distribution/pom.xml @@ -18,64 +18,10 @@ - org.eclipse.jetty - jetty-util - - - org.slf4j - slf4j-api - - - org.apache.maven - maven-artifact - - - org.apache.maven - maven-resolver-provider - - - org.apache.maven.resolver - maven-resolver-util - ${maven.resolver.version} - - - org.apache.maven.resolver - maven-resolver-api - ${maven.resolver.version} - - - org.apache.maven.resolver - maven-resolver-spi - ${maven.resolver.version} - - - org.apache.maven.resolver - maven-resolver-impl - ${maven.resolver.version} - - - - javax.annotation - javax.annotation-api - - - - - org.apache.maven.resolver - maven-resolver-connector-basic - ${maven.resolver.version} - - - org.apache.maven.resolver - maven-resolver-transport-file - ${maven.resolver.version} - - - org.apache.maven.resolver - maven-resolver-transport-http - ${maven.resolver.version} + org.eclipse.jetty.tests + jetty-home-tester + test - org.eclipse.jetty jetty-slf4j-impl diff --git a/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/BadAppTests.java b/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/BadAppTests.java index 2bc68f2fc609..6c785d51d5e6 100644 --- a/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/BadAppTests.java +++ b/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/BadAppTests.java @@ -19,6 +19,7 @@ import org.eclipse.jetty.client.api.ContentResponse; import org.eclipse.jetty.http.HttpStatus; +import org.eclipse.jetty.tests.hometester.JettyHomeTester; import org.eclipse.jetty.websocket.client.WebSocketClient; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/CDITests.java b/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/CDITests.java index 12f82e83e1f2..82ef05b5b4f2 100644 --- a/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/CDITests.java +++ b/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/CDITests.java @@ -25,6 +25,7 @@ import org.eclipse.jetty.client.api.ContentResponse; import org.eclipse.jetty.http.HttpStatus; +import org.eclipse.jetty.tests.hometester.JettyHomeTester; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; diff --git a/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/DemoModulesTests.java b/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/DemoModulesTests.java index cd0bdf0f54e4..ae26e3ac4906 100644 --- a/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/DemoModulesTests.java +++ b/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/DemoModulesTests.java @@ -21,6 +21,7 @@ import org.eclipse.jetty.client.api.ContentResponse; import org.eclipse.jetty.client.util.FormRequestContent; import org.eclipse.jetty.http.HttpStatus; +import org.eclipse.jetty.tests.hometester.JettyHomeTester; import org.eclipse.jetty.util.Fields; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; diff --git a/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/DistributionTests.java b/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/DistributionTests.java index 962a3949a278..c096fb699caa 100644 --- a/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/DistributionTests.java +++ b/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/DistributionTests.java @@ -43,6 +43,7 @@ import org.eclipse.jetty.io.ClientConnector; import org.eclipse.jetty.start.FS; import org.eclipse.jetty.tests.distribution.openid.OpenIdProvider; +import org.eclipse.jetty.tests.hometester.JettyHomeTester; import org.eclipse.jetty.unixsocket.client.HttpClientTransportOverUnixSockets; import org.eclipse.jetty.unixsocket.server.UnixSocketConnector; import org.eclipse.jetty.util.BlockingArrayQueue; diff --git a/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/DynamicListenerTests.java b/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/DynamicListenerTests.java index 49354aee235a..cc8a24ae2c0c 100644 --- a/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/DynamicListenerTests.java +++ b/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/DynamicListenerTests.java @@ -21,6 +21,7 @@ import org.eclipse.jetty.client.api.ContentResponse; import org.eclipse.jetty.http.HttpStatus; +import org.eclipse.jetty.tests.hometester.JettyHomeTester; import org.eclipse.jetty.util.IO; import org.junit.jupiter.api.Test; diff --git a/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/GzipModuleTests.java b/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/GzipModuleTests.java index b69422582c07..921c86bbb6bf 100644 --- a/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/GzipModuleTests.java +++ b/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/GzipModuleTests.java @@ -20,6 +20,7 @@ import org.eclipse.jetty.client.api.ContentResponse; import org.eclipse.jetty.http.HttpHeader; import org.eclipse.jetty.http.HttpStatus; +import org.eclipse.jetty.tests.hometester.JettyHomeTester; import org.junit.jupiter.api.Test; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/LoggingOptionsTests.java b/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/LoggingOptionsTests.java index 9aff9b7ed4e1..4ad682962c3d 100644 --- a/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/LoggingOptionsTests.java +++ b/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/LoggingOptionsTests.java @@ -24,6 +24,7 @@ import org.eclipse.jetty.client.api.ContentResponse; import org.eclipse.jetty.http.HttpStatus; +import org.eclipse.jetty.tests.hometester.JettyHomeTester; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; diff --git a/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/OsgiAppTests.java b/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/OsgiAppTests.java index 3b525410a746..77b7eaa5a039 100644 --- a/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/OsgiAppTests.java +++ b/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/OsgiAppTests.java @@ -18,6 +18,7 @@ import org.eclipse.jetty.client.api.ContentResponse; import org.eclipse.jetty.http.HttpStatus; +import org.eclipse.jetty.tests.hometester.JettyHomeTester; import org.junit.jupiter.api.Test; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/StatsTests.java b/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/StatsTests.java index 1392511bfa60..7501841fdab1 100644 --- a/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/StatsTests.java +++ b/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/StatsTests.java @@ -25,6 +25,7 @@ import org.eclipse.jetty.http.HttpHeader; import org.eclipse.jetty.http.HttpMethod; import org.eclipse.jetty.http.HttpStatus; +import org.eclipse.jetty.tests.hometester.JettyHomeTester; import org.eclipse.jetty.toolchain.test.FS; import org.eclipse.jetty.util.ajax.JSON; import org.junit.jupiter.api.Test; diff --git a/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/ThirdPartyModulesTests.java b/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/ThirdPartyModulesTests.java index c225f46e7687..8e96c1f62e2e 100644 --- a/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/ThirdPartyModulesTests.java +++ b/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/ThirdPartyModulesTests.java @@ -18,6 +18,7 @@ import org.eclipse.jetty.client.api.ContentResponse; import org.eclipse.jetty.http.HttpStatus; +import org.eclipse.jetty.tests.hometester.JettyHomeTester; import org.junit.jupiter.api.Test; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/session/AbstractSessionDistributionTests.java b/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/session/AbstractSessionDistributionTests.java index 94a3c3c6ab02..5a335598ed13 100644 --- a/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/session/AbstractSessionDistributionTests.java +++ b/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/session/AbstractSessionDistributionTests.java @@ -29,7 +29,7 @@ import org.eclipse.jetty.client.api.ContentResponse; import org.eclipse.jetty.http.HttpStatus; import org.eclipse.jetty.tests.distribution.AbstractJettyHomeTest; -import org.eclipse.jetty.tests.distribution.JettyHomeTester; +import org.eclipse.jetty.tests.hometester.JettyHomeTester; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.testcontainers.junit.jupiter.Testcontainers; diff --git a/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/session/HazelcastSessionDistributionTests.java b/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/session/HazelcastSessionDistributionTests.java index 0fc681044f3a..d3081a44879c 100644 --- a/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/session/HazelcastSessionDistributionTests.java +++ b/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/session/HazelcastSessionDistributionTests.java @@ -20,7 +20,6 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; -import java.time.Duration; import java.util.Arrays; import java.util.Collections; import java.util.HashMap; @@ -30,7 +29,7 @@ import org.eclipse.jetty.client.api.ContentResponse; import org.eclipse.jetty.http.HttpStatus; -import org.eclipse.jetty.tests.distribution.JettyHomeTester; +import org.eclipse.jetty.tests.hometester.JettyHomeTester; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.slf4j.Logger; From fd558f2eaaaae49ec220a2e39b85ce3f4cae07b1 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Tue, 15 Nov 2022 18:51:10 -0600 Subject: [PATCH 05/14] Issue #8895 - fixing JettyHomeTester.await logs timeout Signed-off-by: Joakim Erdfelt --- .../eclipse/jetty/tests/hometester/JettyHomeTester.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/jetty-home-tester/src/main/java/org/eclipse/jetty/tests/hometester/JettyHomeTester.java b/tests/jetty-home-tester/src/main/java/org/eclipse/jetty/tests/hometester/JettyHomeTester.java index 7f502774c0b3..e8aa5f153803 100644 --- a/tests/jetty-home-tester/src/main/java/org/eclipse/jetty/tests/hometester/JettyHomeTester.java +++ b/tests/jetty-home-tester/src/main/java/org/eclipse/jetty/tests/hometester/JettyHomeTester.java @@ -558,8 +558,8 @@ public void close() */ public boolean awaitConsoleLogsFor(String txt, long time, TimeUnit unit) throws InterruptedException { - long start = System.currentTimeMillis(); - while (start < unit.toMillis(time)) + long end = System.currentTimeMillis() + unit.toMillis(time); + while (System.currentTimeMillis() < end) { boolean result = logs.stream().anyMatch(s -> s.contains(txt)); if (result) @@ -586,8 +586,8 @@ public boolean awaitLogsFileFor(Path logFile, String txt, long time, TimeUnit un thread.start(); try { - long start = System.currentTimeMillis(); - while (start < unit.toMillis(time)) + long end = System.currentTimeMillis() + unit.toMillis(time); + while (System.currentTimeMillis() < end) { boolean result = logs.stream().anyMatch(s -> s.contains(txt)); if (result) From 1eb3cd91ab4e93d2d8de8e8cfc6ab4e094e8dcf7 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Wed, 16 Nov 2022 12:55:34 +1000 Subject: [PATCH 06/14] use Awaitility Signed-off-by: Olivier Lamy --- tests/jetty-home-tester/pom.xml | 5 +++ .../tests/hometester/JettyHomeTester.java | 31 ++++++++++--------- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/tests/jetty-home-tester/pom.xml b/tests/jetty-home-tester/pom.xml index c5f4a6010160..17ca925879c2 100644 --- a/tests/jetty-home-tester/pom.xml +++ b/tests/jetty-home-tester/pom.xml @@ -23,6 +23,7 @@ org.apache.maven maven-artifact + org.apache.maven maven-resolver-provider @@ -32,6 +33,10 @@ maven-resolver-util ${maven.resolver.version} + + org.awaitility + awaitility + org.apache.maven.resolver maven-resolver-api diff --git a/tests/jetty-home-tester/src/main/java/org/eclipse/jetty/tests/hometester/JettyHomeTester.java b/tests/jetty-home-tester/src/main/java/org/eclipse/jetty/tests/hometester/JettyHomeTester.java index e8aa5f153803..3441a61cfb81 100644 --- a/tests/jetty-home-tester/src/main/java/org/eclipse/jetty/tests/hometester/JettyHomeTester.java +++ b/tests/jetty-home-tester/src/main/java/org/eclipse/jetty/tests/hometester/JettyHomeTester.java @@ -39,6 +39,8 @@ import java.util.zip.ZipInputStream; import org.apache.maven.repository.internal.MavenRepositorySystemUtils; +import org.awaitility.Awaitility; +import org.awaitility.core.ConditionTimeoutException; import org.codehaus.plexus.util.IOUtil; import org.codehaus.plexus.util.StringUtils; import org.eclipse.aether.AbstractRepositoryListener; @@ -558,13 +560,14 @@ public void close() */ public boolean awaitConsoleLogsFor(String txt, long time, TimeUnit unit) throws InterruptedException { - long end = System.currentTimeMillis() + unit.toMillis(time); - while (System.currentTimeMillis() < end) + try + { + Awaitility.await().atMost(time, unit).until(() -> logs.stream().anyMatch(s -> s.contains(txt))); + return true; + } + catch (ConditionTimeoutException e) { - boolean result = logs.stream().anyMatch(s -> s.contains(txt)); - if (result) - return true; - Thread.sleep(250); + // nothing } return false; } @@ -586,20 +589,18 @@ public boolean awaitLogsFileFor(Path logFile, String txt, long time, TimeUnit un thread.start(); try { - long end = System.currentTimeMillis() + unit.toMillis(time); - while (System.currentTimeMillis() < end) - { - boolean result = logs.stream().anyMatch(s -> s.contains(txt)); - if (result) - return true; - Thread.sleep(250); - } - return false; + Awaitility.await().atMost(time, unit).until(() -> logs.stream().anyMatch(s -> s.contains(txt))); + return true; + } + catch (ConditionTimeoutException e) + { + // nothing } finally { logFileStreamer.stop(); } + return false; } /** From 62746d9d444f63154986604e3204e79b99b6e938 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Wed, 16 Nov 2022 20:57:07 +1000 Subject: [PATCH 07/14] review comments --- .../jetty/tests/hometester/JettyHomeTester.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/tests/jetty-home-tester/src/main/java/org/eclipse/jetty/tests/hometester/JettyHomeTester.java b/tests/jetty-home-tester/src/main/java/org/eclipse/jetty/tests/hometester/JettyHomeTester.java index 3441a61cfb81..73ab0a96c4fc 100644 --- a/tests/jetty-home-tester/src/main/java/org/eclipse/jetty/tests/hometester/JettyHomeTester.java +++ b/tests/jetty-home-tester/src/main/java/org/eclipse/jetty/tests/hometester/JettyHomeTester.java @@ -39,7 +39,6 @@ import java.util.zip.ZipInputStream; import org.apache.maven.repository.internal.MavenRepositorySystemUtils; -import org.awaitility.Awaitility; import org.awaitility.core.ConditionTimeoutException; import org.codehaus.plexus.util.IOUtil; import org.codehaus.plexus.util.StringUtils; @@ -68,6 +67,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.awaitility.Awaitility.await; + /** *

Helper class to test the Jetty Distribution

. *

API can change without any further notice.

@@ -562,14 +563,13 @@ public boolean awaitConsoleLogsFor(String txt, long time, TimeUnit unit) throws { try { - Awaitility.await().atMost(time, unit).until(() -> logs.stream().anyMatch(s -> s.contains(txt))); + await().atMost(time, unit).until(() -> logs.stream().anyMatch(s -> s.contains(txt))); return true; } catch (ConditionTimeoutException e) { - // nothing + return false; } - return false; } /** @@ -589,18 +589,17 @@ public boolean awaitLogsFileFor(Path logFile, String txt, long time, TimeUnit un thread.start(); try { - Awaitility.await().atMost(time, unit).until(() -> logs.stream().anyMatch(s -> s.contains(txt))); + await().atMost(time, unit).until(() -> logs.stream().anyMatch(s -> s.contains(txt))); return true; } catch (ConditionTimeoutException e) { - // nothing + return false; } finally { logFileStreamer.stop(); } - return false; } /** From 6b96b0d5e608cbe9afda6054884e8e844f7347ac Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Wed, 16 Nov 2022 08:23:18 -0600 Subject: [PATCH 08/14] Issue #8895 - More reliable JettyHomeTester.unzip Signed-off-by: Joakim Erdfelt --- .../tests/hometester/JettyHomeTester.java | 79 +++++++++++-------- 1 file changed, 46 insertions(+), 33 deletions(-) diff --git a/tests/jetty-home-tester/src/main/java/org/eclipse/jetty/tests/hometester/JettyHomeTester.java b/tests/jetty-home-tester/src/main/java/org/eclipse/jetty/tests/hometester/JettyHomeTester.java index e8aa5f153803..53565f9f1c02 100644 --- a/tests/jetty-home-tester/src/main/java/org/eclipse/jetty/tests/hometester/JettyHomeTester.java +++ b/tests/jetty-home-tester/src/main/java/org/eclipse/jetty/tests/hometester/JettyHomeTester.java @@ -16,13 +16,16 @@ import java.io.BufferedReader; import java.io.Closeable; import java.io.File; +import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import java.io.OutputStream; import java.io.RandomAccessFile; import java.net.InetSocketAddress; import java.net.ServerSocket; +import java.net.URI; +import java.nio.file.FileSystem; +import java.nio.file.FileSystems; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; @@ -35,11 +38,10 @@ import java.util.Queue; import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.TimeUnit; -import java.util.zip.ZipEntry; -import java.util.zip.ZipInputStream; +import java.util.stream.Collectors; +import java.util.stream.Stream; import org.apache.maven.repository.internal.MavenRepositorySystemUtils; -import org.codehaus.plexus.util.IOUtil; import org.codehaus.plexus.util.StringUtils; import org.eclipse.aether.AbstractRepositoryListener; import org.eclipse.aether.DefaultRepositorySystemSession; @@ -70,7 +72,7 @@ *

Helper class to test the Jetty Distribution

. *

API can change without any further notice.

*

Usage:

- * 
+ * 
{@code
  * // Create the distribution.
  * String jettyVersion = "9.4.14.v20181114";
  * DistributionTester distribution = DistributionTester.Builder.newInstance()
@@ -102,7 +104,7 @@
  *         assertEquals(HttpStatus.OK_200, response.getStatus());
  *     }
  * }
- * 

+ * }
*/ public class JettyHomeTester { @@ -148,7 +150,7 @@ public JettyHomeTester.Run start(List args) throws Exception List commands = new ArrayList<>(); commands.add(getJavaExecutable()); commands.addAll(config.getJVMArgs()); - commands.add("-Djava.io.tmpdir=" + workDir.toAbsolutePath().toString()); + commands.add("-Djava.io.tmpdir=" + workDir.toAbsolutePath()); int debugPort = Integer.getInteger("distribution.debug.port", 0); if (debugPort > 0) { @@ -229,7 +231,7 @@ public Path installWarFile(File warFile, String context) throws IOException Path webapps = config.jettyBase.resolve("webapps").resolve(context); if (!Files.exists(webapps)) Files.createDirectories(webapps); - unzip(warFile, webapps.toFile()); + unzip(warFile.toPath(), webapps); return webapps; } @@ -290,52 +292,61 @@ private String getJavaExecutable() return "java"; } - private void unzip(File zipFile, File output) throws IOException + public static void unzip(Path archive, Path outputDir) throws IOException { - try (InputStream fileInputStream = Files.newInputStream(zipFile.toPath()); - ZipInputStream zipInputStream = new ZipInputStream(fileInputStream)) + if (!Files.exists(outputDir)) + throw new FileNotFoundException("Directory does not exist: " + outputDir); + + if (!Files.isDirectory(outputDir)) + throw new FileNotFoundException("Not a directory: " + outputDir); + + Map env = new HashMap<>(); + env.put("releaseVersion", null); // no MultiRelease Jar file behaviors + + URI outputDirURI = outputDir.toUri(); + URI archiveURI = URI.create("jar:" + archive.toUri().toASCIIString()); + + try (FileSystem fs = FileSystems.newFileSystem(archiveURI, env)) { - ZipEntry entry = zipInputStream.getNextEntry(); - while (entry != null) + Path root = fs.getPath("/"); + int archiveURISubIndex = root.toUri().toASCIIString().indexOf("!/") + 2; + try (Stream entriesStream = Files.walk(root)) { - if (entry.isDirectory()) - { - File dir = new File(output, entry.getName()); - if (!Files.exists(dir.toPath())) - { - Files.createDirectories(dir.toPath()); - } - } - else + // ensure proper unpack order (eg: directories before files) + List sorted = entriesStream + .sorted() + .collect(Collectors.toList()); + + for (Path path : sorted) { - // Read zipEntry and write to a file. - File file = new File(output, entry.getName()); - if (!Files.exists(file.getParentFile().toPath())) + URI entryURI = path.toUri(); + String subURI = entryURI.toASCIIString().substring(archiveURISubIndex); + URI outputPathURI = outputDirURI.resolve(subURI); + Path outputPath = Path.of(outputPathURI); + if (Files.isDirectory(path)) { - Files.createDirectories(file.getParentFile().toPath()); + if (!Files.exists(outputPath)) + Files.createDirectory(outputPath); } - try (OutputStream outputStream = Files.newOutputStream(file.toPath())) + else { - IOUtil.copy(zipInputStream, outputStream); + Files.copy(path, outputPath); } } - // Get next entry - entry = zipInputStream.getNextEntry(); } } } private Path resolveHomeArtifact(String version) throws Exception { - File artifactFile = resolveArtifact("org.eclipse.jetty:jetty-home:zip:" + version); + Path artifactFile = resolveArtifact("org.eclipse.jetty:jetty-home:zip:" + version).toPath(); // create tmp directory to unzip distribution Path homes = MavenTestingUtils.getTargetTestingPath("homes"); FS.ensureDirExists(homes); Path tmp = Files.createTempDirectory(homes, "jetty_home_"); - File tmpFile = tmp.toFile(); - unzip(artifactFile, tmpFile); + unzip(artifactFile, tmp); return tmp.resolve("jetty-home-" + version); } @@ -564,6 +575,7 @@ public boolean awaitConsoleLogsFor(String txt, long time, TimeUnit unit) throws boolean result = logs.stream().anyMatch(s -> s.contains(txt)); if (result) return true; + //noinspection BusyWait Thread.sleep(250); } return false; @@ -592,6 +604,7 @@ public boolean awaitLogsFileFor(Path logFile, String txt, long time, TimeUnit un boolean result = logs.stream().anyMatch(s -> s.contains(txt)); if (result) return true; + //noinspection BusyWait Thread.sleep(250); } return false; From 23c989c6ef14f50142c91ac4549c7d20f13eebae Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Wed, 16 Nov 2022 08:31:02 -0600 Subject: [PATCH 09/14] Cleanup imports Signed-off-by: Joakim Erdfelt --- .../java/org/eclipse/jetty/tests/hometester/JettyHomeTester.java | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/jetty-home-tester/src/main/java/org/eclipse/jetty/tests/hometester/JettyHomeTester.java b/tests/jetty-home-tester/src/main/java/org/eclipse/jetty/tests/hometester/JettyHomeTester.java index 823ea4166859..0d06b390b696 100644 --- a/tests/jetty-home-tester/src/main/java/org/eclipse/jetty/tests/hometester/JettyHomeTester.java +++ b/tests/jetty-home-tester/src/main/java/org/eclipse/jetty/tests/hometester/JettyHomeTester.java @@ -43,7 +43,6 @@ import org.apache.maven.repository.internal.MavenRepositorySystemUtils; import org.awaitility.core.ConditionTimeoutException; -import org.codehaus.plexus.util.IOUtil; import org.codehaus.plexus.util.StringUtils; import org.eclipse.aether.AbstractRepositoryListener; import org.eclipse.aether.DefaultRepositorySystemSession; From 5de6f734e90a27ffaefb7991690719b522d27aec Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Wed, 16 Nov 2022 08:36:25 -0600 Subject: [PATCH 10/14] Remove jetty-home dependency from jetty-maven-plugin Signed-off-by: Joakim Erdfelt --- jetty-maven-plugin/pom.xml | 118 ------------------------------------- 1 file changed, 118 deletions(-) diff --git a/jetty-maven-plugin/pom.xml b/jetty-maven-plugin/pom.xml index 70e41f809128..82f50eb0ab92 100644 --- a/jetty-maven-plugin/pom.xml +++ b/jetty-maven-plugin/pom.xml @@ -252,124 +252,6 @@ jetty-slf4j-impl test - org.eclipse.jetty.toolchain jetty-test-helper From ae6ffdc135e13a0f3be716c7d4da6d3e2d0faa23 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Wed, 16 Nov 2022 08:36:34 -0600 Subject: [PATCH 11/14] Correct osgi bundle-name Signed-off-by: Joakim Erdfelt --- tests/jetty-home-tester/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/jetty-home-tester/pom.xml b/tests/jetty-home-tester/pom.xml index 17ca925879c2..d1193cd5d651 100644 --- a/tests/jetty-home-tester/pom.xml +++ b/tests/jetty-home-tester/pom.xml @@ -11,7 +11,7 @@ jar - ${project.groupId}.tests.jettyhometester + ${project.groupId}.tests.hometester From 24b0f1989e2db847e49fa54947f2f9f29b4a2697 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Wed, 16 Nov 2022 08:54:59 -0600 Subject: [PATCH 12/14] Fixing proxyTo url for javadoc Signed-off-by: Joakim Erdfelt --- demos/demo-proxy-webapp/src/main/webapp/WEB-INF/web.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demos/demo-proxy-webapp/src/main/webapp/WEB-INF/web.xml b/demos/demo-proxy-webapp/src/main/webapp/WEB-INF/web.xml index 3a8edfcfae58..419ca72c27fe 100644 --- a/demos/demo-proxy-webapp/src/main/webapp/WEB-INF/web.xml +++ b/demos/demo-proxy-webapp/src/main/webapp/WEB-INF/web.xml @@ -13,7 +13,7 @@ org.eclipse.jetty.proxy.ProxyServlet$Transparent proxyTo - https://www.eclipse.org/jetty/javadoc/jetty-11/index.html?overview-summary.html + https://www.eclipse.org/jetty/javadoc/jetty-10/index.html?overview-summary.html hostHeader From 22a810debfae24237e8fdd49fde530ddaa3bacb9 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Wed, 16 Nov 2022 08:55:20 -0600 Subject: [PATCH 13/14] Referencing included /docs/ and /javadoc/ in root index.html Signed-off-by: Joakim Erdfelt --- .../resources/modules/demo.d/root/index.html | 11 ++++++-- .../resources/modules/demo.d/root/jetty.css | 28 +++++++++++++++---- 2 files changed, 31 insertions(+), 8 deletions(-) diff --git a/jetty-home/src/main/resources/modules/demo.d/root/index.html b/jetty-home/src/main/resources/modules/demo.d/root/index.html index 7d07f5d4f003..683baf412f8e 100644 --- a/jetty-home/src/main/resources/modules/demo.d/root/index.html +++ b/jetty-home/src/main/resources/modules/demo.d/root/index.html @@ -46,10 +46,15 @@

demos

information

diff --git a/jetty-home/src/main/resources/modules/demo.d/root/jetty.css b/jetty-home/src/main/resources/modules/demo.d/root/jetty.css index acf677f7cf52..ff7d87cda3cf 100644 --- a/jetty-home/src/main/resources/modules/demo.d/root/jetty.css +++ b/jetty-home/src/main/resources/modules/demo.d/root/jetty.css @@ -1,17 +1,21 @@ -BODY +body { - font-family: Arial, Verdana, Helvetica, sans-serif; - background-color: #FFFFFF; + font-family: sans-serif; + background-color: white; font-size: 14pt; color: #444444; } +code +{ + font-family: monospace; +} + img { border: 0px; } - div#header { clear: both; @@ -26,7 +30,6 @@ div#header margin-right: auto; } - div#content { clear: both; @@ -75,6 +78,21 @@ div#links h1,h2,p margin: 5px; } +div#links ul +{ + padding-left: 20px; +} + +div#links li +{ + font-size: 10pt; +} + +div#links code +{ + font-size: 9pt; +} + div#links h2 { font-size: 12pt; From d2c1b1caf1145ebef1dba5a029523c1b8023e1ea Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Wed, 16 Nov 2022 15:37:09 -0600 Subject: [PATCH 14/14] Remove maven-plugins from javadoc Signed-off-by: Joakim Erdfelt --- javadoc/pom.xml | 25 +------- jetty-maven-plugin/pom.xml | 115 +++++++++++++++++++++++++++++++++++++ 2 files changed, 117 insertions(+), 23 deletions(-) diff --git a/javadoc/pom.xml b/javadoc/pom.xml index 68726f254629..96933ba46e70 100644 --- a/javadoc/pom.xml +++ b/javadoc/pom.xml @@ -96,6 +96,8 @@ infinispan-embedded, infinispan-remote, jetty-test-helper, + jetty-maven-plugin, + jetty-jspc-maven-plugin, alpn-api, quic-quiche, quic-quiche-common, @@ -379,29 +381,6 @@ - - - org.eclipse.jetty - jetty-jspc-maven-plugin - provided - - - javax.annotation - javax.annotation-api - - - - - org.eclipse.jetty - jetty-maven-plugin - provided - - - - org.apache.maven.plugin-tools - maven-plugin-annotations - provided - org.eclipse.jetty diff --git a/jetty-maven-plugin/pom.xml b/jetty-maven-plugin/pom.xml index 82f50eb0ab92..576928023924 100644 --- a/jetty-maven-plugin/pom.xml +++ b/jetty-maven-plugin/pom.xml @@ -252,6 +252,121 @@ jetty-slf4j-impl test + + org.eclipse.jetty + jetty-home + test + zip + true + + + + org.eclipse.jetty + jetty-alpn-conscrypt-server + + + org.eclipse.jetty + jetty-alpn-openjdk8-server + + + org.eclipse.jetty + jetty-alpn-server + + + org.eclipse.jetty + jetty-cdi + + + org.eclipse.jetty + jetty-continuation + + + org.eclipse.jetty.gcloud + jetty-gcloud-session-manager + + + org.eclipse.jetty + jetty-hazelcast + + + org.eclipse.jetty + jetty-jaas + + + org.eclipse.jetty + jetty-jaspi + + + org.eclipse.jetty.memcached + jetty-memcached-sessions + + + org.eclipse.jetty + jetty-openid + + + org.eclipse.jetty.fcgi + fcgi-server + + + org.eclipse.jetty + jetty-start + + + org.eclipse.jetty + jetty-nosql + + + org.eclipse.jetty + jetty-unixsocket + + + org.eclipse.jetty + jetty-infinispan + + + org.eclipse.jetty.http2 + http2-server + + + org.eclipse.jetty + infinispan-embedded + + + org.eclipse.jetty + infinispan-embedded-query + + + org.eclipse.jetty + infinispan-remote + + + org.eclipse.jetty + infinispan-remote-query + + + org.eclipse.jetty.orbit + javax.mail.glassfish + + + org.eclipse.jetty.orbit + javax.security.auth.message + + + org.ow2.asm + asm-tree + + + org.ow2.asm + asm-analysis + + + org.jboss.logging + jboss-logging + + + org.eclipse.jetty.toolchain jetty-test-helper