From 1e10258070210f9f5358bf78727aaa542a4f74ac Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Sun, 31 Jul 2022 21:54:52 +1000 Subject: [PATCH 1/3] add test-jetty-ee8 sessions tests modules Signed-off-by: Olivier Lamy --- jetty-ee8/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/jetty-ee8/pom.xml b/jetty-ee8/pom.xml index 1e935eed7519..e112097e4a81 100644 --- a/jetty-ee8/pom.xml +++ b/jetty-ee8/pom.xml @@ -44,6 +44,7 @@ jetty-ee8-glassfish-jstl jetty-ee8-bom jetty-ee8-demos + test-ee8-sessions jetty-ee8-home From c31aa2fa97a8b29fa7e21c7f2980aa6a973671f3 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Mon, 1 Aug 2022 07:59:28 +1000 Subject: [PATCH 2/3] add test ee8 session suites Signed-off-by: Olivier Lamy --- jetty-ee8/test-ee8-sessions/pom.xml | 38 ++++ .../test-ee8-file-sessions/pom.xml | 58 +++++ .../test-ee8-gcloud-sessions/pom.xml | 74 +++++++ .../test-ee8-hazelcast-sessions/pom.xml | 127 +++++++++++ .../test-ee8-infinispan-sessions/pom.xml | 202 ++++++++++++++++++ .../test-ee8-jdbc-sessions/pom.xml | 96 +++++++++ .../test-ee8-memcached-sessions/pom.xml | 62 ++++++ .../test-ee8-mongodb-sessions/pom.xml | 129 +++++++++++ .../test-ee8-sessions-common/pom.xml | 64 ++++++ 9 files changed, 850 insertions(+) create mode 100644 jetty-ee8/test-ee8-sessions/pom.xml create mode 100644 jetty-ee8/test-ee8-sessions/test-ee8-file-sessions/pom.xml create mode 100644 jetty-ee8/test-ee8-sessions/test-ee8-gcloud-sessions/pom.xml create mode 100644 jetty-ee8/test-ee8-sessions/test-ee8-hazelcast-sessions/pom.xml create mode 100644 jetty-ee8/test-ee8-sessions/test-ee8-infinispan-sessions/pom.xml create mode 100644 jetty-ee8/test-ee8-sessions/test-ee8-jdbc-sessions/pom.xml create mode 100644 jetty-ee8/test-ee8-sessions/test-ee8-memcached-sessions/pom.xml create mode 100644 jetty-ee8/test-ee8-sessions/test-ee8-mongodb-sessions/pom.xml create mode 100644 jetty-ee8/test-ee8-sessions/test-ee8-sessions-common/pom.xml diff --git a/jetty-ee8/test-ee8-sessions/pom.xml b/jetty-ee8/test-ee8-sessions/pom.xml new file mode 100644 index 000000000000..cd83b8dced41 --- /dev/null +++ b/jetty-ee8/test-ee8-sessions/pom.xml @@ -0,0 +1,38 @@ + + + 4.0.0 + + org.eclipse.jetty.ee8 + jetty-ee8 + 12.0.0-SNAPSHOT + + test-ee8-sessions + EE8 :: Sessions Tests + pom + + test-ee8-sessions-common + test-ee8-file-sessions + test-ee8-jdbc-sessions + test-ee8-mongodb-sessions + test-ee8-infinispan-sessions + test-ee8-gcloud-sessions + test-ee8-memcached-sessions + test-ee8-hazelcast-sessions + + + + + org.eclipse.jetty.ee8 + jetty-ee8-bom + ${project.version} + pom + import + + + org.eclipse.jetty.ee8 + test-ee8-sessions-common + ${project.version} + + + + diff --git a/jetty-ee8/test-ee8-sessions/test-ee8-file-sessions/pom.xml b/jetty-ee8/test-ee8-sessions/test-ee8-file-sessions/pom.xml new file mode 100644 index 000000000000..2911a04da41b --- /dev/null +++ b/jetty-ee8/test-ee8-sessions/test-ee8-file-sessions/pom.xml @@ -0,0 +1,58 @@ + + + 4.0.0 + + org.eclipse.jetty.ee8 + test-ee8-sessions + 12.0.0-SNAPSHOT + + test-ee8-file-sessions + EE8 :: Sessions Tests :: File + + test-ee9-sessions/test-ee9-file-sessions + ${project.groupId}.sessions.file + + + + org.eclipse.jetty + jetty-session + test + + + org.eclipse.jetty + jetty-session + test-jar + test + + + org.eclipse.jetty.ee8 + jetty-ee8-webapp + test + + + org.eclipse.jetty + jetty-client + test + + + org.eclipse.jetty.ee8 + test-ee8-sessions-common + test + + + org.slf4j + slf4j-api + test + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + + diff --git a/jetty-ee8/test-ee8-sessions/test-ee8-gcloud-sessions/pom.xml b/jetty-ee8/test-ee8-sessions/test-ee8-gcloud-sessions/pom.xml new file mode 100644 index 000000000000..61b48445c117 --- /dev/null +++ b/jetty-ee8/test-ee8-sessions/test-ee8-gcloud-sessions/pom.xml @@ -0,0 +1,74 @@ + + + 4.0.0 + + org.eclipse.jetty.ee8 + test-ee8-sessions + 12.0.0-SNAPSHOT + ../pom.xml + + test-ee8-gcloud-sessions + EE8 :: Sessions Tests :: GCloud + + test-ee9-sessions/test-ee9-gcloud-sessions + ${project.groupId}.sessions.gcloud + + + + org.eclipse.jetty + jetty-session + test + + + org.eclipse.jetty + jetty-session + test + test-jar + + + org.eclipse.jetty.ee8 + jetty-ee8-webapp + test + + + org.eclipse.jetty + jetty-client + test + + + org.eclipse.jetty.ee8 + test-ee8-sessions-common + test + + + org.eclipse.jetty.gcloud + jetty-gcloud-session-manager + test + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + + org.testcontainers + testcontainers + test + + + org.testcontainers + junit-jupiter + test + + + org.testcontainers + gcloud + test + + + org.slf4j + slf4j-simple + test + + + diff --git a/jetty-ee8/test-ee8-sessions/test-ee8-hazelcast-sessions/pom.xml b/jetty-ee8/test-ee8-sessions/test-ee8-hazelcast-sessions/pom.xml new file mode 100644 index 000000000000..c505879bc473 --- /dev/null +++ b/jetty-ee8/test-ee8-sessions/test-ee8-hazelcast-sessions/pom.xml @@ -0,0 +1,127 @@ + + + 4.0.0 + + org.eclipse.jetty.ee8 + test-ee8-sessions + 12.0.0-SNAPSHOT + ../pom.xml + + test-ee8-hazelcast-sessions + EE8 :: Sessions Tests :: Hazelcast + + test-ee9-sessions/test-ee9-hazelcast-sessions + ${project.groupId}.sessions.hazelcast + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + unpack + generate-test-resources + + unpack + + + + + org.eclipse.jetty.toolchain + jetty-test-policy + ${jetty-test-policy.version} + jar + true + **/*.keystore,**/*.pem + ${jetty.test.policy.loc} + + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + --add-modules java.se --add-exports java.base/jdk.internal.ref=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.management/sun.management=ALL-UNNAMED --add-opens jdk.management/com.sun.management.internal=ALL-UNNAMED + true + 45 + 240 + + + + + + + org.eclipse.jetty + jetty-session + test + + + org.eclipse.jetty + jetty-session + test-jar + test + + + org.eclipse.jetty.ee8 + jetty-ee8-webapp + test + + + org.eclipse.jetty + jetty-client + test + + + org.eclipse.jetty.ee8 + test-ee8-sessions-common + test + + + org.eclipse.jetty + jetty-hazelcast + test + + + com.hazelcast + hazelcast + + + + + com.hazelcast + hazelcast-all + ${hazelcast.version} + + + org.eclipse.jetty + jetty-jmx + true + test + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + + org.slf4j + slf4j-api + test + + + org.slf4j + jul-to-slf4j + test + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + + diff --git a/jetty-ee8/test-ee8-sessions/test-ee8-infinispan-sessions/pom.xml b/jetty-ee8/test-ee8-sessions/test-ee8-infinispan-sessions/pom.xml new file mode 100644 index 000000000000..3c8a7d0fb742 --- /dev/null +++ b/jetty-ee8/test-ee8-sessions/test-ee8-infinispan-sessions/pom.xml @@ -0,0 +1,202 @@ + + + 4.0.0 + + org.eclipse.jetty.ee8 + test-ee8-sessions + 12.0.0-SNAPSHOT + + test-ee8-infinispan-sessions + EE8 :: Sessions Tests :: Infinispan + + test-ee9-sessions/test-ee9-infinispan-sessions + ${project.groupId}.sessions.infinispan + + 11.0.9.Final + + infinispan/server + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + **/*.java + + --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.util.concurrent=ALL-UNNAMED + + ${infinispan.docker.image.version} + ${infinispan.docker.image.name} + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + unpack + generate-test-resources + + unpack + + + + + org.eclipse.jetty.toolchain + jetty-test-policy + ${jetty-test-policy.version} + jar + true + **/*.keystore,**/*.pem + ${jetty.test.policy.loc} + + + + + + + + + + + org.eclipse.jetty + jetty-session + test + + + org.eclipse.jetty + jetty-session + test-jar + test + + + org.eclipse.jetty.ee8 + jetty-ee8-webapp + test + + + org.eclipse.jetty + jetty-client + test + + + org.eclipse.jetty.ee8 + test-ee8-sessions-common + test + + + org.eclipse.jetty + jetty-infinispan-remote-query + test + + + org.eclipse.jetty + jetty-infinispan-embedded-query + test + + + org.eclipse.jetty + jetty-jmx + true + test + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + + org.infinispan + infinispan-core + test + + + org.wildfly.common + wildfly-common + + + + + org.infinispan + infinispan-query + test + + + org.infinispan + infinispan-client-hotrod + test + + + + org.apache.logging.log4j + log4j-core + + + + + org.infinispan + infinispan-remote-query-client + test + + + org.infinispan.protostream + protostream + test + + + com.google.code.gson + gson + ${gson.version} + test + + + org.slf4j + slf4j-api + test + + + org.slf4j + jul-to-slf4j + test + + + org.slf4j + slf4j-simple + test + + + org.testcontainers + testcontainers + test + + + org.testcontainers + junit-jupiter + test + + + + + jdk16 + + [16,) + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.util.concurrent=ALL-UNNAMED + + + + + + + + diff --git a/jetty-ee8/test-ee8-sessions/test-ee8-jdbc-sessions/pom.xml b/jetty-ee8/test-ee8-sessions/test-ee8-jdbc-sessions/pom.xml new file mode 100644 index 000000000000..6ed59ad84242 --- /dev/null +++ b/jetty-ee8/test-ee8-sessions/test-ee8-jdbc-sessions/pom.xml @@ -0,0 +1,96 @@ + + + 4.0.0 + + org.eclipse.jetty.ee8 + test-ee8-sessions + 12.0.0-SNAPSHOT + + test-ee8-jdbc-sessions + EE8 :: Sessions Tests :: JDBC + + test-ee9-sessions/test-ee9-jdbc-sessions + ${project.groupId}.sessions.jdbc + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + ${mariadb.docker.version} + + + + + + + + org.eclipse.jetty + jetty-server + test + + + org.eclipse.jetty + jetty-session + test + + + org.eclipse.jetty + jetty-session + test-jar + test + + + org.eclipse.jetty.ee8 + jetty-ee8-webapp + test + + + org.eclipse.jetty + jetty-client + test + + + org.eclipse.jetty.ee8 + test-ee8-sessions-common + test + + + org.slf4j + slf4j-api + test + + + org.testcontainers + testcontainers + test + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + + org.testcontainers + mariadb + test + + + org.testcontainers + junit-jupiter + test + + + org.mariadb.jdbc + mariadb-java-client + test + + + diff --git a/jetty-ee8/test-ee8-sessions/test-ee8-memcached-sessions/pom.xml b/jetty-ee8/test-ee8-sessions/test-ee8-memcached-sessions/pom.xml new file mode 100644 index 000000000000..18796dff8930 --- /dev/null +++ b/jetty-ee8/test-ee8-sessions/test-ee8-memcached-sessions/pom.xml @@ -0,0 +1,62 @@ + + + 4.0.0 + + org.eclipse.jetty.ee8 + test-ee8-sessions + 12.0.0-SNAPSHOT + + test-ee8-memcached-sessions + EE8 :: Sessions Tests :: Memcached + + test-ee8-sessions/test-ee9-memcached-sessions + ${project.groupId}.sessions.memcached + + + + org.eclipse.jetty + jetty-session + test + + + org.eclipse.jetty.ee8 + jetty-ee8-webapp + test + + + org.eclipse.jetty + jetty-client + test + + + org.eclipse.jetty.ee8 + test-ee8-sessions-common + test + + + org.eclipse.jetty.memcached + jetty-memcached-sessions + test + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.testcontainers + testcontainers + test + + + org.testcontainers + junit-jupiter + test + + + diff --git a/jetty-ee8/test-ee8-sessions/test-ee8-mongodb-sessions/pom.xml b/jetty-ee8/test-ee8-sessions/test-ee8-mongodb-sessions/pom.xml new file mode 100644 index 000000000000..e203e3b529ab --- /dev/null +++ b/jetty-ee8/test-ee8-sessions/test-ee8-mongodb-sessions/pom.xml @@ -0,0 +1,129 @@ + + + 4.0.0 + + org.eclipse.jetty.ee8 + test-ee8-sessions + 12.0.0-SNAPSHOT + + test-ee8-mongodb-sessions + EE8 :: Sessions Tests :: Mongo + + test-ee9-sessions/test-ee9-mongodb-sessions + ${project.groupId}.sessions.mongo + localhost + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + ${mongo.docker.version} + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + unpack + generate-test-resources + + unpack + + + + + org.eclipse.jetty.toolchain + jetty-test-policy + ${jetty-test-policy.version} + jar + true + **/*.keystore,**/*.pem + ${jetty.test.policy.loc} + + + + + + + + + + + org.eclipse.jetty + jetty-session + test + + + org.eclipse.jetty + jetty-session + test-jar + test + + + org.eclipse.jetty.ee8 + jetty-ee8-webapp + test + + + org.eclipse.jetty + jetty-client + test + + + org.eclipse.jetty.ee8 + test-ee8-sessions-common + test + + + org.eclipse.jetty + jetty-nosql + test + + + org.eclipse.jetty + jetty-jmx + true + test + + + org.slf4j + slf4j-api + test + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + + + org.testcontainers + testcontainers + test + + + org.testcontainers + junit-jupiter + test + + + org.testcontainers + mongodb + test + + + org.slf4j + slf4j-simple + test + + + diff --git a/jetty-ee8/test-ee8-sessions/test-ee8-sessions-common/pom.xml b/jetty-ee8/test-ee8-sessions/test-ee8-sessions-common/pom.xml new file mode 100644 index 000000000000..0a1e5f63cebe --- /dev/null +++ b/jetty-ee8/test-ee8-sessions/test-ee8-sessions-common/pom.xml @@ -0,0 +1,64 @@ + + + 4.0.0 + + org.eclipse.jetty.ee8 + test-ee8-sessions + 12.0.0-SNAPSHOT + + test-ee8-sessions-common + EE8 :: Sessions Tests :: Common + + test-ee9-sessions/test-ee9-sessions-common + ${project.groupId}.sessions.common + + + + org.eclipse.jetty.toolchain + jetty-servlet-api + + + org.eclipse.jetty + jetty-session + + + org.eclipse.jetty.ee8 + jetty-ee8-webapp + + + org.eclipse.jetty + jetty-client + + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty + jetty-session + ${project.version} + test-jar + test + + + org.eclipse.jetty.toolchain + jetty-test-helper + compile + + + org.junit.jupiter + junit-jupiter + compile + + + org.junit.jupiter + junit-jupiter-api + compile + + + From 9b92c8843c7fc7c9b04825e35e712ae6e5e4a7fe Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Mon, 1 Aug 2022 10:55:38 +1000 Subject: [PATCH 3/3] touch Signed-off-by: Olivier Lamy --- jetty-ee8/test-ee8-sessions/test-ee8-hazelcast-sessions/pom.xml | 1 - jetty-ee9/jetty-ee9-websocket/pom.xml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/jetty-ee8/test-ee8-sessions/test-ee8-hazelcast-sessions/pom.xml b/jetty-ee8/test-ee8-sessions/test-ee8-hazelcast-sessions/pom.xml index c505879bc473..7da446a7a3e5 100644 --- a/jetty-ee8/test-ee8-sessions/test-ee8-hazelcast-sessions/pom.xml +++ b/jetty-ee8/test-ee8-sessions/test-ee8-hazelcast-sessions/pom.xml @@ -123,5 +123,4 @@ test - diff --git a/jetty-ee9/jetty-ee9-websocket/pom.xml b/jetty-ee9/jetty-ee9-websocket/pom.xml index 59bbeb123258..db884130e283 100644 --- a/jetty-ee9/jetty-ee9-websocket/pom.xml +++ b/jetty-ee9/jetty-ee9-websocket/pom.xml @@ -10,7 +10,7 @@ 4.0.0 org.eclipse.jetty.ee9.websocket jetty-ee9-websocket - EE 9 Websocket + EE9 :: Websocket pom