Skip to content

Commit d60e643

Browse files
stotystoty
authored
PHOENIX-7361 Build PQS with Phoenix 5.2.0 (apache#156)
1 parent 1f5ffdd commit d60e643

File tree

3 files changed

+240
-15
lines changed

3 files changed

+240
-15
lines changed

‎.github/workflows/maven.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ jobs:
2828
with:
2929
java-version: 1.8
3030
- name: Build with Maven
31-
run: mvn -B clean install -Pshade-javax-servlet
31+
run: mvn -B clean verify

‎pom.xml

+235-10
Original file line numberDiff line numberDiff line change
@@ -69,19 +69,21 @@
6969
<top.dir>${project.basedir}</top.dir>
7070
<test.tmp.dir>${project.build.directory}</test.tmp.dir>
7171

72-
<phoenix.version>5.1.3</phoenix.version>
72+
<phoenix.version>5.2.0</phoenix.version>
7373

7474
<!-- Hadoop/Hbase Versions -->
75-
<hbase.version>2.4.15</hbase.version>
76-
<hadoop.version>3.1.4</hadoop.version>
77-
<phoenix.client.artifactid>phoenix-client-embedded-hbase-2.4</phoenix.client.artifactid>
75+
<hbase.version>2.5.8-hadoop3</hbase.version>
76+
<hadoop.version>3.2.4</hadoop.version>
77+
<phoenix.client.artifactid>phoenix-client-embedded-hbase-2.5</phoenix.client.artifactid>
7878

7979
<!-- Dependency versions -->
80-
<zookeeper.version>3.5.8</zookeeper.version>
81-
<curator.version>2.12.0</curator.version>
80+
<zookeeper.version>3.8.4</zookeeper.version>
81+
<!-- Curator 4.2.0 supports ZK 3.8 runtime, but TestServer fails to start-->
82+
<curator.version>5.6.0</curator.version>
8283

8384
<gson.version>2.10.1</gson.version>
8485
<jetty.version>9.4.53.v20231009</jetty.version>
86+
<netty-bom.version>4.1.108.Final</netty-bom.version>
8587
<commons-io.version>2.11.0</commons-io.version>
8688
<commons-collections.version>3.2.2</commons-collections.version>
8789
<sqlline.version>1.9.0</sqlline.version>
@@ -92,6 +94,7 @@
9294
<log4j2.version>2.20.0</log4j2.version>
9395

9496
<!-- Test Dependency versions -->
97+
<testng.version>6.10</testng.version>
9598
<mockito-all.version>1.8.5</mockito-all.version>
9699
<junit.version>4.13.2</junit.version>
97100

@@ -556,6 +559,14 @@
556559
<groupId>log4j</groupId>
557560
<artifactId>log4j</artifactId>
558561
</exclusion>
562+
<exclusion>
563+
<groupId>ch.qos.reload4j</groupId>
564+
<artifactId>reload4j</artifactId>
565+
</exclusion>
566+
<exclusion>
567+
<groupId>org.slf4j</groupId>
568+
<artifactId>slf4j-reload4j</artifactId>
569+
</exclusion>
559570
</exclusions>
560571
</dependency>
561572
<dependency>
@@ -571,6 +582,14 @@
571582
<groupId>log4j</groupId>
572583
<artifactId>log4j</artifactId>
573584
</exclusion>
585+
<exclusion>
586+
<groupId>ch.qos.reload4j</groupId>
587+
<artifactId>reload4j</artifactId>
588+
</exclusion>
589+
<exclusion>
590+
<groupId>org.slf4j</groupId>
591+
<artifactId>slf4j-reload4j</artifactId>
592+
</exclusion>
574593
</exclusions>
575594
</dependency>
576595

@@ -599,6 +618,16 @@
599618
<groupId>org.eclipse.jetty</groupId>
600619
<artifactId>jetty-http</artifactId>
601620
<version>${jetty.version}</version>
621+
</dependency>
622+
<!-- We don't depend on netty directly, but we need this to avoid pulling in different
623+
4.1.x versions of netty modules from the transitive dependencies
624+
(ZK via Omid and ZK via Curator) -->
625+
<dependency>
626+
<groupId>io.netty</groupId>
627+
<artifactId>netty-bom</artifactId>
628+
<version>${netty-bom.version}</version>
629+
<scope>import</scope>
630+
<type>pom</type>
602631
</dependency>
603632
<dependency>
604633
<groupId>org.apache.zookeeper</groupId>
@@ -609,10 +638,34 @@
609638
<groupId>org.slf4j</groupId>
610639
<artifactId>slf4j-log4j12</artifactId>
611640
</exclusion>
612-
<exclusion>
613-
<groupId>log4j</groupId>
614-
<artifactId>log4j</artifactId>
615-
</exclusion>
641+
<exclusion>
642+
<groupId>log4j</groupId>
643+
<artifactId>log4j</artifactId>
644+
</exclusion>
645+
<exclusion>
646+
<groupId>ch.qos.reload4j</groupId>
647+
<artifactId>reload4j</artifactId>
648+
</exclusion>
649+
<exclusion>
650+
<groupId>org.slf4j</groupId>
651+
<artifactId>slf4j-reload4j</artifactId>
652+
</exclusion>
653+
<exclusion>
654+
<groupId>ch.qos.reload4j</groupId>
655+
<artifactId>reload4j</artifactId>
656+
</exclusion>
657+
<exclusion>
658+
<groupId>org.slf4j</groupId>
659+
<artifactId>slf4j-reload4j</artifactId>
660+
</exclusion>
661+
<exclusion>
662+
<groupId>ch.qos.logback</groupId>
663+
<artifactId>logback-core</artifactId>
664+
</exclusion>
665+
<exclusion>
666+
<groupId>ch.qos.logback</groupId>
667+
<artifactId>logback-classic</artifactId>
668+
</exclusion>
616669
</exclusions>
617670
</dependency>
618671
<dependency>
@@ -655,6 +708,20 @@
655708
<groupId>org.apache.curator</groupId>
656709
<artifactId>curator-test</artifactId>
657710
<version>${curator.version}</version>
711+
<exclusions>
712+
<exclusion>
713+
<groupId>com.google.guava</groupId>
714+
<artifactId>guava</artifactId>
715+
</exclusion>
716+
<exclusion>
717+
<groupId>org.apache.zookeeper</groupId>
718+
<artifactId>zookeeper</artifactId>
719+
</exclusion>
720+
<exclusion>
721+
<groupId>org.junit.jupiter</groupId>
722+
<artifactId>junit-jupiter-api</artifactId>
723+
</exclusion>
724+
</exclusions>
658725
</dependency>
659726

660727
<dependency>
@@ -819,6 +886,14 @@
819886
<groupId>commons-logging</groupId>
820887
<artifactId>commons-logging</artifactId>
821888
</exclusion>
889+
<exclusion>
890+
<groupId>ch.qos.reload4j</groupId>
891+
<artifactId>reload4j</artifactId>
892+
</exclusion>
893+
<exclusion>
894+
<groupId>org.slf4j</groupId>
895+
<artifactId>slf4j-reload4j</artifactId>
896+
</exclusion>
822897
</exclusions>
823898
</dependency>
824899
<dependency>
@@ -836,6 +911,14 @@
836911
<groupId>log4j</groupId>
837912
<artifactId>log4j</artifactId>
838913
</exclusion>
914+
<exclusion>
915+
<groupId>ch.qos.reload4j</groupId>
916+
<artifactId>reload4j</artifactId>
917+
</exclusion>
918+
<exclusion>
919+
<groupId>org.slf4j</groupId>
920+
<artifactId>slf4j-reload4j</artifactId>
921+
</exclusion>
839922
</exclusions>
840923
</dependency>
841924
<dependency>
@@ -857,6 +940,14 @@
857940
<groupId>log4j</groupId>
858941
<artifactId>log4j</artifactId>
859942
</exclusion>
943+
<exclusion>
944+
<groupId>ch.qos.reload4j</groupId>
945+
<artifactId>reload4j</artifactId>
946+
</exclusion>
947+
<exclusion>
948+
<groupId>org.slf4j</groupId>
949+
<artifactId>slf4j-reload4j</artifactId>
950+
</exclusion>
860951
</exclusions>
861952
</dependency>
862953
<dependency>
@@ -881,6 +972,14 @@
881972
<groupId>org.slf4j</groupId>
882973
<artifactId>slf4j-log4j12</artifactId>
883974
</exclusion>
975+
<exclusion>
976+
<groupId>ch.qos.reload4j</groupId>
977+
<artifactId>reload4j</artifactId>
978+
</exclusion>
979+
<exclusion>
980+
<groupId>org.slf4j</groupId>
981+
<artifactId>slf4j-reload4j</artifactId>
982+
</exclusion>
884983
</exclusions>
885984
</dependency>
886985
<dependency>
@@ -897,6 +996,14 @@
897996
<groupId>log4j</groupId>
898997
<artifactId>log4j</artifactId>
899998
</exclusion>
999+
<exclusion>
1000+
<groupId>ch.qos.reload4j</groupId>
1001+
<artifactId>reload4j</artifactId>
1002+
</exclusion>
1003+
<exclusion>
1004+
<groupId>org.slf4j</groupId>
1005+
<artifactId>slf4j-reload4j</artifactId>
1006+
</exclusion>
9001007
</exclusions>
9011008
</dependency>
9021009
<dependency>
@@ -913,13 +1020,123 @@
9131020
<groupId>log4j</groupId>
9141021
<artifactId>log4j</artifactId>
9151022
</exclusion>
1023+
<exclusion>
1024+
<groupId>ch.qos.reload4j</groupId>
1025+
<artifactId>reload4j</artifactId>
1026+
</exclusion>
1027+
<exclusion>
1028+
<groupId>org.slf4j</groupId>
1029+
<artifactId>slf4j-reload4j</artifactId>
1030+
</exclusion>
1031+
</exclusions>
1032+
</dependency>
1033+
<dependency>
1034+
<groupId>org.apache.hadoop</groupId>
1035+
<artifactId>hadoop-yarn-server-resourcemanager</artifactId>
1036+
<version>${hadoop.version}</version>
1037+
<scope>test</scope>
1038+
<exclusions>
1039+
<exclusion>
1040+
<groupId>commons-logging</groupId>
1041+
<artifactId>commons-logging</artifactId>
1042+
</exclusion>
1043+
<exclusion>
1044+
<groupId>log4j</groupId>
1045+
<artifactId>log4j</artifactId>
1046+
</exclusion>
1047+
<exclusion>
1048+
<groupId>ch.qos.reload4j</groupId>
1049+
<artifactId>reload4j</artifactId>
1050+
</exclusion>
1051+
</exclusions>
1052+
</dependency>
1053+
<dependency>
1054+
<groupId>org.apache.hadoop</groupId>
1055+
<artifactId>hadoop-mapreduce-client-shuffle</artifactId>
1056+
<version>${hadoop.version}</version>
1057+
<scope>test</scope>
1058+
<exclusions>
1059+
<exclusion>
1060+
<groupId>commons-logging</groupId>
1061+
<artifactId>commons-logging</artifactId>
1062+
</exclusion>
1063+
<exclusion>
1064+
<groupId>log4j</groupId>
1065+
<artifactId>log4j</artifactId>
1066+
</exclusion>
1067+
<exclusion>
1068+
<groupId>ch.qos.reload4j</groupId>
1069+
<artifactId>reload4j</artifactId>
1070+
</exclusion>
1071+
<exclusion>
1072+
<groupId>org.slf4j</groupId>
1073+
<artifactId>slf4j-reload4j</artifactId>
1074+
</exclusion>
1075+
</exclusions>
1076+
</dependency>
1077+
<dependency>
1078+
<groupId>org.apache.hadoop</groupId>
1079+
<artifactId>hadoop-mapreduce-client-app</artifactId>
1080+
<version>${hadoop.version}</version>
1081+
<scope>test</scope>
1082+
<exclusions>
1083+
<exclusion>
1084+
<groupId>commons-logging</groupId>
1085+
<artifactId>commons-logging</artifactId>
1086+
</exclusion>
1087+
<exclusion>
1088+
<groupId>log4j</groupId>
1089+
<artifactId>log4j</artifactId>
1090+
</exclusion>
1091+
<exclusion>
1092+
<groupId>ch.qos.reload4j</groupId>
1093+
<artifactId>reload4j</artifactId>
1094+
</exclusion>
1095+
<exclusion>
1096+
<groupId>org.slf4j</groupId>
1097+
<artifactId>slf4j-reload4j</artifactId>
1098+
</exclusion>
1099+
</exclusions>
1100+
</dependency>
1101+
<dependency>
1102+
<groupId>org.apache.hadoop</groupId>
1103+
<artifactId>hadoop-mapreduce-client-hs</artifactId>
1104+
<version>${hadoop.version}</version>
1105+
<scope>test</scope>
1106+
<exclusions>
1107+
<exclusion>
1108+
<groupId>commons-logging</groupId>
1109+
<artifactId>commons-logging</artifactId>
1110+
</exclusion>
1111+
<exclusion>
1112+
<groupId>log4j</groupId>
1113+
<artifactId>log4j</artifactId>
1114+
</exclusion>
1115+
<exclusion>
1116+
<groupId>ch.qos.reload4j</groupId>
1117+
<artifactId>reload4j</artifactId>
1118+
</exclusion>
1119+
<exclusion>
1120+
<groupId>org.slf4j</groupId>
1121+
<artifactId>slf4j-reload4j</artifactId>
1122+
</exclusion>
9161123
</exclusions>
9171124
</dependency>
9181125
<dependency>
9191126
<groupId>org.apache.hadoop</groupId>
9201127
<artifactId>hadoop-hdfs-client</artifactId>
9211128
<version>${hadoop.version}</version>
9221129
<scope>test</scope>
1130+
<exclusions>
1131+
<exclusion>
1132+
<groupId>ch.qos.reload4j</groupId>
1133+
<artifactId>reload4j</artifactId>
1134+
</exclusion>
1135+
<exclusion>
1136+
<groupId>org.slf4j</groupId>
1137+
<artifactId>slf4j-reload4j</artifactId>
1138+
</exclusion>
1139+
</exclusions>
9231140
</dependency>
9241141
<dependency>
9251142
<groupId>org.apache.hadoop</groupId>
@@ -983,6 +1200,14 @@
9831200
<groupId>org.slf4j</groupId>
9841201
<artifactId>slf4j-log4j12</artifactId>
9851202
</exclusion>
1203+
<exclusion>
1204+
<groupId>ch.qos.reload4j</groupId>
1205+
<artifactId>reload4j</artifactId>
1206+
</exclusion>
1207+
<exclusion>
1208+
<groupId>org.slf4j</groupId>
1209+
<artifactId>slf4j-reload4j</artifactId>
1210+
</exclusion>
9861211
</exclusions>
9871212
</dependency>
9881213
<dependency>

‎python-phoenixdb/README.rst

+4-4
Original file line numberDiff line numberDiff line change
@@ -76,22 +76,22 @@ necessary requirements::
7676
You can start a Phoenix QueryServer instance on http://localhost:8765 for testing by running
7777
the following command in the pohoenix-queryserver-parent directory::
7878

79-
mvn clean verify -Pshade-javax-servlet -am -pl phoenix-queryserver-it -Dtest=foo \
79+
mvn clean verify -am -pl phoenix-queryserver-it -Dtest=foo \
8080
-Dit.test=QueryServerBasicsIT#startLocalPQS \
8181
-Ddo.not.randomize.pqs.port=true -Dstart.unsecure.pqs=true
8282

8383
You can start a secure (https+kerberos) Phoenix QueryServer instance on https://localhost:8765
8484
for testing by running the following command in the phoenix-queryserver-parent directory::
8585

86-
mvn clean verify -Pshade-javax-servlet -am -pl phoenix-queryserver-it -Dtest=foo \
86+
mvn clean verify -am -pl phoenix-queryserver-it -Dtest=foo \
8787
-Dit.test=SecureQueryServerPhoenixDBIT#startLocalPQS \
8888
-Ddo.not.randomize.pqs.port=true -Dstart.secure.pqs=true
8989

9090
this will also create a shell script in phoenix-queryserver-it/target/krb_setup.sh, that you can
9191
use to set up the environment for the tests.
9292

93-
Note: Depending on the Phoenix version used for building, you may or may not need the
94-
`-Pshade-javax-servlet` option. See BUILDING.md in the repository root for more information.
93+
Note: If you build with Phoenix 5.1, you need to add the `-Pshade-javax-servlet` option.
94+
See BUILDING.md in the repository root for more information.
9595

9696
If you want to use the library without installing the phoenixdb library, you can use
9797
the `PYTHONPATH` environment variable to point to the library directly::

0 commit comments

Comments
 (0)