diff --git a/docs/source/developers/java/building.rst b/docs/source/developers/java/building.rst index 38c03d0e486..e50142d285d 100644 --- a/docs/source/developers/java/building.rst +++ b/docs/source/developers/java/building.rst @@ -186,11 +186,6 @@ Arrow repository, and update the following settings: Settings > Build, Execution, Deployment > Compiler > Java Compiler and disable "Use '--release' option for cross-compilation (Java 9 and later)". Otherwise you will get an error like "package sun.misc does not exist". -* You may need to disable the ``linux-netty-native`` or ``mac-netty-native`` - profile in the Maven tool window if you get an error like the following:: - - Unresolved dependency: 'io.netty:netty-transport-native-unix-common:jar:4.1.72.Final' - * If using IntelliJ's Maven integration to build, you may need to change ```` to ``false`` in the pom.xml files due to an `IntelliJ bug `__. diff --git a/java/flight/flight-core/pom.xml b/java/flight/flight-core/pom.xml index 072be1e9952..28325e9bffb 100644 --- a/java/flight/flight-core/pom.xml +++ b/java/flight/flight-core/pom.xml @@ -53,27 +53,22 @@ io.grpc grpc-netty - ${dep.grpc.version} io.grpc grpc-core - ${dep.grpc.version} io.grpc grpc-context - ${dep.grpc.version} io.grpc grpc-protobuf - ${dep.grpc.version} io.netty netty-tcnative-boringssl-static - ${dep.netty-tcnative.version} io.netty @@ -82,12 +77,10 @@ io.netty netty-handler - ${dep.netty.version} io.netty netty-transport - ${dep.netty.version} com.google.guava @@ -96,17 +89,14 @@ io.grpc grpc-stub - ${dep.grpc.version} com.google.protobuf protobuf-java - ${dep.protobuf.version} io.grpc grpc-api - ${dep.grpc.version} @@ -224,10 +214,10 @@ protobuf-maven-plugin 0.6.1 - com.google.protobuf:protoc:${dep.protobuf.version}:exe:${os.detected.classifier} + com.google.protobuf:protoc:${dep.protobuf-bom.version}:exe:${os.detected.classifier} false grpc-java - io.grpc:protoc-gen-grpc-java:${dep.grpc.version}:exe:${os.detected.classifier} + io.grpc:protoc-gen-grpc-java:${dep.grpc-bom.version}:exe:${os.detected.classifier} @@ -257,6 +247,7 @@ org.apache.maven.plugins maven-dependency-plugin + 3.3.0 analyze @@ -311,38 +302,4 @@ - - - linux-netty-native - - - linux - - - - - io.netty - netty-transport-native-unix-common - ${dep.netty.version} - ${os.detected.name}-${os.detected.arch} - - - - - mac-netty-native - - - mac - - - - - io.netty - netty-transport-native-unix-common - ${dep.netty.version} - ${os.detected.name}-${os.detected.arch} - - - - diff --git a/java/flight/flight-grpc/pom.xml b/java/flight/flight-grpc/pom.xml index 22067b1fbfb..5c113be8615 100644 --- a/java/flight/flight-grpc/pom.xml +++ b/java/flight/flight-grpc/pom.xml @@ -50,12 +50,10 @@ io.grpc grpc-core - ${dep.grpc.version} io.grpc grpc-stub - ${dep.grpc.version} org.apache.arrow @@ -72,7 +70,6 @@ io.grpc grpc-protobuf - ${dep.grpc.version} com.google.guava @@ -81,12 +78,10 @@ com.google.protobuf protobuf-java - ${dep.protobuf.version} io.grpc grpc-api - ${dep.grpc.version} @@ -105,10 +100,10 @@ protobuf-maven-plugin 0.6.1 - com.google.protobuf:protoc:${dep.protobuf.version}:exe:${os.detected.classifier} + com.google.protobuf:protoc:${dep.protobuf-bom.version}:exe:${os.detected.classifier} false grpc-java - io.grpc:protoc-gen-grpc-java:${dep.grpc.version}:exe:${os.detected.classifier} + io.grpc:protoc-gen-grpc-java:${dep.grpc-bom.version}:exe:${os.detected.classifier} diff --git a/java/flight/flight-integration-tests/pom.xml b/java/flight/flight-integration-tests/pom.xml index 1fbab61a672..e676be979db 100644 --- a/java/flight/flight-integration-tests/pom.xml +++ b/java/flight/flight-integration-tests/pom.xml @@ -48,7 +48,6 @@ com.google.protobuf protobuf-java - ${dep.protobuf.version} commons-cli diff --git a/java/flight/flight-sql/pom.xml b/java/flight/flight-sql/pom.xml index 54637ef0f20..63785d75842 100644 --- a/java/flight/flight-sql/pom.xml +++ b/java/flight/flight-sql/pom.xml @@ -60,7 +60,6 @@ io.grpc grpc-protobuf - ${dep.grpc.version} com.google.guava @@ -69,17 +68,14 @@ io.grpc grpc-stub - ${dep.grpc.version} com.google.protobuf protobuf-java - ${dep.protobuf.version} io.grpc grpc-api - ${dep.grpc.version} org.apache.arrow diff --git a/java/flight/pom.xml b/java/flight/pom.xml index 670e763af74..151bc582215 100644 --- a/java/flight/pom.xml +++ b/java/flight/pom.xml @@ -24,12 +24,6 @@ pom - - 1.44.1 - 2.0.46.Final - 3.19.4 - - flight-core flight-grpc @@ -46,10 +40,10 @@ 0.6.1 - com.google.protobuf:protoc:${dep.protobuf.version}:exe:${os.detected.classifier} + com.google.protobuf:protoc:${dep.protobuf-bom.version}:exe:${os.detected.classifier} grpc-java - io.grpc:protoc-gen-grpc-java:${dep.grpc.version}:exe:${os.detected.classifier} + io.grpc:protoc-gen-grpc-java:${dep.grpc-bom.version}:exe:${os.detected.classifier} diff --git a/java/pom.xml b/java/pom.xml index 6f2ed823cfe..578b80c497e 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -33,7 +33,9 @@ 5.4.0 1.7.25 30.1.1-jre - 4.1.72.Final + 4.1.78.Final + 1.47.0 + 3.21.2 2.13.2.20220328 2.7.1 1.12.0 @@ -524,21 +526,6 @@ guava ${dep.guava.version} - - io.netty - netty-handler - ${dep.netty.version} - - - io.netty - netty-buffer - ${dep.netty.version} - - - io.netty - netty-common - ${dep.netty.version} - com.google.code.findbugs jsr305 @@ -578,6 +565,27 @@ pom import + + io.netty + netty-bom + ${dep.netty-bom.version} + pom + import + + + io.grpc + grpc-bom + ${dep.grpc-bom.version} + pom + import + + + com.google.protobuf + protobuf-bom + ${dep.protobuf-bom.version} + pom + import +