DX-61034: Arrow changes from apacheGH-34865 PR

stevelorddremio · Jan 26, 2024 · 0d59ab1 · 0d59ab1
1 parent bb96fe3
commit 0d59ab1
Show file tree

Hide file tree

Showing 23 changed files with 24 additions and 24 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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>