Skip to content

Commit 21fd878

Browse files
authored
Merge branch 'main' into dependabot/maven/error_prone_core.version-2.49.0
2 parents f48074f + 331e9ee commit 21fd878

9 files changed

Lines changed: 12 additions & 11 deletions

File tree

.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,4 +53,4 @@ MAVEN=3.9.9
5353
# Versions for various dependencies used to build artifacts
5454
# Keep in sync with apache/arrow
5555
ARROW_REPO_ROOT=./arrow
56-
VCPKG="4334d8b4c8916018600212ab4dd4bbdc343065d1" # 2025.09.17 Release
56+
VCPKG="66c0373dc7fca549e5803087b9487edfe3aca0a1" # 2026.01.16 Release

.mvn/extensions.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@
2828
<extension>
2929
<groupId>com.gradle</groupId>
3030
<artifactId>common-custom-user-data-maven-extension</artifactId>
31-
<version>2.1.0</version>
31+
<version>2.2.0</version>
3232
</extension>
3333
</extensions>

compose.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,5 +109,6 @@ services:
109109
ARROW_JAVA_CDATA: "ON"
110110
CCACHE_DIR: "/ccache"
111111
command:
112-
["git config --global --add safe.directory /arrow-java && \
112+
["/bin/bash", "-c",
113+
"git config --global --add safe.directory /arrow-java &&
113114
/arrow-java/ci/scripts/jni_manylinux_build.sh /arrow-java /arrow /build/java /arrow-java/jni"]

compression/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ under the License.
5555
<dependency>
5656
<groupId>com.github.luben</groupId>
5757
<artifactId>zstd-jni</artifactId>
58-
<version>1.5.7-7</version>
58+
<version>1.5.7-8</version>
5959
</dependency>
6060
</dependencies>
6161
</project>

flight/flight-core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ under the License.
134134
<dependency>
135135
<groupId>com.google.api.grpc</groupId>
136136
<artifactId>proto-google-common-protos</artifactId>
137-
<version>2.70.0</version>
137+
<version>2.71.0</version>
138138
<scope>test</scope>
139139
</dependency>
140140
<dependency>

flight/flight-sql-jdbc-core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ under the License.
176176
<dependency>
177177
<groupId>com.github.ben-manes.caffeine</groupId>
178178
<artifactId>caffeine</artifactId>
179-
<version>3.2.3</version>
179+
<version>3.2.4</version>
180180
</dependency>
181181

182182
<dependency>

gandiva/src/main/cpp/jni_common.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ DataTypePtr ProtoTypeToDataType(const gandiva::types::ExtGandivaType& ext_type)
221221
return arrow::date64();
222222
case gandiva::types::DECIMAL:
223223
// TODO: error handling
224-
return arrow::decimal(ext_type.precision(), ext_type.scale());
224+
return arrow::decimal128(ext_type.precision(), ext_type.scale());
225225
case gandiva::types::TIME32:
226226
return ProtoTypeToTime32(ext_type);
227227
case gandiva::types::TIME64:

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,9 @@ under the License.
9999
<dep.slf4j.version>2.0.17</dep.slf4j.version>
100100
<dep.guava-bom.version>33.6.0-jre</dep.guava-bom.version>
101101
<dep.netty-bom.version>4.2.12.Final</dep.netty-bom.version>
102-
<dep.grpc-bom.version>1.79.0</dep.grpc-bom.version>
102+
<dep.grpc-bom.version>1.80.0</dep.grpc-bom.version>
103103
<dep.protobuf-bom.version>4.34.1</dep.protobuf-bom.version>
104-
<dep.jackson-bom.version>2.21.2</dep.jackson-bom.version>
104+
<dep.jackson-bom.version>2.21.3</dep.jackson-bom.version>
105105
<dep.hadoop.version>3.5.0</dep.hadoop.version>
106106
<dep.fbs.version>25.2.10</dep.fbs.version>
107107
<dep.avro.version>1.12.1</dep.avro.version>
@@ -112,7 +112,7 @@ under the License.
112112
<checkstyle.version>10.23.0</checkstyle.version>
113113
<checkstyle.failOnViolation>true</checkstyle.failOnViolation>
114114
<error_prone_core.version>2.49.0</error_prone_core.version>
115-
<checker.framework.version>4.0.0</checker.framework.version>
115+
<checker.framework.version>4.1.0</checker.framework.version>
116116
<logback.version>1.5.32</logback.version>
117117
<doclint>none</doclint>
118118
<additionalparam>-Xdoclint:none</additionalparam>

vector/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ under the License.
6060
<dependency>
6161
<groupId>commons-codec</groupId>
6262
<artifactId>commons-codec</artifactId>
63-
<version>1.21.0</version>
63+
<version>1.22.0</version>
6464
</dependency>
6565
<dependency>
6666
<groupId>org.apache.arrow</groupId>

0 commit comments

Comments
 (0)