From cecbcf747082876868af8ad310ef10167566132b Mon Sep 17 00:00:00 2001 From: sam-butcher Date: Thu, 23 Jan 2025 16:35:43 +0000 Subject: [PATCH 1/3] ktor server status pages, protobuf java util --- library/maven/artifacts.bzl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/library/maven/artifacts.bzl b/library/maven/artifacts.bzl index 36d0b65d..1b1985ed 100644 --- a/library/maven/artifacts.bzl +++ b/library/maven/artifacts.bzl @@ -82,6 +82,7 @@ artifacts = { "com.google.ortools:ortools-linux-x86-64": "9.6.2534", "com.google.ortools:ortools-win32-x86-64": "9.6.2534", "com.google.protobuf:protobuf-java": "3.21.7", + "com.google.protobuf:protobuf-java-util": "3.21.7", "com.google.protobuf:protobuf-kotlin": "3.21.7", "com.google.re2j:re2j" : "1.6", "com.google.truth:truth" : "1.0.1", @@ -163,6 +164,7 @@ artifacts = { "io.ktor:ktor-server-core-jvm": "2.3.7", "io.ktor:ktor-server-netty-jvm": "2.3.7", "io.ktor:ktor-server-default-headers-jvm": "2.3.7", + "io.ktor:ktor-server-status-pages": "2.3.7", "io.ktor:ktor-server-websockets-jvm": "2.3.7", "io.kubernetes:client-java": { "exclude": ["com.github.stefanbirkner:system-rules"], From bded1c066b81ad663b4b21bc817fee63ba8d694b Mon Sep 17 00:00:00 2001 From: sam-butcher Date: Thu, 23 Jan 2025 17:44:17 +0000 Subject: [PATCH 2/3] fix --- library/maven/artifacts.bzl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/maven/artifacts.bzl b/library/maven/artifacts.bzl index 1b1985ed..6dc43e1c 100644 --- a/library/maven/artifacts.bzl +++ b/library/maven/artifacts.bzl @@ -164,7 +164,7 @@ artifacts = { "io.ktor:ktor-server-core-jvm": "2.3.7", "io.ktor:ktor-server-netty-jvm": "2.3.7", "io.ktor:ktor-server-default-headers-jvm": "2.3.7", - "io.ktor:ktor-server-status-pages": "2.3.7", + "io.ktor:ktor-server-status-pages-jvm": "2.3.7", "io.ktor:ktor-server-websockets-jvm": "2.3.7", "io.kubernetes:client-java": { "exclude": ["com.github.stefanbirkner:system-rules"], From a8a91d5903db5ed85a39600bc46e4c797c0a5e16 Mon Sep 17 00:00:00 2001 From: sam-butcher Date: Fri, 31 Jan 2025 15:39:55 +0000 Subject: [PATCH 3/3] remove protobuf utils --- library/maven/artifacts.bzl | 1 - 1 file changed, 1 deletion(-) diff --git a/library/maven/artifacts.bzl b/library/maven/artifacts.bzl index 6dc43e1c..1e57617a 100644 --- a/library/maven/artifacts.bzl +++ b/library/maven/artifacts.bzl @@ -82,7 +82,6 @@ artifacts = { "com.google.ortools:ortools-linux-x86-64": "9.6.2534", "com.google.ortools:ortools-win32-x86-64": "9.6.2534", "com.google.protobuf:protobuf-java": "3.21.7", - "com.google.protobuf:protobuf-java-util": "3.21.7", "com.google.protobuf:protobuf-kotlin": "3.21.7", "com.google.re2j:re2j" : "1.6", "com.google.truth:truth" : "1.0.1",