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-queryserver.git
The following commit(s) were added to refs/heads/master by this push:
new 4ae7389 PHOENIX-6294 javax.servlet relocation added by PHOENIX-6151
breaks PQS
4ae7389 is described below
commit 4ae73892df19b4550c15668d6839e2ad7768ae7d
Author: Josh Elser <els...@apache.org>
AuthorDate: Mon Jan 4 11:15:01 2021 +0100
PHOENIX-6294 javax.servlet relocation added by PHOENIX-6151 breaks PQS
---
phoenix-queryserver/pom.xml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/phoenix-queryserver/pom.xml b/phoenix-queryserver/pom.xml
index f5305e4..710518b 100644
--- a/phoenix-queryserver/pom.xml
+++ b/phoenix-queryserver/pom.xml
@@ -133,6 +133,10 @@
<pattern>org.eclipse.jetty</pattern>
<shadedPattern>${shaded.package}.org.eclipse.jetty</shadedPattern>
</relocation>
+ <relocation>
+ <pattern>javax.servlet</pattern>
+
<shadedPattern>${shaded.package}.javax.servlet</shadedPattern>
+ </relocation>
<!-- Calcite/Avatica is not relocated because the wire API (as
of <=1.8.0) expects
consistent class names on client and server. Relocating
these would break
backwards compatibility. -->
