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 eaeca76728ae9cc4623a7032ceb21b742d654328 Author: Nihal Jain <[email protected]> AuthorDate: Fri Mar 28 13:52:06 2025 +0530 Break into core, core + EE8 and core + EE9; Also bump shade plugin as otherwise getting error when including core into sub module --- .../pom.xml | 160 ++------------------- .../pom.xml | 145 ++----------------- .../pom.xml | 143 ++---------------- pom.xml | 7 +- 4 files changed, 42 insertions(+), 413 deletions(-) diff --git a/hbase-shaded-jetty-12-plus/pom.xml b/hbase-shaded-jetty-12-plus-core/pom.xml similarity index 50% copy from hbase-shaded-jetty-12-plus/pom.xml copy to hbase-shaded-jetty-12-plus-core/pom.xml index 5999cdb..67841b4 100644 --- a/hbase-shaded-jetty-12-plus/pom.xml +++ b/hbase-shaded-jetty-12-plus-core/pom.xml @@ -35,9 +35,9 @@ <version>${revision}</version> <relativePath>..</relativePath> </parent> - <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> + <artifactId>hbase-shaded-jetty-12-plus-core</artifactId> + <name>Apache HBase Relocated (Shaded) Jetty 12+ Libs: Core</name> + <description>Pulls down Jetty core, relocates it and makes a far jar.</description> <dependencies> <dependency> <groupId>org.eclipse.jetty</groupId> @@ -105,104 +105,6 @@ </exclusion> </exclusions> </dependency> - <dependency> - <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> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.eclipse.jetty.ee8</groupId> - <artifactId>jetty-ee8-security</artifactId> - <version>${jetty12.version}</version> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.eclipse.jetty.ee8</groupId> - <artifactId>jetty-ee8-nested</artifactId> - <version>${jetty12.version}</version> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.eclipse.jetty.ee8</groupId> - <artifactId>jetty-ee8-webapp</artifactId> - <version>${jetty12.version}</version> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </exclusion> - </exclusions> - </dependency> - - <!-- TODO Added here just for testing purpose, Drop before merge? --> - <dependency> - <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> - </exclusion> - </exclusions> - </dependency> - <dependency> - <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> <plugins> @@ -249,17 +151,16 @@ <artifactSet> <excludes> <!-- - Anything added here needs to be excluded from the jar that pulls it in - also else we give an odd signal in the META-INF/DEPENDENCIES that we - produce. See below for how to exclusion of transitive dependencies. - --> - <exclude>javax.servlet:javax.servlet-api</exclude> + Anything added here needs to be excluded from the jar that pulls it in + also else we give an odd signal in the META-INF/DEPENDENCIES that we + produce. See below for how to exclusion of transitive dependencies. + --> <exclude>org.slf4j:slf4j-api</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 - that we've already packaged a services file once. --> - <exclude>org.apache.hbase.thirdparty:hbase-shaded-jetty-12-plus</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 + that we've already packaged a services file once. --> + <exclude>org.apache.hbase.thirdparty:hbase-shaded-jetty-12-plus-core</exclude> </excludes> </artifactSet> <transformers> @@ -273,43 +174,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <!-- - The webdefault-ee8.xml contains some jetty servlet classes which should also be relocated - --> - <execution> - <id>relocate-web-xml</id> - <goals> - <goal>run</goal> - </goals> - <phase>package</phase> - <configuration> - <target> - <echo message="unjar"/> - <unzip dest="${project.build.directory}/unpacked/" src="${project.build.directory}/${project.artifactId}-${project.version}.jar"/> - <echo message="Replace content in webdefault-ee8.xml"/> - <replace file="${project.build.directory}/unpacked/${rename.offset.dir}/org/eclipse/jetty/ee8/webapp/webdefault-ee8.xml"> - <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> - </configuration> - </execution> - </executions> - </plugin> </plugins> </build> </project> diff --git a/hbase-shaded-jetty-12-plus/pom.xml b/hbase-shaded-jetty-12-plus-ee8/pom.xml similarity index 61% copy from hbase-shaded-jetty-12-plus/pom.xml copy to hbase-shaded-jetty-12-plus-ee8/pom.xml index 5999cdb..22288df 100644 --- a/hbase-shaded-jetty-12-plus/pom.xml +++ b/hbase-shaded-jetty-12-plus-ee8/pom.xml @@ -35,75 +35,14 @@ <version>${revision}</version> <relativePath>..</relativePath> </parent> - <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> + <artifactId>hbase-shaded-jetty-12-plus-ee8</artifactId> + <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.eclipse.jetty</groupId> - <artifactId>jetty-server</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-http</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-util</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-io</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-jmx</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-util-ajax</artifactId> - <version>${jetty12.version}</version> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </exclusion> - </exclusions> + <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> @@ -153,56 +92,6 @@ </exclusion> </exclusions> </dependency> - - <!-- TODO Added here just for testing purpose, Drop before merge? --> - <dependency> - <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> - </exclusion> - </exclusions> - </dependency> - <dependency> - <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> <plugins> @@ -235,6 +124,9 @@ <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 @@ -249,17 +141,16 @@ <artifactSet> <excludes> <!-- - Anything added here needs to be excluded from the jar that pulls it in - also else we give an odd signal in the META-INF/DEPENDENCIES that we - produce. See below for how to exclusion of transitive dependencies. - --> - <exclude>javax.servlet:javax.servlet-api</exclude> + Anything added here needs to be excluded from the jar that pulls it in + also else we give an odd signal in the META-INF/DEPENDENCIES that we + produce. See below for how to exclusion of transitive dependencies. + --> <exclude>org.slf4j:slf4j-api</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 that we've already packaged a services file once. --> - <exclude>org.apache.hbase.thirdparty:hbase-shaded-jetty-12-plus</exclude> + <exclude>org.apache.hbase.thirdparty:hbase-shaded-jetty-12-plus-e8</exclude> </excludes> </artifactSet> <transformers> @@ -295,14 +186,6 @@ <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/hbase-shaded-jetty-12-plus/pom.xml b/hbase-shaded-jetty-12-plus-ee9/pom.xml similarity index 61% rename from hbase-shaded-jetty-12-plus/pom.xml rename to hbase-shaded-jetty-12-plus-ee9/pom.xml index 5999cdb..ee19693 100644 --- a/hbase-shaded-jetty-12-plus/pom.xml +++ b/hbase-shaded-jetty-12-plus-ee9/pom.xml @@ -35,126 +35,15 @@ <version>${revision}</version> <relativePath>..</relativePath> </parent> - <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> + <artifactId>hbase-shaded-jetty-12-plus-ee9</artifactId> + <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.eclipse.jetty</groupId> - <artifactId>jetty-server</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-http</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-util</artifactId> - <version>${jetty12.version}</version> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </exclusion> - </exclusions> + <groupId>org.apache.hbase.thirdparty</groupId> + <artifactId>hbase-shaded-jetty-12-plus-core</artifactId> + <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-io</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-jmx</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-util-ajax</artifactId> - <version>${jetty12.version}</version> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <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> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.eclipse.jetty.ee8</groupId> - <artifactId>jetty-ee8-security</artifactId> - <version>${jetty12.version}</version> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.eclipse.jetty.ee8</groupId> - <artifactId>jetty-ee8-nested</artifactId> - <version>${jetty12.version}</version> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.eclipse.jetty.ee8</groupId> - <artifactId>jetty-ee8-webapp</artifactId> - <version>${jetty12.version}</version> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </exclusion> - </exclusions> - </dependency> - - <!-- TODO Added here just for testing purpose, Drop before merge? --> <dependency> <groupId>org.eclipse.jetty.ee9</groupId> <artifactId>jetty-ee9-servlet</artifactId> @@ -249,17 +138,16 @@ <artifactSet> <excludes> <!-- - Anything added here needs to be excluded from the jar that pulls it in - also else we give an odd signal in the META-INF/DEPENDENCIES that we - produce. See below for how to exclusion of transitive dependencies. - --> - <exclude>javax.servlet:javax.servlet-api</exclude> + Anything added here needs to be excluded from the jar that pulls it in + also else we give an odd signal in the META-INF/DEPENDENCIES that we + produce. See below for how to exclusion of transitive dependencies. + --> <exclude>org.slf4j:slf4j-api</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 that we've already packaged a services file once. --> - <exclude>org.apache.hbase.thirdparty:hbase-shaded-jetty-12-plus</exclude> + <exclude>org.apache.hbase.thirdparty:hbase-shaded-jetty-12-plus-ee9</exclude> </excludes> </artifactSet> <transformers> @@ -278,7 +166,7 @@ <artifactId>maven-antrun-plugin</artifactId> <executions> <!-- - The webdefault-ee8.xml contains some jetty servlet classes which should also be relocated + The webdefault-ee9.xml contains some jetty servlet classes which should also be relocated --> <execution> <id>relocate-web-xml</id> @@ -290,13 +178,6 @@ <target> <echo message="unjar"/> <unzip dest="${project.build.directory}/unpacked/" src="${project.build.directory}/${project.artifactId}-${project.version}.jar"/> - <echo message="Replace content in webdefault-ee8.xml"/> - <replace file="${project.build.directory}/unpacked/${rename.offset.dir}/org/eclipse/jetty/ee8/webapp/webdefault-ee8.xml"> - <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> diff --git a/pom.xml b/pom.xml index 418d0e7..45628ad 100644 --- a/pom.xml +++ b/pom.xml @@ -100,7 +100,9 @@ <module>hbase-shaded-gson</module> <module>hbase-shaded-miscellaneous</module> <module>hbase-shaded-jetty</module> - <module>hbase-shaded-jetty-12-plus</module> + <module>hbase-shaded-jetty-12-plus-core</module> + <module>hbase-shaded-jetty-12-plus-ee8</module> + <module>hbase-shaded-jetty-12-plus-ee9</module> <module>hbase-shaded-jersey</module> <module>hbase-shaded-jackson-jaxrs-json-provider</module> <module>hbase-noop-htrace</module> @@ -142,7 +144,6 @@ <jetty.version>9.4.56.v20240826</jetty.version> <jetty12.version>12.0.18</jetty12.version> <servlet-api.version>3.1.0</servlet-api.version> - <servlet4-api.version>4.0.1</servlet4-api.version> <jersey.version>2.46</jersey.version> <jakarta.inject.version>2.6.1</jakarta.inject.version> <jakarta.ws.rs-api.version>2.1.6</jakarta.ws.rs-api.version> @@ -243,7 +244,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> - <version>3.5.0</version> + <version>3.5.2</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId>
