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 a9bbd8789364b8a3d55b3c34d7de6ed08113607f Author: Nihal Jain <[email protected]> AuthorDate: Thu Mar 27 20:14:13 2025 +0530 Make changes to test EE8 + EE9 in single module --- .../pom.xml | 99 +++++++++++++++++----- pom.xml | 2 +- 2 files changed, 77 insertions(+), 24 deletions(-) diff --git a/hbase-shaded-jetty-ee8/pom.xml b/hbase-shaded-jetty-12-plus/pom.xml similarity index 81% rename from hbase-shaded-jetty-ee8/pom.xml rename to hbase-shaded-jetty-12-plus/pom.xml index ac09d42..5999cdb 100644 --- a/hbase-shaded-jetty-ee8/pom.xml +++ b/hbase-shaded-jetty-12-plus/pom.xml @@ -35,8 +35,8 @@ <version>${revision}</version> <relativePath>..</relativePath> </parent> - <artifactId>hbase-shaded-jetty-ee8</artifactId> - <name>Apache HBase Relocated (Shaded) Jetty Libs: EE8</name> + <artifactId>hbase-shaded-jetty-12-plus</artifactId> + <name>Apache HBase Relocated (Shaded) Jetty 12+ Libs</name> <description>Pulls down Jetty, relocates it and makes a far jar.</description> <dependencies> <dependency> @@ -51,14 +51,21 @@ </exclusions> </dependency> <dependency> - <groupId>org.eclipse.jetty.ee8</groupId> - <artifactId>jetty-ee8-servlet</artifactId> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-http</artifactId> <version>${jetty12.version}</version> <exclusions> <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>servlet-api</artifactId> + <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> + <exclusions> <exclusion> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> @@ -66,8 +73,8 @@ </exclusions> </dependency> <dependency> - <groupId>org.eclipse.jetty.ee8</groupId> - <artifactId>jetty-ee8-security</artifactId> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-io</artifactId> <version>${jetty12.version}</version> <exclusions> <exclusion> @@ -77,8 +84,8 @@ </exclusions> </dependency> <dependency> - <groupId>org.eclipse.jetty.ee8</groupId> - <artifactId>jetty-ee8-nested</artifactId> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-jmx</artifactId> <version>${jetty12.version}</version> <exclusions> <exclusion> @@ -89,7 +96,7 @@ </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-http</artifactId> + <artifactId>jetty-util-ajax</artifactId> <version>${jetty12.version}</version> <exclusions> <exclusion> @@ -99,10 +106,14 @@ </exclusions> </dependency> <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-util</artifactId> + <groupId>org.eclipse.jetty.ee8</groupId> + <artifactId>jetty-ee8-servlet</artifactId> <version>${jetty12.version}</version> <exclusions> + <exclusion> + <groupId>org.eclipse.jetty</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> <exclusion> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> @@ -110,8 +121,8 @@ </exclusions> </dependency> <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-io</artifactId> + <groupId>org.eclipse.jetty.ee8</groupId> + <artifactId>jetty-ee8-security</artifactId> <version>${jetty12.version}</version> <exclusions> <exclusion> @@ -121,8 +132,8 @@ </exclusions> </dependency> <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-jmx</artifactId> + <groupId>org.eclipse.jetty.ee8</groupId> + <artifactId>jetty-ee8-nested</artifactId> <version>${jetty12.version}</version> <exclusions> <exclusion> @@ -142,11 +153,17 @@ </exclusion> </exclusions> </dependency> + + <!-- TODO Added here just for testing purpose, Drop before merge? --> <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-util-ajax</artifactId> + <groupId>org.eclipse.jetty.ee9</groupId> + <artifactId>jetty-ee9-servlet</artifactId> <version>${jetty12.version}</version> <exclusions> + <exclusion> + <groupId>org.eclipse.jetty</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> <exclusion> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> @@ -154,9 +171,37 @@ </exclusions> </dependency> <dependency> - <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> - <version>${servlet4-api.version}</version> + <groupId>org.eclipse.jetty.ee9</groupId> + <artifactId>jetty-ee9-security</artifactId> + <version>${jetty12.version}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.eclipse.jetty.ee9</groupId> + <artifactId>jetty-ee9-nested</artifactId> + <version>${jetty12.version}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.eclipse.jetty.ee9</groupId> + <artifactId>jetty-ee9-webapp</artifactId> + <version>${jetty12.version}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + </exclusions> </dependency> </dependencies> <build> @@ -214,7 +259,7 @@ 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 that we've already packaged a services file once. --> - <exclude>org.apache.hbase.thirdparty:hbase-shaded-jetty</exclude> + <exclude>org.apache.hbase.thirdparty:hbase-shaded-jetty-12-plus</exclude> </excludes> </artifactSet> <transformers> @@ -250,6 +295,14 @@ <replacetoken>org.eclipse.jetty</replacetoken> <replacevalue>${rename.offset}.org.eclipse.jetty</replacevalue> </replace> + + <!-- TODO Added here just for testing purpose, Drop before merge? --> + <echo message="Replace content in webdefault-ee9.xml"/> + <replace file="${project.build.directory}/unpacked/${rename.offset.dir}/org/eclipse/jetty/ee9/webapp/webdefault-ee9.xml"> + <replacetoken>org.eclipse.jetty</replacetoken> + <replacevalue>${rename.offset}.org.eclipse.jetty</replacevalue> + </replace> + <echo message="Redo jar"/> <jar basedir="${project.build.directory}/unpacked" destfile="${project.build.directory}/${project.artifactId}-${project.version}.jar"/> </target> diff --git a/pom.xml b/pom.xml index 0fdd813..418d0e7 100644 --- a/pom.xml +++ b/pom.xml @@ -100,7 +100,7 @@ <module>hbase-shaded-gson</module> <module>hbase-shaded-miscellaneous</module> <module>hbase-shaded-jetty</module> - <module>hbase-shaded-jetty-ee8</module> + <module>hbase-shaded-jetty-12-plus</module> <module>hbase-shaded-jersey</module> <module>hbase-shaded-jackson-jaxrs-json-provider</module> <module>hbase-noop-htrace</module>
