From a7215779009177317d82a92dcf844368011268de Mon Sep 17 00:00:00 2001 From: Rafael Telles Date: Fri, 3 Sep 2021 14:56:27 -0300 Subject: [PATCH] Fix maven build from different directories (#114) --- java/flight/flight-grpc/pom.xml | 2 +- java/flight/pom.xml | 28 ++++++++++++++++++---------- java/pom.xml | 32 -------------------------------- 3 files changed, 19 insertions(+), 43 deletions(-) diff --git a/java/flight/flight-grpc/pom.xml b/java/flight/flight-grpc/pom.xml index 15ede7e6b858f..f41da3f9b5f4c 100644 --- a/java/flight/flight-grpc/pom.xml +++ b/java/flight/flight-grpc/pom.xml @@ -13,7 +13,7 @@ arrow-flight org.apache.arrow - 8.0.0-SNAPSHOT + 6.0.0-SNAPSHOT ../pom.xml 4.0.0 diff --git a/java/flight/pom.xml b/java/flight/pom.xml index ba5a72acfb1c0..4a0422acc14fa 100644 --- a/java/flight/pom.xml +++ b/java/flight/pom.xml @@ -26,7 +26,7 @@ 1.30.2 - 3.7.1 + 3.17.3 @@ -38,14 +38,22 @@ - - - - kr.motd.maven - os-maven-plugin - 1.5.0.Final - - + + + + org.xolstice.maven.plugins + protobuf-maven-plugin + 0.6.1 + + + com.google.protobuf:protoc:${dep.protobuf.version}:exe:${os.detected.classifier} + + grpc-java + io.grpc:protoc-gen-grpc-java:${dep.grpc.version}:exe:${os.detected.classifier} + + + + + - diff --git a/java/pom.xml b/java/pom.xml index 6c6d1f18243c1..288893b36f869 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -506,38 +506,6 @@ - - - org.xolstice.maven.plugins - protobuf-maven-plugin - 0.6.1 - - com.google.protobuf:protoc:${dep.protobuf.version}:exe:${os.detected.classifier} - grpc-java - io.grpc:protoc-gen-grpc-java:${dep.grpc.version}:exe:${os.detected.classifier} - - - - proto-compile - generate-sources - - ${basedir}/../format/ - - - compile - compile-custom - - - - proto-test-compile - generate-test-sources - - test-compile - test-compile-custom - - - -