Skip to content

fix(dependencies): update iceberg version to 1.9.2 #2843

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Gezi-lzq wants to merge 4 commits into from
Closed

fix(dependencies): update iceberg version to 1.9.2 #2843

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
23a512d
fix(dependencies): update iceberg version to 1.9.2
Gezi-lzq Sep 15, 2025
9901462
fix(adapter): return uuid directly instead of converting it
Gezi-lzq Sep 16, 2025
12b5140
fix(dependencies): update SLF4J version to 2.0.13
Gezi-lzq Sep 17, 2025
02c3ed2
chore(adapter): remove unused UUIDUtil import
Gezi-lzq Sep 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1014,7 +1014,7 @@ project(':core') {
}

// > hive ext start
implementation 'org.apache.iceberg:iceberg-hive-metastore:1.6.1'
implementation "org.apache.iceberg:iceberg-hive-metastore:${versions.iceberg}"
implementation('org.apache.hive:hive-metastore:3.1.3') {
// Remove useless dependencies (copy from iceberg-kafka-connect)
exclude group: "org.apache.avro", module: "avro"
Expand Down Expand Up @@ -1118,7 +1118,7 @@ project(':core') {

tasks.create(name: "copyDependantLibs", type: Copy) {
from (configurations.testRuntimeClasspath) {
include('slf4j-log4j12*')
include('slf4j-reload4j*')
include('reload4j*jar')
}
from (configurations.runtimeClasspath) {
Expand Down Expand Up @@ -2258,7 +2258,7 @@ project(':s3stream') {
implementation 'software.amazon.awssdk.crt:aws-crt:0.30.8'
implementation 'com.ibm.async:asyncutil:0.1.0'

testImplementation 'org.slf4j:slf4j-simple:1.7.36'
testImplementation 'org.slf4j:slf4j-simple:2.0.13'
testImplementation libs.junitJupiter
testImplementation libs.mockitoCore
testImplementation libs.mockitoJunitJupiter // supports MockitoExtension
Expand Down Expand Up @@ -2425,7 +2425,7 @@ project(':tools') {

tasks.create(name: "copyDependantLibs", type: Copy) {
from (configurations.testRuntimeClasspath) {
include('slf4j-log4j12*')
include('slf4j-reload4j*')
include('reload4j*jar')
}
from (configurations.runtimeClasspath) {
Expand Down Expand Up @@ -2476,7 +2476,7 @@ project(':trogdor') {

tasks.create(name: "copyDependantLibs", type: Copy) {
from (configurations.testRuntimeClasspath) {
include('slf4j-log4j12*')
include('slf4j-reload4j*')
include('reload4j*jar')
}
from (configurations.runtimeClasspath) {
Expand Down Expand Up @@ -3321,7 +3321,7 @@ project(':connect:api') {

tasks.create(name: "copyDependantLibs", type: Copy) {
from (configurations.testRuntimeClasspath) {
include('slf4j-log4j12*')
include('slf4j-reload4j*')
include('reload4j*jar')
}
from (configurations.runtimeClasspath) {
Expand Down Expand Up @@ -3360,7 +3360,7 @@ project(':connect:transforms') {

tasks.create(name: "copyDependantLibs", type: Copy) {
from (configurations.testRuntimeClasspath) {
include('slf4j-log4j12*')
include('slf4j-reload4j*')
include('reload4j*jar')
}
from (configurations.runtimeClasspath) {
Expand Down Expand Up @@ -3403,7 +3403,7 @@ project(':connect:json') {

tasks.create(name: "copyDependantLibs", type: Copy) {
from (configurations.testRuntimeClasspath) {
include('slf4j-log4j12*')
include('slf4j-reload4j*')
include('reload4j*jar')
}
from (configurations.runtimeClasspath) {
Expand Down Expand Up @@ -3487,7 +3487,7 @@ project(':connect:runtime') {
tasks.create(name: "copyDependantLibs", type: Copy) {
from (configurations.testRuntimeClasspath) {
// No need to copy log4j since the module has an explicit dependency on that
include('slf4j-log4j12*')
include('slf4j-reload4j*')
}
from (configurations.runtimeClasspath) {
exclude('kafka-clients*')
Expand Down Expand Up @@ -3594,7 +3594,7 @@ project(':connect:file') {

tasks.create(name: "copyDependantLibs", type: Copy) {
from (configurations.testRuntimeClasspath) {
include('slf4j-log4j12*')
include('slf4j-reload4j*')
include('reload4j*jar')
}
from (configurations.runtimeClasspath) {
Expand Down Expand Up @@ -3637,7 +3637,7 @@ project(':connect:basic-auth-extension') {

tasks.create(name: "copyDependantLibs", type: Copy) {
from (configurations.testRuntimeClasspath) {
include('slf4j-log4j12*')
include('slf4j-reload4j*')
include('reload4j*jar')
}
from (configurations.runtimeClasspath) {
Expand Down Expand Up @@ -3701,7 +3701,7 @@ project(':connect:mirror') {

tasks.create(name: "copyDependantLibs", type: Copy) {
from (configurations.testRuntimeClasspath) {
include('slf4j-log4j12*')
include('slf4j-reload4j*')
include('reload4j*jar')
}
from (configurations.runtimeClasspath) {
Expand Down Expand Up @@ -3767,7 +3767,7 @@ project(':connect:mirror-client') {

tasks.create(name: "copyDependantLibs", type: Copy) {
from (configurations.testRuntimeClasspath) {
include('slf4j-log4j12*')
include('slf4j-reload4j*')
include('reload4j*jar')
}
from (configurations.runtimeClasspath) {
Expand Down
3 changes: 1 addition & 2 deletions core/src/main/java/kafka/automq/table/binder/AbstractTypeAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import org.apache.iceberg.types.Types;
import org.apache.iceberg.util.ByteBuffers;
import org.apache.iceberg.util.DateTimeUtil;
import org.apache.iceberg.util.UUIDUtil;

import java.math.BigDecimal;
import java.nio.ByteBuffer;
Expand Down Expand Up @@ -160,7 +159,7 @@ protected Object convertUUID(Object sourceValue, S sourceSchema, Type targetType
}
}
if (uuid != null) {
return UUIDUtil.convert(uuid);
return uuid;
}
throw new IllegalArgumentException("Cannot convert " + sourceValue.getClass().getSimpleName() + " to " + targetType.typeId());
}
Expand Down
2 changes: 1 addition & 1 deletion core/src/test/java/kafka/automq/table/binder/AvroRecordBinderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -640,7 +640,7 @@ public void testUUIDConversion() {
Record icebergRecord = new RecordBinder(icebergSchema, avroSchema).bind(serializeAndDeserialize(avroRecord, avroSchema));

// Verify the field value
assertEquals(uuid, UUIDUtil.convert((byte[]) icebergRecord.getField("uuidField")));
assertEquals(uuid, icebergRecord.getField("uuidField"));

// Send the record to the table
testSendRecord(icebergSchema, icebergRecord);
Expand Down
6 changes: 3 additions & 3 deletions gradle/dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,8 @@ versions += [
scalafmt: "3.7.14",
scalaJava8Compat : "1.0.2",
scoverage: "2.0.11",
slf4j: "1.7.36",
jclOverSlf4j: "1.7.36",
slf4j: "2.0.13",
jclOverSlf4j: "2.0.13",
snappy: "1.1.10.5",
spotbugs: "4.8.0",
zinc: "1.9.2",
Expand All @@ -177,7 +177,7 @@ versions += [
nettyTcnativeBoringSsl: "2.0.65.Final",
avro: "1.11.4",
confluentSchema: "7.8.0",
iceberg: "1.6.1",
iceberg: "1.9.2",
wire: "4.9.1",
oshi: "6.8.1",
// AutoMQ inject end
Expand Down
4 changes: 2 additions & 2 deletions licenses/LICENSE-binary
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,8 @@ MIT License
argparse4j-0.7.0, see: licenses/argparse-MIT
checker-qual-3.19.0, see: licenses/checker-qual-MIT
jopt-simple-5.0.4, see: licenses/jopt-simple-MIT
slf4j-api-1.7.36, see: licenses/slf4j-MIT
slf4j-reload4j-1.7.36, see: licenses/slf4j-MIT
slf4j-api-2.0.13, see: licenses/slf4j-MIT
slf4j-reload4j-2.0.13, see: licenses/slf4j-MIT
pcollections-4.0.1, see: licenses/pcollections-MIT

---------------------------------------
Expand Down
Loading