ODP Version upgrade to 3.3.6.0-1

manishsinghmowall · manishsinghmowall · commit 414261b45961 · 2024-07-15T12:50:16.000+02:00
diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.phoenix</groupId>
     <artifactId>phoenix</artifactId>
-    <version>5.1.3.3.2.3.0-SNAPSHOT</version>
+    <version>5.1.3.3.3.6.0-1</version>
   </parent>
   <artifactId>phoenix-assembly</artifactId>
   <name>Phoenix Assembly</name>
diff --git a/phoenix-client-parent/phoenix-client-embedded/pom.xml b/phoenix-client-parent/phoenix-client-embedded/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.phoenix</groupId>
     <artifactId>phoenix-client-parent</artifactId>
-    <version>5.1.3.3.2.3.0-SNAPSHOT</version>
+    <version>5.1.3.3.3.6.0-1</version>
   </parent>
 
   <artifactId>phoenix-client-embedded-${hbase.suffix}</artifactId>
diff --git a/phoenix-client-parent/phoenix-client/pom.xml b/phoenix-client-parent/phoenix-client/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.phoenix</groupId>
     <artifactId>phoenix-client-parent</artifactId>
-    <version>5.1.3.3.2.3.0-SNAPSHOT</version>
+    <version>5.1.3.3.3.6.0-1</version>
   </parent>
 
   <artifactId>phoenix-client-${hbase.suffix}</artifactId>
diff --git a/phoenix-client-parent/pom.xml b/phoenix-client-parent/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.phoenix</groupId>
     <artifactId>phoenix</artifactId>
-    <version>5.1.3.3.2.3.0-SNAPSHOT</version>
+    <version>5.1.3.3.3.6.0-1</version>
   </parent>
   <artifactId>phoenix-client-parent</artifactId>
   <name>Phoenix Client Parent</name>
diff --git a/phoenix-connectors/phoenix5-connectors-assembly/pom.xml b/phoenix-connectors/phoenix5-connectors-assembly/pom.xml
@@ -53,14 +53,16 @@
       <groupId>org.apache.phoenix</groupId>
       <artifactId>phoenix5-kafka</artifactId>
     </dependency>
+    <!--
     <dependency>
       <groupId>org.apache.phoenix</groupId>
       <artifactId>phoenix5-spark</artifactId>
     </dependency>
+   
     <dependency>
       <groupId>org.apache.phoenix</groupId>
       <artifactId>phoenix5-spark-shaded</artifactId>
-    </dependency>
+    </dependency> -->
     <dependency>
       <groupId>org.apache.phoenix</groupId>
       <artifactId>phoenix5-spark3-shaded</artifactId>
@@ -119,7 +121,8 @@
                 </argument>
               </arguments>
             </configuration>
-          </execution>
+    </execution>
+      <!--
           <execution>
             <id>spark without version</id>
             <phase>package</phase>
@@ -139,7 +142,7 @@
                 </argument>
               </arguments>
             </configuration>
-          </execution>
+	  </execution> -->
           <execution>
             <id>spark3 without version</id>
             <phase>package</phase>
diff --git a/phoenix-connectors/phoenix5-hive-shaded/dependency-reduced-pom.xml b/phoenix-connectors/phoenix5-hive-shaded/dependency-reduced-pom.xml
@@ -216,7 +216,7 @@
   </build>
   <properties>
     <hive.version>${hive3.version}</hive.version>
-    <test.tmp.dir>${project.build.directory}/tmp</test.tmp.dir>
     <top.dir>${project.basedir}/..</top.dir>
+    <test.tmp.dir>${project.build.directory}/tmp</test.tmp.dir>
   </properties>
 </project>
diff --git a/phoenix-connectors/phoenix5-spark/pom.xml b/phoenix-connectors/phoenix5-spark/pom.xml
@@ -35,7 +35,7 @@
 
   <properties>
     <top.dir>${project.basedir}/..</top.dir>
-    <spark.version>2.4.8.3.2.3.0-SNAPSHOT</spark.version>
+    <spark.version>2.4.8</spark.version>
     <scala.version>2.11.12</scala.version>
     <scala.binary.version>2.11</scala.binary.version>
     <skip-scala-tests>true</skip-scala-tests>
diff --git a/phoenix-connectors/pom.xml b/phoenix-connectors/pom.xml
@@ -36,7 +36,7 @@
   <parent>
     <groupId>org.apache.phoenix</groupId>
     <artifactId>phoenix</artifactId>
-    <version>5.1.3.3.2.3.0-SNAPSHOT</version>
+    <version>5.1.3.3.3.6.0-1</version>
   </parent>
 
   <scm>
@@ -51,8 +51,9 @@
       <module>phoenix5-hive-shaded</module>
       <module>phoenix5-flume</module>
       <module>phoenix5-kafka</module>
-      <module>phoenix5-spark</module>
-      <module>phoenix5-spark-shaded</module>
+       <!--  <module>phoenix5-spark</module>
+      <module>phoenix5-spark-shaded</module> -->
+
       <module>phoenix5-spark3</module>
       <module>phoenix5-spark3-it</module>
       <module>phoenix5-spark3-shaded</module>
@@ -61,13 +62,13 @@
 
   <properties>
     <!-- Phoenix Version -->
-    <phoenix.version>5.1.3.3.2.3.0-SNAPSHOT</phoenix.version>
+    <phoenix.version>5.1.3.3.3.6.0-1</phoenix.version>
     <phoenix.thirdparty.version>2.0.0</phoenix.thirdparty.version>
     <!-- Hadoop Versions -->
-    <hbase.version>2.4.11.3.2.3.0-SNAPSHOT</hbase.version>
+    <hbase.version>2.5.8.3.3.6.0-1</hbase.version>
     <hbase.compat.version>2.4.1</hbase.compat.version>
-    <hadoop.version>3.2.3.3.2.3.0-SNAPSHOT</hadoop.version>
-    <zookeeper.version>3.5.10.3.2.3.0-SNAPSHOT</zookeeper.version>
+    <hadoop.version>3.3.6.3.3.6.0-1</hadoop.version>
+    <zookeeper.version>3.8.4.3.3.6.0-1</zookeeper.version>
 
     <hbase-thirdparty-version>2.1.0</hbase-thirdparty-version>
     
@@ -85,8 +86,8 @@
     <hive-storage.version>${hive3-storage.version}</hive-storage.version>
     <flume.version>1.4.0</flume.version>
     <kafka.version>2.8.2</kafka.version>
-    <spark.version>2.4.8.3.2.3.0-SNAPSHOT</spark.version>
-    <spark3.version>3.3.3.3.2.3.0-SNAPSHOT</spark3.version>
+    <spark.version>2.4.8</spark.version>
+    <spark3.version>3.3.3.3.2.3.1-2</spark3.version>
     <scala.version>2.11.12</scala.version>
     <scala.binary.version>2.11</scala.binary.version>
     
@@ -511,7 +512,8 @@
         <groupId>org.apache.phoenix</groupId>
         <artifactId>phoenix5-kafka</artifactId>
         <version>${project.version}</version>
-      </dependency>
+</dependency>
+<!--
       <dependency>
         <groupId>org.apache.phoenix</groupId>
         <artifactId>phoenix5-spark</artifactId>
@@ -521,7 +523,7 @@
         <groupId>org.apache.phoenix</groupId>
         <artifactId>phoenix5-spark-shaded</artifactId>
         <version>${project.version}</version>
-      </dependency>
+      </dependency> -->
       <dependency>
         <groupId>org.apache.phoenix</groupId>
         <artifactId>phoenix5-spark3</artifactId>
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.phoenix</groupId>
     <artifactId>phoenix</artifactId>
-    <version>5.1.3.3.2.3.0-SNAPSHOT</version>
+    <version>5.1.3.3.3.6.0-1</version>
   </parent>
   <artifactId>phoenix-core</artifactId>
   <name>Phoenix Core</name>
diff --git a/phoenix-hbase-compat-2.1.6/pom.xml b/phoenix-hbase-compat-2.1.6/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.phoenix</groupId>
     <artifactId>phoenix</artifactId>
-    <version>5.1.3.3.2.3.0-SNAPSHOT</version>
+    <version>5.1.3.3.3.6.0-1</version>
   </parent>
 
   <artifactId>phoenix-hbase-compat-2.1.6</artifactId>
diff --git a/phoenix-hbase-compat-2.2.5/pom.xml b/phoenix-hbase-compat-2.2.5/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.phoenix</groupId>
     <artifactId>phoenix</artifactId>
-    <version>5.1.3.3.2.3.0-SNAPSHOT</version>
+    <version>5.1.3.3.3.6.0-1</version>
   </parent>
 
   <artifactId>phoenix-hbase-compat-2.2.5</artifactId>
diff --git a/phoenix-hbase-compat-2.3.0/pom.xml b/phoenix-hbase-compat-2.3.0/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.phoenix</groupId>
     <artifactId>phoenix</artifactId>
-    <version>5.1.3.3.2.3.0-SNAPSHOT</version>
+    <version>5.1.3.3.3.6.0-1</version>
   </parent>
 
   <artifactId>phoenix-hbase-compat-2.3.0</artifactId>
diff --git a/phoenix-hbase-compat-2.4.0/pom.xml b/phoenix-hbase-compat-2.4.0/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.phoenix</groupId>
     <artifactId>phoenix</artifactId>
-    <version>5.1.3.3.2.3.0-SNAPSHOT</version>
+    <version>5.1.3.3.3.6.0-1</version>
   </parent>
 
   <artifactId>phoenix-hbase-compat-2.4.0</artifactId>
diff --git a/phoenix-hbase-compat-2.4.1/pom.xml b/phoenix-hbase-compat-2.4.1/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.phoenix</groupId>
     <artifactId>phoenix</artifactId>
-    <version>5.1.3.3.2.3.0-SNAPSHOT</version>
+    <version>5.1.3.3.3.6.0-1</version>
   </parent>
 
   <artifactId>phoenix-hbase-compat-2.4.1</artifactId>
diff --git a/phoenix-hbase-compat-2.5.0/pom.xml b/phoenix-hbase-compat-2.5.0/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.phoenix</groupId>
     <artifactId>phoenix</artifactId>
-    <version>5.1.3.3.2.3.0-SNAPSHOT</version>
+    <version>5.1.3.3.3.6.0-1</version>
   </parent>
 
   <artifactId>phoenix-hbase-compat-2.5.0</artifactId>
diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.phoenix</groupId>
     <artifactId>phoenix</artifactId>
-    <version>5.1.3.3.2.3.0-SNAPSHOT</version>
+    <version>5.1.3.3.3.6.0-1</version>
   </parent>
 
   <artifactId>phoenix-pherf</artifactId>
diff --git a/phoenix-queryserver/phoenix-queryserver-assembly/pom.xml b/phoenix-queryserver/phoenix-queryserver-assembly/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.phoenix</groupId>
         <artifactId>phoenix-queryserver-parent</artifactId>
-        <version>5.1.3.3.2.3.0-SNAPSHOT</version>
+        <version>5.1.3.3.3.6.0-1</version>
     </parent>
 
     <artifactId>phoenix-queryserver-assembly</artifactId>
diff --git a/phoenix-queryserver/phoenix-queryserver-client/pom.xml b/phoenix-queryserver/phoenix-queryserver-client/pom.xml
@@ -29,7 +29,7 @@
   <parent>
     <groupId>org.apache.phoenix</groupId>
     <artifactId>phoenix-queryserver-parent</artifactId>
-    <version>5.1.3.3.2.3.0-SNAPSHOT</version>
+    <version>5.1.3.3.3.6.0-1</version>
   </parent>
 
   <artifactId>phoenix-queryserver-client</artifactId>
diff --git a/phoenix-queryserver/phoenix-queryserver-it/pom.xml b/phoenix-queryserver/phoenix-queryserver-it/pom.xml
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.phoenix</groupId>
     <artifactId>phoenix-queryserver-parent</artifactId>
-    <version>5.1.3.3.2.3.0-SNAPSHOT</version>
+    <version>5.1.3.3.3.6.0-1</version>
   </parent>
 
   <artifactId>phoenix-queryserver-it</artifactId>
diff --git a/phoenix-queryserver/phoenix-queryserver-load-balancer/pom.xml b/phoenix-queryserver/phoenix-queryserver-load-balancer/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.phoenix</groupId>
     <artifactId>phoenix-queryserver-parent</artifactId>
-    <version>5.1.3.3.2.3.0-SNAPSHOT</version>
+    <version>5.1.3.3.3.6.0-1</version>
   </parent>
   <artifactId>phoenix-queryserver-load-balancer</artifactId>
   <name>Phoenix Query Server Load Balancer</name>
diff --git a/phoenix-queryserver/phoenix-queryserver-orchestrator/pom.xml b/phoenix-queryserver/phoenix-queryserver-orchestrator/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <artifactId>phoenix-queryserver-parent</artifactId>
         <groupId>org.apache.phoenix</groupId>
-        <version>5.1.3.3.2.3.0-SNAPSHOT</version>
+        <version>5.1.3.3.3.6.0-1</version>
     </parent>
 
     <artifactId>phoenix-queryserver-orchestrator</artifactId>
diff --git a/phoenix-queryserver/phoenix-queryserver/pom.xml b/phoenix-queryserver/phoenix-queryserver/pom.xml
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.phoenix</groupId>
     <artifactId>phoenix-queryserver-parent</artifactId>
-    <version>5.1.3.3.2.3.0-SNAPSHOT</version>
+    <version>5.1.3.3.3.6.0-1</version>
   </parent>
 
   <artifactId>phoenix-queryserver</artifactId>
diff --git a/phoenix-queryserver/pom.xml b/phoenix-queryserver/pom.xml
@@ -26,7 +26,7 @@
     <parent>
       <groupId>org.apache.phoenix</groupId>
       <artifactId>phoenix</artifactId>
-      <version>5.1.3.3.2.3.0-SNAPSHOT</version>
+      <version>5.1.3.3.3.6.0-1</version>
     </parent>
 
     <groupId>org.apache.phoenix</groupId>
@@ -67,15 +67,15 @@
         <!-- General Properties -->
         <top.dir>${project.basedir}</top.dir>
 
-        <phoenix.version>5.1.3.3.2.3.0-SNAPSHOT</phoenix.version>
+        <phoenix.version>5.1.3.3.3.6.0-1</phoenix.version>
 
         <!-- Hadoop/Hbase Versions -->
-        <hbase.version>2.4.11.3.2.3.0-SNAPSHOT</hbase.version>
-        <hadoop.version>3.2.3.3.2.3.0-SNAPSHOT</hadoop.version>
+        <hbase.version>2.5.8.3.3.6.0-1</hbase.version>
+        <hadoop.version>3.3.6.3.3.6.0-1</hadoop.version>
         <phoenix.client.artifactid>phoenix-client-hbase-2.4</phoenix.client.artifactid>
 
         <!-- Dependency versions -->
-        <zookeeper.version>3.5.10.3.2.3.0-SNAPSHOT</zookeeper.version>
+        <zookeeper.version>3.8.4.3.3.6.0-1</zookeeper.version>
         <curator.version>2.12.0</curator.version>
 
         <gson.version>2.2.4</gson.version>
diff --git a/phoenix-server/pom.xml b/phoenix-server/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.phoenix</groupId>
     <artifactId>phoenix</artifactId>
-    <version>5.1.3.3.2.3.0-SNAPSHOT</version>
+    <version>5.1.3.3.3.6.0-1</version>
   </parent>
   <artifactId>phoenix-server-${hbase.suffix}</artifactId>
   <name>Phoenix Server JAR</name>
diff --git a/phoenix-thirdparty/phoenix-shaded-commons-cli/pom.xml b/phoenix-thirdparty/phoenix-shaded-commons-cli/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.phoenix.thirdparty</groupId>
     <artifactId>phoenix-thirdparty</artifactId>
-    <version>5.1.3.3.2.3.0-SNAPSHOT</version>
+    <version>5.1.3.3.3.6.0-1</version>
   </parent>
   <artifactId>phoenix-shaded-commons-cli</artifactId>
   <name>Apache Phoenix Patched and Relocated (Shaded) Commons-CLI</name>
diff --git a/phoenix-thirdparty/phoenix-shaded-guava/pom.xml b/phoenix-thirdparty/phoenix-shaded-guava/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.phoenix.thirdparty</groupId>
     <artifactId>phoenix-thirdparty</artifactId>
-    <version>5.1.3.3.2.3.0-SNAPSHOT</version>
+    <version>5.1.3.3.3.6.0-1</version>
   </parent>
 
   <artifactId>phoenix-shaded-guava</artifactId>
diff --git a/phoenix-thirdparty/pom.xml b/phoenix-thirdparty/pom.xml
@@ -23,12 +23,12 @@
  <parent>
       <groupId>org.apache.phoenix</groupId>
       <artifactId>phoenix</artifactId>
-      <version>5.1.3.3.2.3.0-SNAPSHOT</version>
+      <version>5.1.3.3.3.6.0-1</version>
     </parent>
 
   <groupId>org.apache.phoenix.thirdparty</groupId>
   <artifactId>phoenix-thirdparty</artifactId>
-  <version>5.1.3.3.2.3.0-SNAPSHOT</version>
+  <version>5.1.3.3.3.6.0-1</version>
   <packaging>pom</packaging>
   <name>Apache Phoenix Third-Party Libs</name>
   <description>Packaging of relocated (renamed, shaded) third-party libraries used by Phoenix.</description>
diff --git a/phoenix-tracing-webapp/pom.xml b/phoenix-tracing-webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
       <groupId>org.apache.phoenix</groupId>
       <artifactId>phoenix</artifactId>
-      <version>5.1.3.3.2.3.0-SNAPSHOT</version>
+      <version>5.1.3.3.3.6.0-1</version>
     </parent>
 
     <artifactId>phoenix-tracing-webapp</artifactId>
diff --git a/pom.xml b/pom.xml
@@ -20,7 +20,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.phoenix</groupId>
   <artifactId>phoenix</artifactId>
-  <version>5.1.3.3.2.3.0-SNAPSHOT</version>
+  <version>5.1.3.3.3.6.0-1</version>
   <packaging>pom</packaging>
   <name>Apache Phoenix</name>
   <description>A SQL layer over HBase</description>
@@ -104,7 +104,7 @@
     <!-- Hadoop and Hbase-thirdparty version -->
     <!-- These are expected to be overridden to conform to cluster versions
     along with hbase.version (defined in profiles) -->
-    <hadoop.version>3.2.3.3.2.3.0-SNAPSHOT</hadoop.version>
+    <hadoop.version>3.3.6.3.3.6.0-1</hadoop.version>
     <hbase.thirdparty.version>2.2.1</hbase.thirdparty.version>
 
     <phoenix.thirdparty.version>1.1.0</phoenix.thirdparty.version>
@@ -158,7 +158,7 @@
     <stream.version>2.9.5</stream.version>
     <icu4j.version>72.1</icu4j.version>
     <guice.version>4.0</guice.version>
-    <zookeeper.version>3.5.10</zookeeper.version>
+    <zookeeper.version>3.8.4.3.3.6.0-1</zookeeper.version>
     <curator.version>4.0.0</curator.version>
     <jcodings.version>1.0.55</jcodings.version>
     <thrift.version>0.9.3-1</thrift.version>
