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 27f29e1db8a84afe974eb26d0b7742b898f3af65 Author: Nihal Jain <[email protected]> AuthorDate: Fri Mar 28 14:20:49 2025 +0530 Use excludes during shading to remove duplicate core's code in EEX modules --- hbase-shaded-jetty-12-plus-core/pom.xml | 20 ++++++++++++++++++++ hbase-shaded-jetty-12-plus-ee8/pom.xml | 19 +++++++++++-------- hbase-shaded-jetty-12-plus-ee9/pom.xml | 16 +++++++++++----- pom.xml | 2 +- 4 files changed, 43 insertions(+), 14 deletions(-) diff --git a/hbase-shaded-jetty-12-plus-core/pom.xml b/hbase-shaded-jetty-12-plus-core/pom.xml index 67841b4..8e9894a 100644 --- a/hbase-shaded-jetty-12-plus-core/pom.xml +++ b/hbase-shaded-jetty-12-plus-core/pom.xml @@ -105,6 +105,26 @@ </exclusion> </exclusions> </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-security</artifactId> + <version>${jetty12.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-session</artifactId> + <version>${jetty12.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-ee</artifactId> + <version>${jetty12.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-xml</artifactId> + <version>${jetty12.version}</version> + </dependency> </dependencies> <build> <plugins> diff --git a/hbase-shaded-jetty-12-plus-ee8/pom.xml b/hbase-shaded-jetty-12-plus-ee8/pom.xml index 22288df..1460711 100644 --- a/hbase-shaded-jetty-12-plus-ee8/pom.xml +++ b/hbase-shaded-jetty-12-plus-ee8/pom.xml @@ -39,11 +39,6 @@ <name>Apache HBase Relocated (Shaded) Jetty 12+ Libs: EE8</name> <description>Pulls down Jetty EE8, relocates it and makes a far jar.</description> <dependencies> - <dependency> - <groupId>org.apache.hbase.thirdparty</groupId> - <artifactId>hbase-shaded-jetty-12-plus-core</artifactId> - <version>${project.version}</version> - </dependency> <dependency> <groupId>org.eclipse.jetty.ee8</groupId> <artifactId>jetty-ee8-servlet</artifactId> @@ -124,9 +119,6 @@ <relocation> <pattern>org.eclipse.jetty</pattern> <shadedPattern>${rename.offset}.org.eclipse.jetty</shadedPattern> - <excludes> - <exclude>org.apache.hbase.thirdparty:hbase-shaded-jetty-12-plus-core</exclude> - </excludes> </relocation> <!-- This is for relocating the blacklist in @@ -146,6 +138,17 @@ 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 ee19693..f1f530a 100644 --- a/hbase-shaded-jetty-12-plus-ee9/pom.xml +++ b/hbase-shaded-jetty-12-plus-ee9/pom.xml @@ -39,11 +39,6 @@ <name>Apache HBase Relocated (Shaded) Jetty 12+ Libs: EE9</name> <description>Pulls down Jetty EE9, relocates it and makes a far jar.</description> <dependencies> - <dependency> - <groupId>org.apache.hbase.thirdparty</groupId> - <artifactId>hbase-shaded-jetty-12-plus-core</artifactId> - <version>${project.version}</version> - </dependency> <dependency> <groupId>org.eclipse.jetty.ee9</groupId> <artifactId>jetty-ee9-servlet</artifactId> @@ -143,6 +138,17 @@ 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/pom.xml b/pom.xml index 45628ad..79eb5ca 100644 --- a/pom.xml +++ b/pom.xml @@ -244,7 +244,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> - <version>3.5.2</version> + <version>3.5.0</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId>
