diff --git a/java/algorithm/pom.xml b/java/algorithm/pom.xml index 60f9b6c8e25fb..abf76d352506e 100644 --- a/java/algorithm/pom.xml +++ b/java/algorithm/pom.xml @@ -32,6 +32,7 @@ arrow-vector ${project.version} test-jar + test org.apache.arrow diff --git a/java/flight/flight-core/pom.xml b/java/flight/flight-core/pom.xml index be91203d73d05..6fce81c0d3b69 100644 --- a/java/flight/flight-core/pom.xml +++ b/java/flight/flight-core/pom.xml @@ -58,10 +58,6 @@ io.grpc grpc-core - - io.grpc - grpc-context - io.grpc grpc-protobuf @@ -153,7 +149,13 @@ org.apache.maven.plugins maven-shade-plugin - 3.1.1 + + 3.2.4 shade-main diff --git a/java/flight/flight-grpc/pom.xml b/java/flight/flight-grpc/pom.xml index 864c629f6b044..318495bf73b31 100644 --- a/java/flight/flight-grpc/pom.xml +++ b/java/flight/flight-grpc/pom.xml @@ -49,12 +49,13 @@ io.grpc - grpc-core + grpc-stub + + + io.grpc + grpc-inprocess + test - - io.grpc - grpc-stub - org.apache.arrow arrow-memory-core diff --git a/java/flight/flight-sql-jdbc-driver/pom.xml b/java/flight/flight-sql-jdbc-driver/pom.xml index a0edf112f73e7..b7060f77932e4 100644 --- a/java/flight/flight-sql-jdbc-driver/pom.xml +++ b/java/flight/flight-sql-jdbc-driver/pom.xml @@ -164,7 +164,6 @@ org.apache.maven.plugins maven-shade-plugin - 3.4.1 package diff --git a/java/flight/flight-sql/pom.xml b/java/flight/flight-sql/pom.xml index bcefc4aeb830c..e760c9a345bf1 100644 --- a/java/flight/flight-sql/pom.xml +++ b/java/flight/flight-sql/pom.xml @@ -56,6 +56,7 @@ org.apache.arrow arrow-jdbc ${project.version} + test com.google.guava @@ -74,6 +75,7 @@ org.slf4j slf4j-api + test org.apache.derby diff --git a/java/memory/memory-netty/pom.xml b/java/memory/memory-netty/pom.xml index df39c0058ba33..784320c7d6acb 100644 --- a/java/memory/memory-netty/pom.xml +++ b/java/memory/memory-netty/pom.xml @@ -42,7 +42,7 @@ ch.qos.logback logback-core - 1.2.12 + 1.3.14 test diff --git a/java/memory/memory-netty/src/main/java/io/netty/buffer/PooledByteBufAllocatorL.java b/java/memory/memory-netty/src/main/java/io/netty/buffer/PooledByteBufAllocatorL.java index 06c6669cfd162..ba9aba353c351 100644 --- a/java/memory/memory-netty/src/main/java/io/netty/buffer/PooledByteBufAllocatorL.java +++ b/java/memory/memory-netty/src/main/java/io/netty/buffer/PooledByteBufAllocatorL.java @@ -71,7 +71,7 @@ public UnsafeDirectLittleEndian allocate(long size) { } public int getChunkSize() { - return allocator.chunkSize; + return allocator.chunkSize(); } public long getHugeBufferSize() { @@ -137,7 +137,6 @@ private class InnerAllocator extends PooledByteBufAllocator { private final PoolArena[] directArenas; private final MemoryStatusThread statusThread; - private final int chunkSize; public InnerAllocator() { super(true); @@ -150,8 +149,6 @@ public InnerAllocator() { throw new RuntimeException("Failure while initializing allocator. Unable to retrieve direct arenas field.", e); } - this.chunkSize = directArenas[0].chunkSize; - if (memoryLogger.isTraceEnabled()) { statusThread = new MemoryStatusThread(this); statusThread.start(); @@ -166,7 +163,7 @@ private UnsafeDirectLittleEndian newDirectBufferL(int initialCapacity, int maxCa if (directArena != null) { - if (initialCapacity > directArena.chunkSize) { + if (initialCapacity > chunkSize()) { // This is beyond chunk size so we'll allocate separately. ByteBuf buf = UnpooledByteBufAllocator.DEFAULT.directBuffer(initialCapacity, maxCapacity); diff --git a/java/performance/pom.xml b/java/performance/pom.xml index 685b502d27250..f520ddae1515f 100644 --- a/java/performance/pom.xml +++ b/java/performance/pom.xml @@ -26,6 +26,7 @@ org.openjdk.jmh jmh-core ${jmh.version} + test org.openjdk.jmh @@ -38,11 +39,13 @@ arrow-vector ${project.version} ${arrow.vector.classifier} + test org.apache.arrow arrow-memory-core ${project.version} + test org.apache.arrow @@ -54,11 +57,13 @@ org.apache.avro avro ${dep.avro.version} + test org.apache.arrow arrow-avro ${project.version} + test com.h2database @@ -70,6 +75,7 @@ org.apache.arrow arrow-jdbc ${project.version} + test org.apache.arrow @@ -109,7 +115,6 @@ org.apache.maven.plugins maven-shade-plugin - 2.2 package diff --git a/java/pom.xml b/java/pom.xml index dea9baac371a8..b3514f63b903e 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -30,13 +30,13 @@ ${project.build.directory}/generated-sources 1.9.0 - 5.9.0 - 1.7.25 - 31.1-jre - 4.1.96.Final - 1.56.0 + 5.10.1 + 2.0.9 + 33.0.0-jre + 4.1.104.Final + 1.60.0 3.23.1 - 2.15.1 + 2.16.0 2.7.1 1.12.0 1.10.0 @@ -45,7 +45,7 @@ true 9+181-r4173-1 2.22.0 - 3.10.1 + 3.11.0 5.5.0 5.2.0 @@ -308,7 +308,7 @@ org.slf4j jcl-over-slf4j - 1.7.5 + ${dep.slf4j.version} @@ -361,7 +361,7 @@ org.cyclonedx cyclonedx-maven-plugin - 2.7.6 + 2.7.10 package @@ -378,7 +378,12 @@ org.apache.maven.plugins maven-dependency-plugin - 3.0.1 + + 3.1.2 org.apache.rat @@ -395,6 +400,7 @@ maven-compiler-plugin ${maven-compiler-plugin.version} + false org.immutables @@ -408,6 +414,11 @@ maven-enforcer-plugin 3.0.0-M2 + + org.apache.maven.plugins + maven-shade-plugin + 3.5.1 + maven-surefire-plugin 3.0.0-M7 @@ -679,7 +690,7 @@ ch.qos.logback logback-classic - 1.2.3 + 1.3.14 test diff --git a/java/tools/pom.xml b/java/tools/pom.xml index aa6f08c8dd70a..62b821f87cc26 100644 --- a/java/tools/pom.xml +++ b/java/tools/pom.xml @@ -40,6 +40,7 @@ com.google.guava guava + test commons-cli @@ -49,7 +50,7 @@ ch.qos.logback logback-classic - 1.2.3 + 1.3.14 runtime diff --git a/java/vector/pom.xml b/java/vector/pom.xml index 31861862fa9ab..423b119e1e1ed 100644 --- a/java/vector/pom.xml +++ b/java/vector/pom.xml @@ -177,7 +177,13 @@ org.apache.maven.plugins maven-shade-plugin - 3.1.1 + + 3.2.4 package