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 fb165e470270e09b2b3ac1dee8bbf645053325eb Author: Nihal Jain <[email protected]> AuthorDate: Tue Apr 1 12:08:02 2025 +0530 Remove EE9 demo module --- hbase-shaded-jetty-12-plus-ee9/pom.xml | 253 --------------------------------- pom.xml | 1 - 2 files changed, 254 deletions(-) diff --git a/hbase-shaded-jetty-12-plus-ee9/pom.xml b/hbase-shaded-jetty-12-plus-ee9/pom.xml deleted file mode 100644 index 75831bb..0000000 --- a/hbase-shaded-jetty-12-plus-ee9/pom.xml +++ /dev/null @@ -1,253 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - <!-- -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - - ON MVN COMPILE NOT WORKING - - If you wondering why 'mvn compile' does not work building HBase - (in particular, if you are doing it for the first time), instead do - 'mvn package'. If you are interested in the full story, see - https://issues.apache.org/jira/browse/HBASE-6795. - ---> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.hbase.thirdparty</groupId> - <artifactId>hbase-thirdparty</artifactId> - <version>${revision}</version> - <relativePath>..</relativePath> - </parent> - <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.ee9</groupId> - <artifactId>jetty-ee9-servlet</artifactId> - <version>${jetty-12-plus.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>${jetty-12-plus.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>${jetty-12-plus.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>${jetty-12-plus.version}</version> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </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>${jetty-12-plus.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-http</artifactId> - <version>${jetty-12-plus.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-util</artifactId> - <version>${jetty-12-plus.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-io</artifactId> - <version>${jetty-12-plus.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-jmx</artifactId> - <version>${jetty-12-plus.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-util-ajax</artifactId> - <version>${jetty-12-plus.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-security</artifactId> - <version>${jetty-12-plus.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-session</artifactId> - <version>${jetty-12-plus.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-ee</artifactId> - <version>${jetty-12-plus.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-xml</artifactId> - <version>${jetty-12-plus.version}</version> - <scope>provided</scope> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-clean-plugin</artifactId> - <configuration> - <filesets> - <fileset> - <directory>${basedir}</directory> - <includes> - <include>dependency-reduced-pom.xml</include> - </includes> - </fileset> - </filesets> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-shade-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>shade</goal> - </goals> - <phase>package</phase> - <configuration> - <shadeSourcesContent>true</shadeSourcesContent> - <createSourcesJar>true</createSourcesJar> - <relocations> - <relocation> - <pattern>org.eclipse.jetty</pattern> - <shadedPattern>${rename.offset}.org.eclipse.jetty</shadedPattern> - </relocation> - <!-- - This is for relocating the blacklist in - org.eclipse.jetty.webapp.WebAppContext.__dftServerClasses, - where we have a '-' in front of the class name - --> - <relocation> - <pattern>-org.eclipse.jetty</pattern> - <shadedPattern>-${rename.offset}.org.eclipse.jetty</shadedPattern> - </relocation> - </relocations> - <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>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-ee9</exclude> - </excludes> - </artifactSet> - <transformers> - <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"/> - <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer"> - <addHeader>false</addHeader> - </transformer> - <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/> - </transformers> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <!-- - The webdefault-ee9.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-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/pom.xml b/pom.xml index 815e294..1b38eb6 100644 --- a/pom.xml +++ b/pom.xml @@ -102,7 +102,6 @@ <module>hbase-shaded-jetty</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>
