This is an automated email from the ASF dual-hosted git repository. nihaljain pushed a commit to branch jetty12 in repository https://gitbox.apache.org/repos/asf/hbase-thirdparty.git
commit fd33095eea07639086c3be108570c036db4b1ccd Author: Nihal Jain <[email protected]> AuthorDate: Fri Mar 28 14:39:11 2025 +0530 Add all core deps as transitive in eeX and fix sl4j exclusions --- hbase-shaded-jetty-12-plus-core/pom.xml | 24 ++++++ hbase-shaded-jetty-12-plus-ee8/pom.xml | 133 +++++++++++++++++++++++++++++--- hbase-shaded-jetty-12-plus-ee9/pom.xml | 133 +++++++++++++++++++++++++++++--- 3 files changed, 268 insertions(+), 22 deletions(-) diff --git a/hbase-shaded-jetty-12-plus-core/pom.xml b/hbase-shaded-jetty-12-plus-core/pom.xml index 8e9894a..530d3b4 100644 --- a/hbase-shaded-jetty-12-plus-core/pom.xml +++ b/hbase-shaded-jetty-12-plus-core/pom.xml @@ -109,21 +109,45 @@ <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-security</artifactId> <version>${jetty12.version}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-session</artifactId> <version>${jetty12.version}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-ee</artifactId> <version>${jetty12.version}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-xml</artifactId> <version>${jetty12.version}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + </exclusions> </dependency> </dependencies> <build> diff --git a/hbase-shaded-jetty-12-plus-ee8/pom.xml b/hbase-shaded-jetty-12-plus-ee8/pom.xml index 1460711..e17f4eb 100644 --- a/hbase-shaded-jetty-12-plus-ee8/pom.xml +++ b/hbase-shaded-jetty-12-plus-ee8/pom.xml @@ -87,6 +87,128 @@ </exclusion> </exclusions> </dependency> + <!-- List to dependencies which are part of core and we want to avoid bundling, + hence keeping as provided here --> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> + <version>${jetty12.version}</version> + <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-http</artifactId> + <version>${jetty12.version}</version> + <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util</artifactId> + <version>${jetty12.version}</version> + <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-io</artifactId> + <version>${jetty12.version}</version> + <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-jmx</artifactId> + <version>${jetty12.version}</version> + <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util-ajax</artifactId> + <version>${jetty12.version}</version> + <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-security</artifactId> + <version>${jetty12.version}</version> + <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-session</artifactId> + <version>${jetty12.version}</version> + <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-ee</artifactId> + <version>${jetty12.version}</version> + <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-xml</artifactId> + <version>${jetty12.version}</version> + <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + </exclusions> + </dependency> </dependencies> <build> <plugins> @@ -138,17 +260,6 @@ produce. See below for how to exclusion of transitive dependencies. --> <exclude>org.slf4j:slf4j-api</exclude> - <!--Exclude jetty core jars: we get a shaded version in adjacent module. --> - <exclude>org.eclipse.jetty:jetty-server</exclude> - <exclude>org.eclipse.jetty:jetty-http</exclude> - <exclude>org.eclipse.jetty:jetty-util</exclude> - <exclude>org.eclipse.jetty:jetty-io</exclude> - <exclude>org.eclipse.jetty:jetty-jmx</exclude> - <exclude>org.eclipse.jetty:jetty-util-ajax</exclude> - <exclude>org.eclipse.jetty:jetty-security</exclude> - <exclude>org.eclipse.jetty:jetty-session</exclude> - <exclude>org.eclipse.jetty:jetty-ee</exclude> - <exclude>org.eclipse.jetty:jetty-xml</exclude> <!-- On the "next" build, exclude a lingering shaded jar if it exists (user did not `clean`). Maven will happily pick up the previous shaded jar and try to include that in the N+1th build if we don't exclude it. This will result in a failure in the ServicesResourceTransformer claiming diff --git a/hbase-shaded-jetty-12-plus-ee9/pom.xml b/hbase-shaded-jetty-12-plus-ee9/pom.xml index f1f530a..42c8583 100644 --- a/hbase-shaded-jetty-12-plus-ee9/pom.xml +++ b/hbase-shaded-jetty-12-plus-ee9/pom.xml @@ -87,6 +87,128 @@ </exclusion> </exclusions> </dependency> + <!-- List to dependencies which are part of core and we want to avoid bundling, + hence keeping as provided here --> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> + <version>${jetty12.version}</version> + <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-http</artifactId> + <version>${jetty12.version}</version> + <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util</artifactId> + <version>${jetty12.version}</version> + <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-io</artifactId> + <version>${jetty12.version}</version> + <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-jmx</artifactId> + <version>${jetty12.version}</version> + <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util-ajax</artifactId> + <version>${jetty12.version}</version> + <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-security</artifactId> + <version>${jetty12.version}</version> + <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-session</artifactId> + <version>${jetty12.version}</version> + <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-ee</artifactId> + <version>${jetty12.version}</version> + <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-xml</artifactId> + <version>${jetty12.version}</version> + <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + </exclusions> + </dependency> </dependencies> <build> <plugins> @@ -138,17 +260,6 @@ produce. See below for how to exclusion of transitive dependencies. --> <exclude>org.slf4j:slf4j-api</exclude> - <!--Exclude jetty core jars: we get a shaded version in adjacent module. --> - <exclude>org.eclipse.jetty:jetty-server</exclude> - <exclude>org.eclipse.jetty:jetty-http</exclude> - <exclude>org.eclipse.jetty:jetty-util</exclude> - <exclude>org.eclipse.jetty:jetty-io</exclude> - <exclude>org.eclipse.jetty:jetty-jmx</exclude> - <exclude>org.eclipse.jetty:jetty-util-ajax</exclude> - <exclude>org.eclipse.jetty:jetty-security</exclude> - <exclude>org.eclipse.jetty:jetty-session</exclude> - <exclude>org.eclipse.jetty:jetty-ee</exclude> - <exclude>org.eclipse.jetty:jetty-xml</exclude> <!-- On the "next" build, exclude a lingering shaded jar if it exists (user did not `clean`). Maven will happily pick up the previous shaded jar and try to include that in the N+1th build if we don't exclude it. This will result in a failure in the ServicesResourceTransformer claiming
