From b88908236e14a6379a7f93fd006dd5a178f1d98b Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Tue, 7 Nov 2023 15:37:41 +1000 Subject: [PATCH] Jetty 12 add duplicate classes finder plugin to avoid sames classes with different content coming from different jars (#10767) * add duplicate finder plugin --------- Signed-off-by: Olivier Lamy --- .../jetty/session/SessionHandlerTest.java | 4 +- .../jetty-websocket-core-tests/pom.xml | 10 ++ jetty-ee10/jetty-ee10-maven-plugin/pom.xml | 5 - .../test-jetty-ee10-osgi/pom.xml | 8 ++ .../jetty-ee10-test-sessions-common/pom.xml | 6 -- .../pom.xml | 47 ++++++++-- jetty-ee8/jetty-ee8-glassfish-jstl/pom.xml | 4 + jetty-ee8/jetty-ee8-maven-plugin/pom.xml | 5 - .../test-jetty-ee8-osgi/pom.xml | 2 + .../jetty-ee9-demo-embedded/pom.xml | 15 ++- jetty-ee9/jetty-ee9-glassfish-jstl/pom.xml | 18 ++++ jetty-ee9/jetty-ee9-maven-plugin/pom.xml | 11 ++- .../plugin/utils/MavenProjectHelper.java | 4 - .../jetty-ee9-osgi-boot-jsp/pom.xml | 6 ++ .../test-jetty-ee9-osgi/pom.xml | 2 + jetty-ee9/jetty-ee9-runner/pom.xml | 6 ++ .../jetty-ee9-test-integration/pom.xml | 6 ++ .../jetty-ee9-test-quickstart/pom.xml | 12 +++ .../jetty-ee9-test-sessions-common/pom.xml | 6 -- .../pom.xml | 42 +++++++++ .../jetty-infinispan-common/pom.xml | 6 ++ .../jetty-infinispan-remote-query/pom.xml | 6 ++ pom.xml | 93 ++++++++++++++++++- tests/jetty-test-session-common/pom.xml | 12 +++ .../test-distribution-common/pom.xml | 35 +++++++ 25 files changed, 320 insertions(+), 51 deletions(-) diff --git a/jetty-core/jetty-session/src/test/java/org/eclipse/jetty/session/SessionHandlerTest.java b/jetty-core/jetty-session/src/test/java/org/eclipse/jetty/session/SessionHandlerTest.java index 0d3bc9bc216..b4ebae94116 100644 --- a/jetty-core/jetty-session/src/test/java/org/eclipse/jetty/session/SessionHandlerTest.java +++ b/jetty-core/jetty-session/src/test/java/org/eclipse/jetty/session/SessionHandlerTest.java @@ -26,7 +26,6 @@ import org.eclipse.jetty.server.Response; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.Session; import org.eclipse.jetty.util.Callback; -import org.junit.Assert; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -39,6 +38,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.nullValue; import static org.hamcrest.Matchers.startsWith; +import static org.junit.jupiter.api.Assertions.assertNull; /** * SessionHandlerTest @@ -656,7 +656,7 @@ public class SessionHandlerTest response = HttpTester.parseResponse(endPoint.getResponse()); assertThat(response.getStatus(), equalTo(200)); - Assert.assertNull(response.get(HttpHeader.SET_COOKIE)); + assertNull(response.get(HttpHeader.SET_COOKIE)); String content = response.getContent(); assertThat(content, startsWith("Session=")); diff --git a/jetty-core/jetty-websocket/jetty-websocket-core-tests/pom.xml b/jetty-core/jetty-websocket/jetty-websocket-core-tests/pom.xml index d951531333a..17dd40357ec 100644 --- a/jetty-core/jetty-websocket/jetty-websocket-core-tests/pom.xml +++ b/jetty-core/jetty-websocket/jetty-websocket-core-tests/pom.xml @@ -34,6 +34,16 @@ com.googlecode.json-simple json-simple test + + + junit + junit + + + org.hamcrest + hamcrest-core + + org.codehaus.plexus diff --git a/jetty-ee10/jetty-ee10-maven-plugin/pom.xml b/jetty-ee10/jetty-ee10-maven-plugin/pom.xml index 225fab3ac39..2042b0dba55 100644 --- a/jetty-ee10/jetty-ee10-maven-plugin/pom.xml +++ b/jetty-ee10/jetty-ee10-maven-plugin/pom.xml @@ -28,11 +28,6 @@ org.apache.maven.plugin-tools maven-plugin-tools-api - - org.apache.maven.shared - maven-artifact-transfer - ${maven-artifact-transfer.version} - org.codehaus.plexus plexus-xml diff --git a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/pom.xml b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/pom.xml index 313d51525a8..e6c69c9de98 100644 --- a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/pom.xml +++ b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/pom.xml @@ -12,6 +12,8 @@ target/distribution ${project.groupId}.boot.test.osgi + + true true true @@ -415,6 +417,12 @@ org.ops4j.pax.exam pax-exam-junit4 test + + + org.hamcrest + hamcrest-core + + org.ops4j.pax.exam diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-common/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-common/pom.xml index 7cc4275dbfc..7c1beb8fb9f 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-common/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-common/pom.xml @@ -31,12 +31,6 @@ org.eclipse.jetty.tests jetty-test-session-common - - - org.hamcrest - hamcrest-core - - org.eclipse.jetty.toolchain diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-infinispan/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-infinispan/pom.xml index 2c11573ad4a..a8e590438cd 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-infinispan/pom.xml +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-infinispan/pom.xml @@ -76,17 +76,17 @@ org.infinispan infinispan-client-hotrod test + + + org.wildfly.security + wildfly-elytron + + org.infinispan infinispan-core test - - - org.wildfly.common - wildfly-common - - org.infinispan @@ -128,6 +128,41 @@ testcontainers test + + org.wildfly.security + wildfly-elytron-sasl-digest + test + + + org.wildfly.security + wildfly-elytron-sasl-external + test + + + org.wildfly.security + wildfly-elytron-sasl-gs2 + test + + + org.wildfly.security + wildfly-elytron-sasl-gssapi + test + + + org.wildfly.security + wildfly-elytron-sasl-oauth2 + test + + + org.wildfly.security + wildfly-elytron-sasl-plain + test + + + org.wildfly.security + wildfly-elytron-sasl-scram + test + diff --git a/jetty-ee8/jetty-ee8-glassfish-jstl/pom.xml b/jetty-ee8/jetty-ee8-glassfish-jstl/pom.xml index 5d584e35226..32b2a008d71 100644 --- a/jetty-ee8/jetty-ee8-glassfish-jstl/pom.xml +++ b/jetty-ee8/jetty-ee8-glassfish-jstl/pom.xml @@ -41,6 +41,10 @@ javax.servlet.jsp * + + javax.servlet.jsp.jstl + * + diff --git a/jetty-ee8/jetty-ee8-maven-plugin/pom.xml b/jetty-ee8/jetty-ee8-maven-plugin/pom.xml index 23e3de911e3..1a06304ec29 100644 --- a/jetty-ee8/jetty-ee8-maven-plugin/pom.xml +++ b/jetty-ee8/jetty-ee8-maven-plugin/pom.xml @@ -28,11 +28,6 @@ org.apache.maven.plugin-tools maven-plugin-tools-api - - org.apache.maven.shared - maven-artifact-transfer - ${maven-artifact-transfer.version} - org.codehaus.plexus plexus-xml diff --git a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/pom.xml b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/pom.xml index d0ae559c7e2..4e3e471b4bf 100644 --- a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/pom.xml +++ b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/pom.xml @@ -15,6 +15,8 @@ target/distribution ${project.groupId}.boot.test.osgi true + + true jetty-ee9-osgi/test-jetty-ee9-osgi apache-el org.mortbay.jasper diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-embedded/pom.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-embedded/pom.xml index 54edabcac2f..b251b2a82cb 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-embedded/pom.xml +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-embedded/pom.xml @@ -62,6 +62,12 @@ org.eclipse.jetty.ee9 jetty-ee9-plus + + + jakarta.el + jakarta.el-api + + org.eclipse.jetty.ee9 @@ -85,15 +91,6 @@ ${project.version} war - - org.eclipse.jetty.ee9.demos jetty-ee9-demo-jndi-webapp diff --git a/jetty-ee9/jetty-ee9-glassfish-jstl/pom.xml b/jetty-ee9/jetty-ee9-glassfish-jstl/pom.xml index e3c6c93214c..901f10b066e 100644 --- a/jetty-ee9/jetty-ee9-glassfish-jstl/pom.xml +++ b/jetty-ee9/jetty-ee9-glassfish-jstl/pom.xml @@ -20,17 +20,35 @@ jakarta.servlet.jsp.jstl jakarta.servlet.jsp.jstl-api + + + jakarta.el + jakarta.el-api + + org.glassfish.web jakarta.servlet.jsp.jstl + + + jakarta.el + jakarta.el-api + + org.eclipse.jetty.ee9 jetty-ee9-annotations test + + + jakarta.el + jakarta.el-api + + diff --git a/jetty-ee9/jetty-ee9-maven-plugin/pom.xml b/jetty-ee9/jetty-ee9-maven-plugin/pom.xml index 322f51b9a12..2a96e1c2960 100644 --- a/jetty-ee9/jetty-ee9-maven-plugin/pom.xml +++ b/jetty-ee9/jetty-ee9-maven-plugin/pom.xml @@ -27,11 +27,6 @@ org.apache.maven.plugin-tools maven-plugin-tools-api - - org.apache.maven.shared - maven-artifact-transfer - ${maven-artifact-transfer.version} - org.codehaus.plexus plexus-xml @@ -114,6 +109,12 @@ org.eclipse.jetty.ee9 jetty-ee9-plus true + + + jakarta.el + jakarta.el-api + + org.eclipse.jetty.ee9 diff --git a/jetty-ee9/jetty-ee9-maven-plugin/src/main/java/org/eclipse/jetty/ee9/maven/plugin/utils/MavenProjectHelper.java b/jetty-ee9/jetty-ee9-maven-plugin/src/main/java/org/eclipse/jetty/ee9/maven/plugin/utils/MavenProjectHelper.java index 414f72e40e4..b336f55debd 100644 --- a/jetty-ee9/jetty-ee9-maven-plugin/src/main/java/org/eclipse/jetty/ee9/maven/plugin/utils/MavenProjectHelper.java +++ b/jetty-ee9/jetty-ee9-maven-plugin/src/main/java/org/eclipse/jetty/ee9/maven/plugin/utils/MavenProjectHelper.java @@ -30,10 +30,6 @@ import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.execution.MavenSession; import org.apache.maven.project.MavenProject; -import org.apache.maven.project.ProjectBuildingRequest; -import org.apache.maven.shared.transfer.artifact.DefaultArtifactCoordinate; -import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolver; -import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolverException; import org.eclipse.aether.RepositorySystem; import org.eclipse.aether.artifact.DefaultArtifact; import org.eclipse.aether.resolution.ArtifactRequest; diff --git a/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot-jsp/pom.xml b/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot-jsp/pom.xml index 74ccac9eed2..899dbb8a485 100644 --- a/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot-jsp/pom.xml +++ b/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot-jsp/pom.xml @@ -40,6 +40,12 @@ org.eclipse.jetty.ee9.osgi jetty-ee9-osgi-boot provided + + + jakarta.el + jakarta.el-api + + diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/pom.xml b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/pom.xml index 80c19f41492..10279e62ad1 100644 --- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/pom.xml +++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/pom.xml @@ -12,6 +12,8 @@ target/distribution ${project.groupId}.boot.test.osgi + + true 1.2 https://download.eclipse.org/jetty/orbit/ true diff --git a/jetty-ee9/jetty-ee9-runner/pom.xml b/jetty-ee9/jetty-ee9-runner/pom.xml index b023cc8f302..eb90d985ae2 100644 --- a/jetty-ee9/jetty-ee9-runner/pom.xml +++ b/jetty-ee9/jetty-ee9-runner/pom.xml @@ -36,6 +36,12 @@ org.eclipse.jetty.ee9 jetty-ee9-plus + + + jakarta.el + jakarta.el-api + + org.eclipse.jetty.ee9.websocket diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-integration/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-integration/pom.xml index 7a95f7c7e50..3dae358c226 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-integration/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-integration/pom.xml @@ -63,6 +63,12 @@ org.eclipse.jetty.ee9 jetty-ee9-annotations test + + + jakarta.el + jakarta.el-api + + org.eclipse.jetty.ee9 diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-quickstart/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-quickstart/pom.xml index 41ef63d8261..d3e74e1daf0 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-quickstart/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-quickstart/pom.xml @@ -32,6 +32,12 @@ org.eclipse.jetty.ee9 jetty-ee9-annotations test + + + jakarta.el + jakarta.el-api + + org.eclipse.jetty.ee9 @@ -47,6 +53,12 @@ org.eclipse.jetty.ee9 jetty-ee9-plus test + + + jakarta.el + jakarta.el-api + + org.eclipse.jetty.ee9 diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-common/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-common/pom.xml index 11c542b766f..a4a6385169b 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-common/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-common/pom.xml @@ -27,12 +27,6 @@ org.eclipse.jetty.tests jetty-test-session-common - - - org.hamcrest - hamcrest-core - - org.eclipse.jetty.toolchain diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-infinispan/pom.xml b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-infinispan/pom.xml index 556cfa1ee73..d1cc591635c 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-infinispan/pom.xml +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-infinispan/pom.xml @@ -77,6 +77,12 @@ org.infinispan infinispan-client-hotrod test + + + org.wildfly.security + wildfly-elytron + + org.infinispan @@ -129,6 +135,42 @@ testcontainers test + + org.wildfly.security + wildfly-elytron-sasl-digest + test + + + org.wildfly.security + wildfly-elytron-sasl-external + test + + + org.wildfly.security + wildfly-elytron-sasl-gs2 + test + + + org.wildfly.security + wildfly-elytron-sasl-gssapi + test + + + org.wildfly.security + wildfly-elytron-sasl-oauth2 + test + + + org.wildfly.security + wildfly-elytron-sasl-plain + test + + + org.wildfly.security + wildfly-elytron-sasl-scram + test + + diff --git a/jetty-integrations/jetty-infinispan/jetty-infinispan-common/pom.xml b/jetty-integrations/jetty-infinispan/jetty-infinispan-common/pom.xml index 74cbb3add2e..f5ea76ae23e 100644 --- a/jetty-integrations/jetty-infinispan/jetty-infinispan-common/pom.xml +++ b/jetty-integrations/jetty-infinispan/jetty-infinispan-common/pom.xml @@ -35,6 +35,12 @@ org.infinispan infinispan-client-hotrod provided + + + org.wildfly.security + wildfly-elytron + + org.infinispan diff --git a/jetty-integrations/jetty-infinispan/jetty-infinispan-remote-query/pom.xml b/jetty-integrations/jetty-infinispan/jetty-infinispan-remote-query/pom.xml index 0936c9958fa..621264eec0d 100644 --- a/jetty-integrations/jetty-infinispan/jetty-infinispan-remote-query/pom.xml +++ b/jetty-integrations/jetty-infinispan/jetty-infinispan-remote-query/pom.xml @@ -33,6 +33,12 @@ org.infinispan infinispan-client-hotrod + + + org.wildfly.security + wildfly-elytron + + org.infinispan diff --git a/pom.xml b/pom.xml index 5133cbf6191..d1b144ed811 100644 --- a/pom.xml +++ b/pom.xml @@ -1179,9 +1179,15 @@ ${slf4j.version} - org.wildfly.security - wildfly-elytron - ${wildfly.elytron.version} + org.testcontainers + testcontainers + ${testcontainers.version} + + + org.hamcrest + hamcrest-core + + org.apache.maven.plugin-tools @@ -1213,6 +1219,48 @@ ${osgi-util-xml-version} test + + org.wildfly.security + wildfly-elytron-sasl-digest + 2.2.2.Final + test + + + org.wildfly.security + wildfly-elytron-sasl-external + 2.2.2.Final + test + + + org.wildfly.security + wildfly-elytron-sasl-gs2 + 2.2.2.Final + test + + + org.wildfly.security + wildfly-elytron-sasl-gssapi + 2.2.2.Final + test + + + org.wildfly.security + wildfly-elytron-sasl-oauth2 + 2.2.2.Final + test + + + org.wildfly.security + wildfly-elytron-sasl-plain + 2.2.2.Final + test + + + org.wildfly.security + wildfly-elytron-sasl-scram + 2.2.2.Final + test + @@ -2301,6 +2349,45 @@ + + org.basepom.maven + duplicate-finder-maven-plugin + 2.0.0 + + + default + + check + + verify + + + true + + about.html + .api_description + about_files/LICENSE-2.0.txt + + jetty-logging.properties + features.xml + plugin.properties + plugin.xml + + + + org.osgi.util.tracker.* + + org.infinispan.commons.util.CloseableIterator + + + + + diff --git a/tests/jetty-test-session-common/pom.xml b/tests/jetty-test-session-common/pom.xml index 40ccc626cab..034d9b6bdda 100644 --- a/tests/jetty-test-session-common/pom.xml +++ b/tests/jetty-test-session-common/pom.xml @@ -39,6 +39,12 @@ jetty-infinispan-common compile true + + + org.wildfly.security + wildfly-elytron + + org.eclipse.jetty @@ -76,6 +82,12 @@ infinispan-client-hotrod compile true + + + org.wildfly.security + wildfly-elytron + + org.infinispan diff --git a/tests/test-distribution/test-distribution-common/pom.xml b/tests/test-distribution/test-distribution-common/pom.xml index 2bf5adc91c4..3948d21221f 100644 --- a/tests/test-distribution/test-distribution-common/pom.xml +++ b/tests/test-distribution/test-distribution-common/pom.xml @@ -178,6 +178,41 @@ testcontainers test + + org.wildfly.security + wildfly-elytron-sasl-digest + test + + + org.wildfly.security + wildfly-elytron-sasl-external + test + + + org.wildfly.security + wildfly-elytron-sasl-gs2 + test + + + org.wildfly.security + wildfly-elytron-sasl-gssapi + test + + + org.wildfly.security + wildfly-elytron-sasl-oauth2 + test + + + org.wildfly.security + wildfly-elytron-sasl-plain + test + + + org.wildfly.security + wildfly-elytron-sasl-scram + test +