Skip to content

Commit 1297b27

Browse files
authored
fix: DH-20884: Update Jetty to 12.1.5, gRPC to 1.76.2 (#7489)
Includes changes for our forked gRPC classes to bring them up to date as well.
1 parent 2ce946e commit 1297b27

File tree

67 files changed

+2135
-1509
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+2135
-1509
lines changed

Util/channel/src/main/java/io/deephaven/util/channel/BaseSeekableChannelContext.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
//
44
package io.deephaven.util.channel;
55

6+
import com.google.errorprone.annotations.OverridingMethodsMustInvokeSuper;
67
import io.deephaven.util.SafeCloseable;
78
import org.jetbrains.annotations.NotNull;
89
import org.jetbrains.annotations.Nullable;
910

10-
import javax.annotation.OverridingMethodsMustInvokeSuper;
1111
import java.util.HashMap;
1212
import java.util.Map;
1313
import java.util.function.Supplier;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
io.deephaven.project.ProjectType=DOCKER_REGISTRY
22
deephaven.registry.imageName=ghcr.io/deephaven/protoc-base:latest
3-
deephaven.registry.imageId=ghcr.io/deephaven/protoc-base@sha256:2c596c98b289ce45d164ff460ddcacca6655c7d4e0897b37232c08b5fed84631
3+
deephaven.registry.imageId=ghcr.io/deephaven/protoc-base@sha256:88e6c2264b14d2b094312ccc538043d5f41a11c11f020e4f5eef104409fd7642
44
# TODO(deephaven-base-images#54): arm64 native image for cpp-client-base
55
deephaven.registry.platform=linux/amd64

extensions/kafka/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ dependencies {
1818
// version, but has a different version to make it easier to keep confluent dependencies aligned.
1919
api libs.confluent.kafka.clients
2020
api libs.confluent.avro.serializer
21-
api libs.confluent.protobuf.serializer
21+
api (libs.confluent.protobuf.serializer) {
22+
exclude group: 'com.google.protobuf'
23+
}
2224

2325
// When updating the kafka implementation, it may be useful to test out the minimum kafka version that our code
2426
// compiles, tests, and runs with. If we want to offer more strict guarantees in these regards in the future, at

extensions/parquet/base/src/main/java/io/deephaven/parquet/impl/ColumnDescriptorUtil.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55

66
import org.apache.parquet.column.ColumnDescriptor;
77
import org.jetbrains.annotations.NotNull;
8-
9-
import javax.annotation.Nullable;
8+
import org.jetbrains.annotations.Nullable;
109

1110
public final class ColumnDescriptorUtil {
1211
/**

extensions/parquet/compression/src/main/java/io/deephaven/parquet/compress/DecompressorHolder.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88
import org.apache.hadoop.io.compress.Decompressor;
99
import org.apache.parquet.hadoop.metadata.CompressionCodecName;
1010
import org.jetbrains.annotations.NotNull;
11-
12-
import javax.annotation.Nullable;
11+
import org.jetbrains.annotations.Nullable;
1312

1413
public class DecompressorHolder implements SafeCloseable {
1514
private CompressionCodecName codecName;

go/internal/proto/application/application.pb.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

go/internal/proto/application/application_grpc.pb.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

go/internal/proto/config/config.pb.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

go/internal/proto/config/config_grpc.pb.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

go/internal/proto/console/console.pb.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)