Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ORC-1327: Exclude the proto files from the nohive jar
We're seeing some conflicts in the proto files when updating Iceberg in Trino: trinodb/trino#15079 (comment) I think we should exclude the proto files from the `nohive` jar. Before the change: ``` ➜ java git:(main) ✗ rm -rf core/target/ ➜ java git:(main) ✗ mvn package -DskipTests ➜ java git:(main) ✗ cd core/target ➜ target git:(main) ✗ unzip orc-core-1.9.0-SNAPSHOT-nohive.jar ➜ target git:(main) find . | grep -i "google/protobuf/" ./google/protobuf/timestamp.proto ./google/protobuf/field_mask.proto ./google/protobuf/api.proto ./google/protobuf/duration.proto ./google/protobuf/struct.proto ./google/protobuf/wrappers.proto ./google/protobuf/source_context.proto ./google/protobuf/any.proto ./google/protobuf/type.proto ./google/protobuf/empty.proto ./google/protobuf/compiler ./google/protobuf/compiler/plugin.proto ./google/protobuf/descriptor.proto ``` After the change: ``` ➜ java git:(main) ✗ rm -rf core/target/ ➜ java git:(main) ✗ mvn package -DskipTests ➜ java git:(main) ✗ cd core/target ➜ target git:(main) ✗ unzip orc-core-1.9.0-SNAPSHOT-nohive.jar ➜ target git:(main) ✗ find . | grep -i "google/protobuf/" ∅ ``` Interestingly enough, the normal jar doesn't contain these proto files: ``` ➜ java git:(main) ✗ rm -rf core/target/ ➜ java git:(main) ✗ mvn package -DskipTests ➜ java git:(main) ✗ cd core/target ➜ target git:(main) unzip orc-core-1.9.0-SNAPSHOT.jar| grep -i proto ➜ target git:(main) find . | grep -i "google/protobuf/" ∅ ``` Exclude the proto files Inspecting the produced jar Closes #1333 Closes #1334 from Fokko/fd-exclude-proto-files. Authored-by: Fokko Driesprong <[email protected]> Signed-off-by: Dongjoon Hyun <[email protected]> (cherry picked from commit f6fee07) Signed-off-by: Dongjoon Hyun <[email protected]>
- Loading branch information