This is an automated email from the ASF dual-hosted git repository. stoty pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/master by this push: new 76bbf91fb1 PHOENIX-6703 Exclude Jetty and servlet-api from phoenix-client 76bbf91fb1 is described below commit 76bbf91fb1e606bbd6ee3c2abb03c6d123b1f46c Author: Istvan Toth <st...@apache.org> AuthorDate: Tue May 3 15:44:56 2022 +0200 PHOENIX-6703 Exclude Jetty and servlet-api from phoenix-client --- .../phoenix-client-embedded/pom.xml | 37 ++++++++++++++++++++++ phoenix-client-parent/pom.xml | 7 ++-- pom.xml | 2 ++ 3 files changed, 43 insertions(+), 3 deletions(-) diff --git a/phoenix-client-parent/phoenix-client-embedded/pom.xml b/phoenix-client-parent/phoenix-client-embedded/pom.xml index 74aacf16e7..50cecce512 100644 --- a/phoenix-client-parent/phoenix-client-embedded/pom.xml +++ b/phoenix-client-parent/phoenix-client-embedded/pom.xml @@ -94,5 +94,42 @@ <artifactId>phoenix-hbase-compat-${hbase.compat.version}</artifactId> <optional>false</optional> </dependency> + <!-- Exclude servlet and Jetty. We don't need it, and it causes problems with minicluster --> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> + <scope>provided</scope> + <version>${jetty.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util</artifactId> + <scope>provided</scope> + <version>${jetty.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util-ajax</artifactId> + <scope>provided</scope> + <version>${jetty.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlet</artifactId> + <scope>provided</scope> + <version>${jetty.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-webapp</artifactId> + <scope>provided</scope> + <version>${jetty.version}</version> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + <scope>provided</scope> + <version>${javax.servlet-api.version}</version> + </dependency> </dependencies> </project> diff --git a/phoenix-client-parent/pom.xml b/phoenix-client-parent/pom.xml index 9a27aea2e8..af49cb3e47 100644 --- a/phoenix-client-parent/pom.xml +++ b/phoenix-client-parent/pom.xml @@ -157,7 +157,8 @@ <exclude>org/omg/**</exclude> <exclude>org/w3c/dom/**</exclude> <exclude>org/xml/sax/**</exclude> - + <!-- Not needed for client, we set this to provided --> + <exclude>org/eclipse/jetty/**</exclude> <!-- Extras compared to Hadoop --> <!-- Hbase classes - Maybe these could be shaded as well ? --> <exclude>org/apache/hbase/**</exclude> @@ -204,8 +205,8 @@ <shadedPattern>${shaded.package}.javax.cache.</shadedPattern> </relocation> <relocation> - <pattern>javax/servlet/</pattern> - <shadedPattern>${shaded.package}.javax.servlet.</shadedPattern> + <pattern>javax/servlet/jsp/</pattern> + <shadedPattern>${shaded.package}.javax.servlet.jsp.</shadedPattern> </relocation> <relocation> <pattern>javax/ws/</pattern> diff --git a/pom.xml b/pom.xml index f669008b24..034f71de20 100644 --- a/pom.xml +++ b/pom.xml @@ -125,6 +125,8 @@ <curator.version>4.0.0</curator.version> <jcodings.version>1.0.55</jcodings.version> <thrift.version>0.9.3-1</thrift.version> + <jetty.version>9.4.46.v20220331</jetty.version> + <javax.servlet-api.version>3.1.0</javax.servlet-api.version> <!-- Test Dependencies --> <mockito.version>1.10.19</mockito.version> <junit.version>4.13.1</junit.version>