From 0d59ab17337cc370a96882cd9176316fd828d259 Mon Sep 17 00:00:00 2001
From: Steve Lord <steve.lord@dremio.com>
Date: Fri, 26 Jan 2024 13:18:20 -0800
Subject: [PATCH] DX-61034: Arrow changes from GH-34865 PR

---
 java/adapter/avro/pom.xml                    | 2 +-
 java/adapter/jdbc/pom.xml                    | 2 +-
 java/adapter/orc/pom.xml                     | 2 +-
 java/algorithm/pom.xml                       | 2 +-
 java/c/pom.xml                               | 2 +-
 java/compression/pom.xml                     | 2 +-
 java/dataset/pom.xml                         | 2 +-
 java/flight/flight-core/pom.xml              | 2 +-
 java/flight/flight-grpc/pom.xml              | 2 +-
 java/flight/flight-integration-tests/pom.xml | 2 +-
 java/flight/flight-sql-jdbc-core/pom.xml     | 2 +-
 java/flight/flight-sql-jdbc-driver/pom.xml   | 2 +-
 java/flight/flight-sql/pom.xml               | 2 +-
 java/flight/pom.xml                          | 2 +-
 java/format/pom.xml                          | 2 +-
 java/gandiva/pom.xml                         | 2 +-
 java/memory/memory-core/pom.xml              | 2 +-
 java/memory/memory-netty/pom.xml             | 2 +-
 java/memory/pom.xml                          | 2 +-
 java/performance/pom.xml                     | 4 ++--
 java/pom.xml                                 | 2 +-
 java/tools/pom.xml                           | 2 +-
 java/vector/pom.xml                          | 2 +-
 23 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/java/adapter/avro/pom.xml b/java/adapter/avro/pom.xml
index ae7f4f41a6ff7..eada0f7d86f54 100644
--- a/java/adapter/avro/pom.xml
+++ b/java/adapter/avro/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.apache.arrow</groupId>
     <artifactId>arrow-java-root</artifactId>
-    <version>12.0.1</version>
+    <version>12.0.1-project-id-merge</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/java/adapter/jdbc/pom.xml b/java/adapter/jdbc/pom.xml
index f376436769eba..5ac44e4ffe284 100644
--- a/java/adapter/jdbc/pom.xml
+++ b/java/adapter/jdbc/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.apache.arrow</groupId>
         <artifactId>arrow-java-root</artifactId>
-        <version>12.0.1</version>
+        <version>12.0.1-project-id-merge</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/java/adapter/orc/pom.xml b/java/adapter/orc/pom.xml
index 9217ef1a27211..011dd4dda5c61 100644
--- a/java/adapter/orc/pom.xml
+++ b/java/adapter/orc/pom.xml
@@ -114,7 +114,7 @@
     <parent>
         <groupId>org.apache.arrow</groupId>
         <artifactId>arrow-java-root</artifactId>
-        <version>12.0.1</version>
+        <version>12.0.1-project-id-merge</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/java/algorithm/pom.xml b/java/algorithm/pom.xml
index b487b13530395..32699fb6e4a5f 100644
--- a/java/algorithm/pom.xml
+++ b/java/algorithm/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <groupId>org.apache.arrow</groupId>
     <artifactId>arrow-java-root</artifactId>
-    <version>12.0.1</version>
+    <version>12.0.1-project-id-merge</version>
   </parent>
   <artifactId>arrow-algorithm</artifactId>
   <name>Arrow Algorithms</name>
diff --git a/java/c/pom.xml b/java/c/pom.xml
index 6d9db7c1f5447..b371cf5f8c15d 100644
--- a/java/c/pom.xml
+++ b/java/c/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <artifactId>arrow-java-root</artifactId>
         <groupId>org.apache.arrow</groupId>
-        <version>12.0.1</version>
+        <version>12.0.1-project-id-merge</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/java/compression/pom.xml b/java/compression/pom.xml
index a6e76f575a282..0f1cd72589a19 100644
--- a/java/compression/pom.xml
+++ b/java/compression/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <groupId>org.apache.arrow</groupId>
     <artifactId>arrow-java-root</artifactId>
-    <version>12.0.1</version>
+    <version>12.0.1-project-id-merge</version>
   </parent>
   <artifactId>arrow-compression</artifactId>
   <name>Arrow Compression</name>
diff --git a/java/dataset/pom.xml b/java/dataset/pom.xml
index 6ef3dc05a6dd3..d9bf5f1d14900 100644
--- a/java/dataset/pom.xml
+++ b/java/dataset/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <artifactId>arrow-java-root</artifactId>
         <groupId>org.apache.arrow</groupId>
-        <version>12.0.1</version>
+        <version>12.0.1-project-id-merge</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/java/flight/flight-core/pom.xml b/java/flight/flight-core/pom.xml
index 75eac45097da5..8b89bfa292a1d 100644
--- a/java/flight/flight-core/pom.xml
+++ b/java/flight/flight-core/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>arrow-flight</artifactId>
     <groupId>org.apache.arrow</groupId>
-    <version>12.0.1</version>
+    <version>12.0.1-project-id-merge</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/java/flight/flight-grpc/pom.xml b/java/flight/flight-grpc/pom.xml
index a3a91974e6050..abe712d86cba4 100644
--- a/java/flight/flight-grpc/pom.xml
+++ b/java/flight/flight-grpc/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <artifactId>arrow-flight</artifactId>
     <groupId>org.apache.arrow</groupId>
-    <version>12.0.1</version>
+    <version>12.0.1-project-id-merge</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/java/flight/flight-integration-tests/pom.xml b/java/flight/flight-integration-tests/pom.xml
index a0e142ff15220..104ca31a54f4d 100644
--- a/java/flight/flight-integration-tests/pom.xml
+++ b/java/flight/flight-integration-tests/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <artifactId>arrow-flight</artifactId>
         <groupId>org.apache.arrow</groupId>
-        <version>12.0.1</version>
+        <version>12.0.1-project-id-merge</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/java/flight/flight-sql-jdbc-core/pom.xml b/java/flight/flight-sql-jdbc-core/pom.xml
index 12a028f254a19..81f68526e8bad 100644
--- a/java/flight/flight-sql-jdbc-core/pom.xml
+++ b/java/flight/flight-sql-jdbc-core/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <artifactId>arrow-flight</artifactId>
         <groupId>org.apache.arrow</groupId>
-        <version>12.0.1</version>
+        <version>12.0.1-project-id-merge</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/java/flight/flight-sql-jdbc-driver/pom.xml b/java/flight/flight-sql-jdbc-driver/pom.xml
index 615da2e8f839d..85e7adc4bdd64 100644
--- a/java/flight/flight-sql-jdbc-driver/pom.xml
+++ b/java/flight/flight-sql-jdbc-driver/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <artifactId>arrow-flight</artifactId>
         <groupId>org.apache.arrow</groupId>
-        <version>12.0.1</version>
+        <version>12.0.1-project-id-merge</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/java/flight/flight-sql/pom.xml b/java/flight/flight-sql/pom.xml
index ef250adb33f94..16aa640c0ae8d 100644
--- a/java/flight/flight-sql/pom.xml
+++ b/java/flight/flight-sql/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>arrow-flight</artifactId>
     <groupId>org.apache.arrow</groupId>
-    <version>12.0.1</version>
+    <version>12.0.1-project-id-merge</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/java/flight/pom.xml b/java/flight/pom.xml
index ec972a67fb926..7ceb293204aba 100644
--- a/java/flight/pom.xml
+++ b/java/flight/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <artifactId>arrow-java-root</artifactId>
         <groupId>org.apache.arrow</groupId>
-        <version>12.0.1</version>
+        <version>12.0.1-project-id-merge</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/java/format/pom.xml b/java/format/pom.xml
index 98a53fbfd7a24..96b6904cdcba8 100644
--- a/java/format/pom.xml
+++ b/java/format/pom.xml
@@ -15,7 +15,7 @@
 <parent>
   <artifactId>arrow-java-root</artifactId>
   <groupId>org.apache.arrow</groupId>
-  <version>12.0.1</version>
+  <version>12.0.1-project-id-merge</version>
 </parent>
 
 <artifactId>arrow-format</artifactId>
diff --git a/java/gandiva/pom.xml b/java/gandiva/pom.xml
index d2df653d5e1fe..1d3705221ea37 100644
--- a/java/gandiva/pom.xml
+++ b/java/gandiva/pom.xml
@@ -14,7 +14,7 @@
     <parent>
       <groupId>org.apache.arrow</groupId>
       <artifactId>arrow-java-root</artifactId>
-      <version>12.0.1</version>
+      <version>12.0.1-project-id-merge</version>
     </parent>
 
     <groupId>org.apache.arrow.gandiva</groupId>
diff --git a/java/memory/memory-core/pom.xml b/java/memory/memory-core/pom.xml
index 7acd474c6c8b6..8f568ef1cb174 100644
--- a/java/memory/memory-core/pom.xml
+++ b/java/memory/memory-core/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <artifactId>arrow-memory</artifactId>
     <groupId>org.apache.arrow</groupId>
-    <version>12.0.1</version>
+    <version>12.0.1-project-id-merge</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/java/memory/memory-netty/pom.xml b/java/memory/memory-netty/pom.xml
index b101e0fe3877d..e90aaca21cafb 100644
--- a/java/memory/memory-netty/pom.xml
+++ b/java/memory/memory-netty/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <artifactId>arrow-memory</artifactId>
     <groupId>org.apache.arrow</groupId>
-    <version>12.0.1</version>
+    <version>12.0.1-project-id-merge</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/java/memory/pom.xml b/java/memory/pom.xml
index 15896ecc0112b..8bebea4c595fe 100644
--- a/java/memory/pom.xml
+++ b/java/memory/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <groupId>org.apache.arrow</groupId>
     <artifactId>arrow-java-root</artifactId>
-    <version>12.0.1</version>
+    <version>12.0.1-project-id-merge</version>
   </parent>
   <artifactId>arrow-memory</artifactId>
   <name>Arrow Memory</name>
diff --git a/java/performance/pom.xml b/java/performance/pom.xml
index 8049be7bbbed9..da93200b9057c 100644
--- a/java/performance/pom.xml
+++ b/java/performance/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <artifactId>arrow-java-root</artifactId>
         <groupId>org.apache.arrow</groupId>
-        <version>12.0.1</version>
+        <version>12.0.1-project-id-merge</version>
     </parent>
     <artifactId>arrow-performance</artifactId>
     <packaging>jar</packaging>
@@ -80,7 +80,7 @@
         <dependency>
             <groupId>org.apache.arrow</groupId>
             <artifactId>arrow-algorithm</artifactId>
-            <version>12.0.1</version>
+            <version>12.0.1-project-id-merge</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/java/pom.xml b/java/pom.xml
index c8b5a76fae69d..5f59a5f364bca 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -20,7 +20,7 @@
 
   <groupId>org.apache.arrow</groupId>
   <artifactId>arrow-java-root</artifactId>
-  <version>12.0.1</version>
+  <version>12.0.1-project-id-merge</version>
   <packaging>pom</packaging>
 
   <name>Apache Arrow Java Root POM</name>
diff --git a/java/tools/pom.xml b/java/tools/pom.xml
index 90df590e1e6c4..1467b22e4546b 100644
--- a/java/tools/pom.xml
+++ b/java/tools/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.apache.arrow</groupId>
         <artifactId>arrow-java-root</artifactId>
-        <version>12.0.1</version>
+        <version>12.0.1-project-id-merge</version>
     </parent>
     <artifactId>arrow-tools</artifactId>
     <name>Arrow Tools</name>
diff --git a/java/vector/pom.xml b/java/vector/pom.xml
index 92dcdc2287125..270ac4a1209a5 100644
--- a/java/vector/pom.xml
+++ b/java/vector/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <groupId>org.apache.arrow</groupId>
     <artifactId>arrow-java-root</artifactId>
-    <version>12.0.1</version>
+    <version>12.0.1-project-id-merge</version>
   </parent>
   <artifactId>arrow-vector</artifactId>
   <name>Arrow Vectors</name>