(phoenix) 01/01: Preparing phoenix release 5.2.0RC2; tagging and updates to CHANGES.md and RELEASENOTES.md

2024-02-26 Thread vjasani
This is an automated email from the ASF dual-hosted git repository.

vjasani pushed a commit to tag 5.2.0RC2
in repository https://gitbox.apache.org/repos/asf/phoenix.git

commit 1c4d91ab00e78a69fb0b6e451555ed6b5aaed702
Author: Viraj Jasani 
AuthorDate: Tue Feb 27 06:44:09 2024 +

Preparing phoenix release 5.2.0RC2; tagging and updates to CHANGES.md and 
RELEASENOTES.md
---
 CHANGES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index f4cec3a16b..aedd1aadaf 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -18,7 +18,7 @@
 -->
 # PHOENIX Changelog
 
-## Release 5.2.0 - Unreleased (as of 2024-02-26)
+## Release 5.2.0 - Unreleased (as of 2024-02-27)
 
 
 



(phoenix) tag 5.2.0RC2 created (now 1c4d91ab00)

2024-02-26 Thread vjasani
This is an automated email from the ASF dual-hosted git repository.

vjasani pushed a change to tag 5.2.0RC2
in repository https://gitbox.apache.org/repos/asf/phoenix.git


  at 1c4d91ab00 (commit)
This tag includes the following new commits:

 new 1c4d91ab00 Preparing phoenix release 5.2.0RC2; tagging and updates to 
CHANGES.md and RELEASENOTES.md

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.




(phoenix) branch 5.2 updated (34ccb03003 -> 1c4d91ab00)

2024-02-26 Thread vjasani
This is an automated email from the ASF dual-hosted git repository.

vjasani pushed a change to branch 5.2
in repository https://gitbox.apache.org/repos/asf/phoenix.git


from 34ccb03003 Preparing phoenix release 5.2.0RC1; tagging and updates to 
CHANGES.md and RELEASENOTES.md
 add 1c4d91ab00 Preparing phoenix release 5.2.0RC2; tagging and updates to 
CHANGES.md and RELEASENOTES.md

No new revisions were added by this update.

Summary of changes:
 CHANGES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)



svn commit: r67588 [1/2] - /dev/phoenix/phoenix-5.2.0RC1/

2024-02-26 Thread vjasani
Author: vjasani
Date: Tue Feb 27 00:58:05 2024
New Revision: 67588

Log:
Apache phoenix 5.2.0RC1

Added:
dev/phoenix/phoenix-5.2.0RC1/
dev/phoenix/phoenix-5.2.0RC1/CHANGES.md
dev/phoenix/phoenix-5.2.0RC1/RELEASENOTES.md
dev/phoenix/phoenix-5.2.0RC1/phoenix-5.2.0-src.tar.gz   (with props)
dev/phoenix/phoenix-5.2.0RC1/phoenix-5.2.0-src.tar.gz.asc
dev/phoenix/phoenix-5.2.0RC1/phoenix-5.2.0-src.tar.gz.sha512
dev/phoenix/phoenix-5.2.0RC1/phoenix-hbase-2.4-5.2.0-bin.tar.gz   (with 
props)
dev/phoenix/phoenix-5.2.0RC1/phoenix-hbase-2.4-5.2.0-bin.tar.gz.asc
dev/phoenix/phoenix-5.2.0RC1/phoenix-hbase-2.4-5.2.0-bin.tar.gz.sha512
dev/phoenix/phoenix-5.2.0RC1/phoenix-hbase-2.5-5.2.0-bin.tar.gz   (with 
props)
dev/phoenix/phoenix-5.2.0RC1/phoenix-hbase-2.5-5.2.0-bin.tar.gz.asc
dev/phoenix/phoenix-5.2.0RC1/phoenix-hbase-2.5-5.2.0-bin.tar.gz.sha512
dev/phoenix/phoenix-5.2.0RC1/phoenix-hbase-2.5.0-5.2.0-bin.tar.gz   (with 
props)
dev/phoenix/phoenix-5.2.0RC1/phoenix-hbase-2.5.0-5.2.0-bin.tar.gz.asc
dev/phoenix/phoenix-5.2.0RC1/phoenix-hbase-2.5.0-5.2.0-bin.tar.gz.sha512

Added: dev/phoenix/phoenix-5.2.0RC1/CHANGES.md
==
--- dev/phoenix/phoenix-5.2.0RC1/CHANGES.md (added)
+++ dev/phoenix/phoenix-5.2.0RC1/CHANGES.md Tue Feb 27 00:58:05 2024
@@ -0,0 +1,429 @@
+
+
+# PHOENIX Changelog
+
+## Release 5.2.0 - Unreleased (as of 2024-02-26)
+
+
+
+### NEW FEATURES:
+
+| JIRA | Summary | Priority | Component |
+|: |: | :--- |: |
+| [PHOENIX-7038](https://issues.apache.org/jira/browse/PHOENIX-7038) | 
Implement Connection Query Service Metrics |  Major | . |
+| [PHOENIX-6973](https://issues.apache.org/jira/browse/PHOENIX-6973) | Add 
option to CREATE TABLE to skip verification of HBase table |  Major | core |
+| [PHOENIX-6491](https://issues.apache.org/jira/browse/PHOENIX-6491) | Phoenix 
High Availability |  Major | core |
+| [PHOENIX-6692](https://issues.apache.org/jira/browse/PHOENIX-6692) | Add 
HBase 2.5 support |  Major | core |
+| [PHOENIX-6681](https://issues.apache.org/jira/browse/PHOENIX-6681) | Enable 
new indexes to be optionally created in CREATE\_DISABLED state |  Major | . |
+| [PHOENIX-6413](https://issues.apache.org/jira/browse/PHOENIX-6413) | Having 
cannot resolve alias |  Major | . |
+| [PHOENIX-6405](https://issues.apache.org/jira/browse/PHOENIX-6405) | 
Disallow bulk loading into non-empty tables with global secondary indexes |  
Major | core |
+| [PHOENIX-6457](https://issues.apache.org/jira/browse/PHOENIX-6457) | 
Optionally store schema version string in SYSTEM.CATALOG |  Major | . |
+
+
+### IMPROVEMENTS:
+
+| JIRA | Summary | Priority | Component |
+|: |: | :--- |: |
+| [PHOENIX-7229](https://issues.apache.org/jira/browse/PHOENIX-7229) | 
Leverage bloom filters for single key point lookups |  Major | . |
+| [PHOENIX-7230](https://issues.apache.org/jira/browse/PHOENIX-7230) | 
Optimize rpc call to master if all indexes are migrated to new coprocs |  Major 
| . |
+| [PHOENIX-7216](https://issues.apache.org/jira/browse/PHOENIX-7216) | Bump 
Hadoop version to 3.2.4 for 2.5.x profile |  Major | core |
+| [PHOENIX-7144](https://issues.apache.org/jira/browse/PHOENIX-7144) | 
TableLevel Phoenix Metrics returns base tableName when queried for Index Table. 
|  Major | . |
+| [PHOENIX-7220](https://issues.apache.org/jira/browse/PHOENIX-7220) | Make 
HBase 2.5 profile the default |  Major | core |
+| [PHOENIX-7218](https://issues.apache.org/jira/browse/PHOENIX-7218) | Drop 
HBase 2.4.0 support in 5.2 |  Major | core |
+| [PHOENIX-7157](https://issues.apache.org/jira/browse/PHOENIX-7157) | Upgrade 
to phoenix-thirdparty 2.1.0 |  Major | core |
+| [PHOENIX-7213](https://issues.apache.org/jira/browse/PHOENIX-7213) | Add 
option for unlimited phoenix.query.QueueSize |  Major | . |
+| [PHOENIX-7188](https://issues.apache.org/jira/browse/PHOENIX-7188) | Remove 
Omid TTable.getTableDescriptor() calls |  Critical | core |
+| [PHOENIX-7106](https://issues.apache.org/jira/browse/PHOENIX-7106) | Data 
Integrity issues due to invalid rowkeys returned by various coprocessors |  
Blocker | . |
+| [PHOENIX-7187](https://issues.apache.org/jira/browse/PHOENIX-7187) | 
Improvement of Integration test case with Explain Plan for Partial Index |  
Major | . |
+| [PHOENIX-7181](https://issues.apache.org/jira/browse/PHOENIX-7181) | Do not 
declare commons-configuration2 dependency |  Major | core |
+| [PHOENIX-7043](https://issues.apache.org/jira/browse/PHOENIX-7043) | Split 
FailoverPhoenixConnectionIT |  Minor | core |
+| [PHOENIX-7156](https://issues.apache.org/jira/browse/PHOENIX-7156) | Run 
integration tests based on @Category |  Major | . |
+| [PHOENIX-7140](https://issues.apache.org/jira/browse/PHOENIX-7140) | Update 
Apache Parent and Maven Plugin Versions in Core |  Major | core |
+| [PHOENIX-6053](https://issues.apache.org/jira/browse/PHOENIX-6053) | Split 
Server Side 

svn commit: r67588 [2/2] - /dev/phoenix/phoenix-5.2.0RC1/

2024-02-26 Thread vjasani
Added: dev/phoenix/phoenix-5.2.0RC1/phoenix-hbase-2.5.0-5.2.0-bin.tar.gz.asc
==
--- dev/phoenix/phoenix-5.2.0RC1/phoenix-hbase-2.5.0-5.2.0-bin.tar.gz.asc 
(added)
+++ dev/phoenix/phoenix-5.2.0RC1/phoenix-hbase-2.5.0-5.2.0-bin.tar.gz.asc Tue 
Feb 27 00:58:05 2024
@@ -0,0 +1,16 @@
+-BEGIN PGP SIGNATURE-
+
+iQIzBAABCgAdFiEE2sbSiwGs6kkuqt+WLfreIhAS0TQFAmXdLMMACgkQLfreIhAS
+0TQnnRAAtAn7kul0RjFVNyQgVBs7OHZJd7IpgR8YzSA94G6AQCTxfSbdHxaKmEif
+GAA8Isd9CEEFuMMQApgUyAKf0+1IlN1+97LnN4bfl4S2xKWIf56bpS/qPA80Q/Om
+kfJvI0Np3iQ/JPfbHvCqBLOk0b2N8Xyq16tbZUU4FGD8EFPA8Sv7UKWJlcDZ1SjO
+AkkRVENv52Kqc2Smi6OKFKFU0RalPmuTyZ6LSuMF6IAO7vH3RPmRZxPMRkhmQPj6
+iQvFL8sHl+ZabG8mDilgDjMZbq1Go3Yu7pQL/YfoJAHLat447Oi8qsFaW6Kzhzo1
+1sGRJ6+3Mfba4qTHBbqEVXLo8ser2XXlNvT3ZeSBlA5D3DOIe/yCWrZ9s6GsT/KM
+RMOZih95iDBdCk7yRRtzhUuf8IBDMFt/AHMIWkZiTA3jXIyHBH0KVfzOdnBE9K75
+gEkfAcAB6ktQwMj6fh2C6r7RX1QLz/SeH7JoCAZNYj9G3Op9fPfa9lD+TYdC2jKv
+1qVqqtsfQIxh8h9SDVG+w/RZDB8hc02eqpxCR1uwrmJrAGqDhxoKqTX6xOmXMf6Y
+AAEU/DSCyrSlCLwVLW8cMDN5DZj7OsRNaUKm+n10m/21C2vZZeFV4u40WB2oLPgS
+QCTL3w5aCn7OQxf9dGnF8IOOYGZ/dLhAi77DPeJVtx86GnrtW74=
+=Q0X/
+-END PGP SIGNATURE-

Added: dev/phoenix/phoenix-5.2.0RC1/phoenix-hbase-2.5.0-5.2.0-bin.tar.gz.sha512
==
--- dev/phoenix/phoenix-5.2.0RC1/phoenix-hbase-2.5.0-5.2.0-bin.tar.gz.sha512 
(added)
+++ dev/phoenix/phoenix-5.2.0RC1/phoenix-hbase-2.5.0-5.2.0-bin.tar.gz.sha512 
Tue Feb 27 00:58:05 2024
@@ -0,0 +1,4 @@
+phoenix-hbase-2.5.0-5.2.0-bin.tar.gz: A4435E87 15B93CB4 F105B704 191DDFE6
+  BC627312 8988A867 24EB365C 15CAF2E3
+  26F76B70 A0FDC042 2118D085 864B6697
+  C774A13C 4498405C 758BD10E C20A892E




(phoenix) branch PHOENIX-7210-feature created (now 9934c3db15)

2024-02-26 Thread lokiore
This is an automated email from the ASF dual-hosted git repository.

lokiore pushed a change to branch PHOENIX-7210-feature
in repository https://gitbox.apache.org/repos/asf/phoenix.git


  at 9934c3db15 PHOENIX-7236 Fix release scripts for 5.2

No new revisions were added by this update.



(phoenix) 01/01: Preparing phoenix release 5.2.0RC1; tagging and updates to CHANGES.md and RELEASENOTES.md

2024-02-26 Thread vjasani
This is an automated email from the ASF dual-hosted git repository.

vjasani pushed a commit to tag 5.2.0RC1
in repository https://gitbox.apache.org/repos/asf/phoenix.git

commit 34ccb030033cc8dea4e1a46eb3ebb1dbea332dbf
Author: Viraj Jasani 
AuthorDate: Mon Feb 26 23:23:01 2024 +

Preparing phoenix release 5.2.0RC1; tagging and updates to CHANGES.md and 
RELEASENOTES.md
---
 CHANGES.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 2632ea0081..f4cec3a16b 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -18,7 +18,7 @@
 -->
 # PHOENIX Changelog
 
-## Release 5.2.0 - Unreleased (as of 2024-02-25)
+## Release 5.2.0 - Unreleased (as of 2024-02-26)
 
 
 
@@ -426,3 +426,4 @@
 | [PHOENIX-6371](https://issues.apache.org/jira/browse/PHOENIX-6371) | Script 
to verify release candidate |  Major | . |
 
 
+



(phoenix) branch 5.2 updated (c77c7fbafb -> 34ccb03003)

2024-02-26 Thread vjasani
This is an automated email from the ASF dual-hosted git repository.

vjasani pushed a change to branch 5.2
in repository https://gitbox.apache.org/repos/asf/phoenix.git


from c77c7fbafb Preparing phoenix release 5.2.0RC0; tagging and updates to 
CHANGES.md and RELEASENOTES.md
 add 34ccb03003 Preparing phoenix release 5.2.0RC1; tagging and updates to 
CHANGES.md and RELEASENOTES.md

No new revisions were added by this update.

Summary of changes:
 CHANGES.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)



(phoenix) tag 5.2.0RC1 created (now 34ccb03003)

2024-02-26 Thread vjasani
This is an automated email from the ASF dual-hosted git repository.

vjasani pushed a change to tag 5.2.0RC1
in repository https://gitbox.apache.org/repos/asf/phoenix.git


  at 34ccb03003 (commit)
This tag includes the following new commits:

 new 34ccb03003 Preparing phoenix release 5.2.0RC1; tagging and updates to 
CHANGES.md and RELEASENOTES.md

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.




Apache-Phoenix | master | HBase 2.5 | Build #654 FAILURE

2024-02-26 Thread Apache Jenkins Server

master branch  HBase 2.5  build #654 status FAILURE
Build #654 https://ci-hadoop.apache.org/job/Phoenix/job/Phoenix-mulitbranch/job/master/654/


Apache-Phoenix | master | HBase 2.4 | Build #654 FAILURE

2024-02-26 Thread Apache Jenkins Server

master branch  HBase 2.4  build #654 status FAILURE
Build #654 https://ci-hadoop.apache.org/job/Phoenix/job/Phoenix-mulitbranch/job/master/654/


(phoenix) branch master updated: PHOENIX-7236 Fix release scripts for 5.2

2024-02-26 Thread stoty
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 9934c3db15 PHOENIX-7236 Fix release scripts for 5.2
9934c3db15 is described below

commit 9934c3db15339f9f611ec7f1f560ef4bc0f503cc
Author: Istvan Toth 
AuthorDate: Mon Feb 26 10:31:46 2024 +0100

PHOENIX-7236 Fix release scripts for 5.2

* Update base docker image to Ubuntu 22.04
* Add -L switch to curl when downloading pom.xml
* set -x for bash when running in debug mode
---
 dev/create-release/do-release-docker.sh  |  4 +++
 dev/create-release/do-release.sh |  5 
 dev/create-release/phoenix-rm/Dockerfile | 48 +---
 dev/create-release/release-util.sh   |  2 +-
 4 files changed, 41 insertions(+), 18 deletions(-)

diff --git a/dev/create-release/do-release-docker.sh 
b/dev/create-release/do-release-docker.sh
index 8d201e8dfc..3025d7147a 100755
--- a/dev/create-release/do-release-docker.sh
+++ b/dev/create-release/do-release-docker.sh
@@ -107,6 +107,9 @@ if (( $# > 0 )); then
   error "Arguments can only be provided with option flags, invalid args: $*"
 fi
 export DEBUG
+if [ "$DEBUG" = "1" ]; then
+  set -x
+fi
 
 if [ -z "$WORKDIR" ] || [ ! -d "$WORKDIR" ]; then
   error "Work directory (-d) must be defined and exist. Run with -h for help."
@@ -223,6 +226,7 @@ ASF_PASSWORD=$ASF_PASSWORD
 RELEASE_STEP=$RELEASE_STEP
 API_DIFF_TAG=$API_DIFF_TAG
 HOST_OS=$HOST_OS
+DEBUG=$DEBUG
 EOF
 
 JAVA_MOUNT=()
diff --git a/dev/create-release/do-release.sh b/dev/create-release/do-release.sh
index fd613e2f6f..e6aa1ddfb1 100755
--- a/dev/create-release/do-release.sh
+++ b/dev/create-release/do-release.sh
@@ -18,6 +18,11 @@
 #
 
 set -e
+
+if [ "$DEBUG" = "1" ]; then
+  set -x
+fi
+
 # Use the adjacent do-release-docker.sh instead, if you can.
 # Otherwise, this runs core of the release creation.
 # Will ask you questions on what to build and for logins
diff --git a/dev/create-release/phoenix-rm/Dockerfile 
b/dev/create-release/phoenix-rm/Dockerfile
index 9aa97aae18..01de8c2634 100644
--- a/dev/create-release/phoenix-rm/Dockerfile
+++ b/dev/create-release/phoenix-rm/Dockerfile
@@ -21,7 +21,7 @@
 #
 # Includes:
 # * Java 8
-FROM ubuntu:18.04
+FROM ubuntu:22.04
 
 # Install extra needed repos and refresh.
 #
@@ -29,25 +29,39 @@ FROM ubuntu:18.04
 # the most current package versions (instead of potentially using old versions 
cached by docker).
 RUN DEBIAN_FRONTEND=noninteractive apt-get -qq -y update \
   && DEBIAN_FRONTEND=noninteractive apt-get -qq -y install 
--no-install-recommends \
-curl='7.58.0-*' \
-git='1:2.17.1-*' \
-gnupg='2.2.4-*' \
-libcurl4-openssl-dev='7.58.0-*' \
-libxml2-dev='2.9.4+dfsg1-*' \
-lsof='4.89+dfsg-*' \
-maven='3.6.0-*' \
-openjdk-8-jdk='8*' \
-python-pip='9.0.1-*' \
-python3-pip='9.0.1-*' \
-subversion='1.9.7-*' \
-wget='1.19.4-*' \
+curl='7.81.0-*' \
+git='1:2.34.1-*' \
+gnupg='2.2.27-*' \
+libcurl4-openssl-dev='7.81.0-*' \
+libxml2-dev='2.9.13+dfsg-*' \
+libxml2-utils='2.9.13+dfsg-*' \
+lsof='4.93.2+dfsg-*' \
+openjdk-8-jdk='8u*' \
+python3='3.10.6-1~22.04' \
+python2='2.7.18-3' \
+python3-pip='22.0.2+dfsg-*' \
+subversion='1.14.1-*' \
+wget='1.21.2-*' \
+patch='2.7.6-*' \
   && apt-get clean \
   && rm -rf /var/lib/apt/lists/* \
   && update-alternatives --set java 
/usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java \
-  && pip install \
-python-dateutil==2.8.1 \
-  && pip3 install \
-python-dateutil==2.8.1
+  && update-alternatives --install /usr/bin/python python /usr/bin/python2 1 \
+  && pip3 install --no-cache-dir python-dateutil==2.8.2 \
+  && pip install --no-cache-dir python-dateutil==2.8.2
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+
+# Install maven
+ENV MAVEN_VERSION=3.8.6
+ARG 
MAVEN_URL="https://archive.apache.org/dist/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz;
+ARG 
MAVEN_SHA512="f790857f3b1f90ae8d16281f902c689e4f136ebe584aba45e4b1fa66c80cba826d3e0e52fdd04ed44b4c66f6d3fe3584a057c26dfcac544a60b301e6d0f91c26"
+RUN mkdir -p /opt/maven \
+  && curl -fsSL -o /tmp/apache-maven.tar.gz "${MAVEN_URL}" \
+  && echo "${MAVEN_SHA512}  /tmp/apache-maven.tar.gz" | sha512sum -c - \
+  && tar -xzf /tmp/apache-maven.tar.gz -C /opt/maven --strip-components=1 \
+  && rm -f /tmp/apache-maven.tar.gz \
+  && ln -s /opt/maven/bin/mvn /usr/bin/mvn
+
 # Install Apache Yetus
 ENV YETUS_VERSION 0.13.0
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
diff --git a/dev/create-release/release-util.sh 
b/dev/create-release/release-util.sh
index 4b199132fb..3fa276932d 100755
--- a/dev/create-release/release-util.sh
+++ b/dev/create-release/release-util.sh
@@ -147,7 +147,7 @@ function get_release_info {
   # Find the current version for the branch.
   # FIXME this 

(phoenix-queryserver) branch master updated: PHOENIX-7222 Fix tox tests and add Python 3.12 to supported versions and the test matrix

2024-02-26 Thread stoty
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 e0fd69e  PHOENIX-7222 Fix tox tests and add Python 3.12 to supported 
versions and the test matrix
e0fd69e is described below

commit e0fd69e85e80ec2c5a01fc56e943abc94868ffe0
Author: Istvan Toth 
AuthorDate: Wed Feb 21 08:14:48 2024 +0100

PHOENIX-7222 Fix tox tests and add Python 3.12 to supported versions and 
the test matrix
---
 python-phoenixdb/.gitignore  |  1 +
 python-phoenixdb/Dockerfile  |  4 ++--
 python-phoenixdb/README.rst  | 11 +++
 python-phoenixdb/phoenixdb/sqlalchemy_phoenix.py |  2 +-
 python-phoenixdb/setup.py|  3 ++-
 python-phoenixdb/tox.ini |  5 -
 6 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/python-phoenixdb/.gitignore b/python-phoenixdb/.gitignore
index d7a54af..369f6a2 100644
--- a/python-phoenixdb/.gitignore
+++ b/python-phoenixdb/.gitignore
@@ -11,3 +11,4 @@ dev-support/work
 phoenixdb/.eggs
 phoenixdb/build
 phoenixdb/e
+phoenixdb/.python-version
diff --git a/python-phoenixdb/Dockerfile b/python-phoenixdb/Dockerfile
index 95f6b2d..daf8a4e 100644
--- a/python-phoenixdb/Dockerfile
+++ b/python-phoenixdb/Dockerfile
@@ -13,13 +13,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from advian/tox-base:ubuntu as tox
+from advian/tox-base:ubuntu-jammy-2024-02-07 as tox
 
 ###
 # Prebuild given versions #
 ###
 ARG BUILD_PYTHON_VERSIONS="3.11 3.10 3.9 3.8" #Can we take this from the 
parent image ?
-ARG EXTRA_PYTHON_VERSIONS="3.5 3.6 3.7 2.7"
+ARG EXTRA_PYTHON_VERSIONS="3.12 3.5 3.6 3.7 2.7"
 RUN export RESOLVED_VERSIONS=`pyenv_resolve $BUILD_PYTHON_VERSIONS` \
 && export EXTRA_RESOLVED_VERSIONS=`pyenv_resolve $EXTRA_PYTHON_VERSIONS` \
 && for pyver in $EXTRA_RESOLVED_VERSIONS; do pyenv install $pyver; done \
diff --git a/python-phoenixdb/README.rst b/python-phoenixdb/README.rst
index 3858ea0..0c609a8 100644
--- a/python-phoenixdb/README.rst
+++ b/python-phoenixdb/README.rst
@@ -68,19 +68,22 @@ necessary requirements::
 You can start a Phoenix QueryServer instance on http://localhost:8765 for 
testing by running
 the following command in the pohoenix-queryserver-parent directory::
 
-mvn clean verify -am -pl phoenix-queryserver-it -Dtest=foo \
+mvn clean verify -Pshade-javax-servlet -am -pl phoenix-queryserver-it 
-Dtest=foo \
 -Dit.test=QueryServerBasicsIT#startLocalPQS \
 -Ddo.not.randomize.pqs.port=true -Dstart.unsecure.pqs=true
 
 You can start a secure (https+kerberos) Phoenix QueryServer instance on 
https://localhost:8765
 for testing by running the following command in the phoenix-queryserver-parent 
directory::
 
-mvn clean verify -am -pl phoenix-queryserver-it -Dtest=foo \
+mvn clean verify -Pshade-javax-servlet -am -pl phoenix-queryserver-it 
-Dtest=foo \
 -Dit.test=SecureQueryServerPhoenixDBIT#startLocalPQS \
 -Ddo.not.randomize.pqs.port=true -Dstart.secure.pqs=true
 
-this will also create a shell script in 
phoenix-queryserver-it/target/krb_setup.sh, that you can use to set
-up the environment for the tests.
+this will also create a shell script in 
phoenix-queryserver-it/target/krb_setup.sh, that you can
+use to set up the environment for the tests.
+
+Note: Depending on the Phoenix version used for building, you may or may not 
need the
+`-Pshade-javax-servlet` option. Check BUILDING.md in the repository root.
 
 If you want to use the library without installing the phoenixdb library, you 
can use
 the `PYTHONPATH` environment variable to point to the library directly::
diff --git a/python-phoenixdb/phoenixdb/sqlalchemy_phoenix.py 
b/python-phoenixdb/phoenixdb/sqlalchemy_phoenix.py
index d21b827..3df83ef 100644
--- a/python-phoenixdb/phoenixdb/sqlalchemy_phoenix.py
+++ b/python-phoenixdb/phoenixdb/sqlalchemy_phoenix.py
@@ -22,7 +22,7 @@ from sqlalchemy import types
 from sqlalchemy.engine.default import DefaultDialect, DefaultExecutionContext
 from sqlalchemy.exc import CompileError
 from sqlalchemy.sql.compiler import DDLCompiler
-from sqlalchemy.types import BIGINT, BOOLEAN, CHAR, DATE, DECIMAL, FLOAT, 
INTEGER, NUMERIC,\
+from sqlalchemy.types import BIGINT, BOOLEAN, CHAR, DATE, DECIMAL, FLOAT, 
INTEGER, NUMERIC, \
 SMALLINT, TIME, TIMESTAMP, VARBINARY, VARCHAR
 
 if sys.version_info.major == 3:
diff --git a/python-phoenixdb/setup.py b/python-phoenixdb/setup.py
index 3245433..c3acca5 100644
--- a/python-phoenixdb/setup.py
+++ b/python-phoenixdb/setup.py
@@ -88,7 +88,8 @@ setup(
 'Programming Language :: Python :: 3.8',
 'Programming Language :: Python :: 3.9',
 'Programming Language :: Python