From 7428bea204c4d2dbcc1971a4dd33080ba35c853e Mon Sep 17 00:00:00 2001
From: Dongjoon Hyun <dongjoon@apache.org>
Date: Wed, 6 Dec 2023 11:10:17 -0800
Subject: [PATCH] ORC-1545: [JAVA] Use `orc-format` 1.0.0-SNAPSHOT

### What changes were proposed in this pull request?

This PR aims to use `orc-format` 1.0.0-SNAPSHOT in `Java` as an interim stage.

1. We need to change C++ separately later.
2. After (1), we can delete `proto/orc_proto.proto`.
3. After releasing `orc-format` 1.0.0, we need to use it instead of SNAPSHOT.

### Why are the changes needed?

To verify `orc-format` repository and snapshot.

### How was this patch tested?

Pass the CIs.

Closes #1683 from dongjoon-hyun/ORC-1545.

Authored-by: Dongjoon Hyun <dongjoon@apache.org>
Signed-off-by: Dongjoon Hyun <dongjoon@apache.org>
---
 java/core/pom.xml  |  8 ++++----
 java/pom.xml       | 31 ++++++-------------------------
 java/tools/pom.xml |  4 ++++
 3 files changed, 14 insertions(+), 29 deletions(-)

diff --git a/java/core/pom.xml b/java/core/pom.xml
index 8bb4ea613b..3c6fc0f4e9 100644
--- a/java/core/pom.xml
+++ b/java/core/pom.xml
@@ -33,6 +33,10 @@
       <groupId>org.apache.orc</groupId>
       <artifactId>orc-shims</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.orc</groupId>
+      <artifactId>orc-format</artifactId>
+    </dependency>
 
     <!-- inter-project -->
     <dependency>
@@ -123,10 +127,6 @@
       </testResource>
     </testResources>
     <plugins>
-      <plugin>
-        <groupId>com.github.os72</groupId>
-        <artifactId>protoc-jar-maven-plugin</artifactId>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
diff --git a/java/pom.xml b/java/pom.xml
index d75ceefd9a..6a3dd6e23d 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -74,10 +74,10 @@
     <maven.version>3.9.4</maven.version>
 
     <mockito.version>4.11.0</mockito.version>
+    <orc-format.version>1.0.0-SNAPSHOT</orc-format.version>
     <!-- Build Properties -->
     <project.build.outputTimestamp>2023-05-15T16:29:49Z</project.build.outputTimestamp>
     <protobuf.version>3.25.1</protobuf.version>
-    <protoc.version>3.17.3</protoc.version>
     <slf4j.version>2.0.9</slf4j.version>
     <storage-api.version>2.8.1</storage-api.version>
     <surefire.version>3.0.0-M5</surefire.version>
@@ -87,6 +87,11 @@
   <dependencyManagement>
     <dependencies>
       <!-- intra-project dependencies -->
+      <dependency>
+        <groupId>org.apache.orc</groupId>
+        <artifactId>orc-format</artifactId>
+        <version>${orc-format.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.orc</groupId>
         <artifactId>orc-shims</artifactId>
@@ -480,30 +485,6 @@
             </execution>
           </executions>
         </plugin>
-        <plugin>
-          <groupId>com.github.os72</groupId>
-          <artifactId>protoc-jar-maven-plugin</artifactId>
-          <version>3.11.4</version>
-          <executions>
-            <execution>
-              <goals>
-                <goal>run</goal>
-              </goals>
-              <phase>generate-sources</phase>
-              <configuration>
-                <protocVersion>${protoc.version}</protocVersion>
-                <protocArtifact>com.google.protobuf:protoc:${protoc.version}</protocArtifact>
-                <addSources>none</addSources>
-                <includeDirectories>
-                  <include>../../proto</include>
-                </includeDirectories>
-                <inputDirectories>
-                  <include>../../proto</include>
-                </inputDirectories>
-              </configuration>
-            </execution>
-          </executions>
-        </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-shade-plugin</artifactId>
diff --git a/java/tools/pom.xml b/java/tools/pom.xml
index 03c88d45f7..f852a708c8 100644
--- a/java/tools/pom.xml
+++ b/java/tools/pom.xml
@@ -27,6 +27,10 @@
 
   <dependencies>
     <!-- intra-project -->
+    <dependency>
+      <groupId>org.apache.orc</groupId>
+      <artifactId>orc-format</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.orc</groupId>
       <artifactId>orc-shims</artifactId>